Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions sqlalchemy_mixins/serialize.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from collections.abc import Iterable
from datetime import datetime, date, time

from .inspection import InspectionMixin

Expand All @@ -17,23 +18,19 @@ def to_dict(self,nested = False, hybrid_attributes = False, exclude = None):
:type: bool
:return: dict
"""
result = dict()

if exclude is None:
view_cols = self.columns
else :
view_cols = filter(lambda e: e not in exclude, self.columns)

for key in view_cols :
result[key] = getattr(self, key)

result = {key: self.__validate_datetime(key) for key in view_cols}
if hybrid_attributes:
for key in self.hybrid_properties:
result[key] = getattr(self, key)
result[key] = self.__validate_datetime(key)

if nested:
for key in self.relations:
obj = getattr(self, key)
obj = self.__validate_datetime(key)

if isinstance(obj, SerializeMixin):
result[key] = obj.to_dict(hybrid_attributes=hybrid_attributes)
Expand All @@ -44,3 +41,11 @@ def to_dict(self,nested = False, hybrid_attributes = False, exclude = None):
]

return result

def __validate_datetime(self, key):
attr = getattr(self, key)

if isinstance(attr, (datetime, date, time)):
return attr.__str__()
return attr