correctly removing composite when validated data is None

shosca · Jul 24, 2018 · 35e35dc · 35e35dc
1 parent bcddeaa
commit 35e35dc
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 1 deletion.
diff --git a/rest_witchcraft/serializers.py b/rest_witchcraft/serializers.py
@@ -196,6 +196,9 @@ def get_fields(self):
         return _fields
 
     def get_object(self, validated_data, instance=None):
+        if validated_data is None:
+            return
+
         if instance:
             return instance
 
@@ -500,7 +503,9 @@ def build_composite_field(self, field_name, composite):
         """
         Builds a `CompositeSerializer` to handle composite attribute in model
         """
-        return CompositeSerializer(composite=composite)
+        field_kwargs = {"composite": composite}
+        field_kwargs = self.include_extra_kwargs(field_kwargs, self._extra_kwargs.get(field_name))
+        return CompositeSerializer(**field_kwargs)
 
     def build_nested_field(self, field_name, relation_info, nested_depth):
         """

diff --git a/tests/test_serializers.py b/tests/test_serializers.py
@@ -777,6 +777,52 @@ class Meta:
         self.assertEqual(vehicle.options, data["options"])
         self.assertEqual(vehicle.other.advertising_cost, 4321)
 
+    def test_post_update_remove_composite(self):
+        vehicle = Vehicle(
+            name="Test vehicle",
+            type=VehicleType.bus,
+            engine=Engine(4, 1234, None, None),
+            owner=session.query(Owner).get(1),
+        )
+
+        class VehicleSerializer(ModelSerializer):
+            class Meta:
+                model = Vehicle
+                session = session
+                fields = "__all__"
+                extra_kwargs = {
+                    "other": {"required": False, "allow_create": True, "allow_nested_updates": True},
+                    "engine": {"required": False, "allow_null": True},
+                }
+
+        data = {
+            "name": "Another test vechicle",
+            "one": "Two",
+            "type": "Car",
+            "engine": None,
+            "owner": {"id": 1},
+            "options": [],
+            "other": {"advertising_cost": 4321},
+        }
+
+        serializer = VehicleSerializer(instance=vehicle, data=data)
+
+        self.assertTrue(serializer.is_valid(), serializer.errors)
+
+        vehicle = serializer.save()
+
+        self.assertEqual(vehicle.name, data["name"])
+        self.assertEqual(vehicle.type, VehicleType(data["type"]))
+        self.assertEqual(vehicle.owner.id, data["owner"]["id"])
+        self.assertEqual(vehicle.owner.first_name, "Test")
+        self.assertEqual(vehicle.owner.last_name, "Owner")
+        self.assertEqual(vehicle.options, data["options"])
+        self.assertEqual(vehicle.other.advertising_cost, 4321)
+        self.assertIsNone(vehicle.engine.cylinders)
+        self.assertIsNone(vehicle.engine.displacement)
+        self.assertIsNone(vehicle.engine.fuel_type)
+        self.assertIsNone(vehicle.engine.type_)
+
     def test_patch_update(self):
 
         vehicle = Vehicle(