Fix sub-model (de)serialization.

Author: explorigin

pydanticrud/backends/dynamodb.py

@@ -120,18 +120,19 @@ def index_definition(index_name, keys, gsi=False):
 
 class DynamoSerializer:
     def __init__(self, schema):
-        self.schema = schema
+        self.properties = schema["properties"]
+        self.definitions = schema.get("definitions")
+
+    def _get_type(self, field_name):
+        if "$ref" in self.properties[field_name]:
+            def_name = self.properties[field_name]["$ref"].split('/')[-1]
+            return self.definitions[def_name].get("type")
+        return self.properties[field_name].get("type", "anyOf")
 
     def _serialize_field(self, field_name, value):
-        definition = self.schema.get("definitions")
-        schema = self.schema["properties"]
-        if definition:
-            for k, v in definition.items():
-                schema[k.lower()] = v
-        schema = self.schema["properties"]
-        field_type = schema[field_name].get("type", "anyOf")
+        field_type = self._get_type(field_name)
         try:
-            if any([field_name in self.schema['required'], value is not None]):
+            if value is not None:
                 return SERIALIZE_MAP[field_type](value)
         except KeyError:
             log.debug(f"No serializer for field_type {field_type}")
@@ -147,14 +148,9 @@ def serialize_record(self, data_dict) -> dict:
         }
 
     def _deserialize_field(self, field_name, value):
-        definition = self.schema.get("definitions")
-        schema = self.schema["properties"]
-        if definition:
-            for k, v in definition.items():
-                schema[k.lower()] = v
-        field_type = schema[field_name].get("type", "anyOf")
+        field_type = self._get_type(field_name)
         try:
-            if any([field_name in self.schema['required'], value is not None]):
+            if value is not None:
                 return DESERIALIZE_MAP[field_type](value)
         except KeyError:
             log.debug(f"No deserializer for field_type {field_type}")

pydanticrud/main.py

@@ -1,3 +1,4 @@
+import pydantic.error_wrappers
 from pydantic import BaseModel as PydanticBaseModel
 from pydantic.main import ModelMetaclass
 from rule_engine import Rule

tests/test_dynamodb.py

@@ -461,9 +461,9 @@ def test_query_scan_complex(dynamo, complex_query_data):
 def test_query_with_nested_model(dynamo, nested_query_data):
     res = NestedModel.query()
     for m in res:
+        assert isinstance(m.ticket, Ticket)
         assert m.ticket.created_time is not None
         assert m.ticket.number is not None
-        assert type(m.ticket) is Ticket
 
 
 def test_query_with_nested_model_optional(dynamo, nested_query_data_empty_ticket):