Skip to content

Commit e82bcfe

Browse files
Jeny Sadadianuclearcat
authored andcommitted
api.models: remove user model serializers
Remove model serializers of `User` and `UserRead` classes as model serializer of parent class `DatabaseModel` handles its serialization in `json` mode. Signed-off-by: Jeny Sadadia <jeny.sadadia@collabora.com>
1 parent 25b3dc4 commit e82bcfe

1 file changed

Lines changed: 1 addition & 20 deletions

File tree

api/models.py

Lines changed: 1 addition & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,10 @@
1212
"""Server-side model definitions"""
1313

1414
from datetime import datetime
15-
from typing import Optional, TypeVar, Dict, Any, List
15+
from typing import Optional, TypeVar, List
1616
from pydantic import (
1717
BaseModel,
1818
Field,
19-
model_serializer,
2019
field_validator,
2120
)
2221
from typing_extensions import Annotated
@@ -107,15 +106,6 @@ def get_indexes(cls):
107106
cls.Index('email', {'unique': True}),
108107
]
109108

110-
@model_serializer(when_used='json')
111-
def serialize_model(self) -> Dict[str, Any]:
112-
"""Serialize model by converting PyObjectId to string"""
113-
values = self.__dict__.copy()
114-
for field_name, value in values.items():
115-
if isinstance(value, PydanticObjectId):
116-
values[field_name] = str(value)
117-
return values
118-
119109

120110
class UserRead(schemas.BaseUser[PydanticObjectId], ModelId):
121111
"""Schema for reading a user"""
@@ -130,15 +120,6 @@ def validate_groups(cls, groups): # pylint: disable=no-self-argument
130120
raise ValueError("Groups must have unique names.")
131121
return groups
132122

133-
@model_serializer(when_used='json')
134-
def serialize_model(self) -> Dict[str, Any]:
135-
"""Serialize model by converting PyObjectId to string"""
136-
values = self.__dict__.copy()
137-
for field_name, value in values.items():
138-
if isinstance(value, PydanticObjectId):
139-
values[field_name] = str(value)
140-
return values
141-
142123

143124
class UserCreate(schemas.BaseUserCreate):
144125
"""Schema for creating a user"""

0 commit comments

Comments
 (0)