arno/etesync-server
1
0
Fork 0
mirror of https://github.com/etesync/server synced 2024-11-18 23:08:08 +00:00
Code Issues Releases Wiki Activity

Make more fields truely optional (behavior change in pydantic v2).

Browse Source
This commit is contained in:
Tom Hacohen 2024-06-13 13:50:38 -04:00
parent 19aba5345a
commit f35b4b94e5
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etebase_server/fastapi/routers/collection.py
View File

@ -72,7 +72,7 @@ class CollectionItemRevisionInOut(BaseModel):
class CollectionItemCommon(BaseModel): class CollectionItemCommon(BaseModel):
uid: str uid: str
version: int version: int
encryptionKey: t.Optional[bytes] encryptionKey: t.Optional[bytes] = None
content: CollectionItemRevisionInOut content: CollectionItemRevisionInOut
@ -93,12 +93,12 @@ class CollectionItemOut(CollectionItemCommon):
class CollectionItemIn(CollectionItemCommon): class CollectionItemIn(CollectionItemCommon):
etag: t.Optional[str] etag: t.Optional[str] = None
class CollectionCommon(BaseModel): class CollectionCommon(BaseModel):
# FIXME: remove optional once we finish collection-type-migration # FIXME: remove optional once we finish collection-type-migration
collectionType: t.Optional[bytes] collectionType: t.Optional[bytes] = None
collectionKey: bytes collectionKey: bytes
@ -132,7 +132,7 @@ class RemovedMembershipOut(BaseModel):
class CollectionListResponse(BaseModel): class CollectionListResponse(BaseModel):
data: t.List[CollectionOut] data: t.List[CollectionOut]
stoken: t.Optional[str] stoken: t.Optional[str] = None
done: bool done: bool
removedMemberships: t.Optional[t.List[RemovedMembershipOut]] = None removedMemberships: t.Optional[t.List[RemovedMembershipOut]] = None
@ -140,13 +140,13 @@ class CollectionListResponse(BaseModel):
class CollectionItemListResponse(BaseModel): class CollectionItemListResponse(BaseModel):
data: t.List[CollectionItemOut] data: t.List[CollectionItemOut]
stoken: t.Optional[str] stoken: t.Optional[str] = None
done: bool done: bool
class CollectionItemRevisionListResponse(BaseModel): class CollectionItemRevisionListResponse(BaseModel):
data: t.List[CollectionItemRevisionInOut] data: t.List[CollectionItemRevisionInOut]
iterator: t.Optional[str] iterator: t.Optional[str] = None
done: bool done: bool
@ -173,7 +173,7 @@ class ItemDepIn(BaseModel):
class ItemBatchIn(BaseModel): class ItemBatchIn(BaseModel):
items: t.List[CollectionItemIn] items: t.List[CollectionItemIn]
deps: t.Optional[t.List[ItemDepIn]] deps: t.Optional[t.List[ItemDepIn]] = None
def validate_db(self): def validate_db(self):
if self.deps is not None: if self.deps is not None:

2
etebase_server/fastapi/routers/invitation.py
View File

@ -85,7 +85,7 @@ class CollectionInvitationOut(CollectionInvitationCommon):
class InvitationListResponse(BaseModel): class InvitationListResponse(BaseModel):
data: t.List[CollectionInvitationOut] data: t.List[CollectionInvitationOut]
iterator: t.Optional[str] iterator: t.Optional[str] = None
done: bool done: bool

2
etebase_server/fastapi/routers/member.py
View File

@ -48,7 +48,7 @@ class CollectionMemberOut(BaseModel):
class MemberListResponse(BaseModel): class MemberListResponse(BaseModel):
data: t.List[CollectionMemberOut] data: t.List[CollectionMemberOut]
iterator: t.Optional[str] iterator: t.Optional[str] = None
done: bool done: bool