🐛 [#466] fix validation for merge PATCH

src/objects/api/serializers.py

@@ -131,6 +131,10 @@ def update(self, instance, validated_data):
         # version should be set
         if "version" not in validated_data:
             validated_data["version"] = instance.version
+        # start_at should be set
+        if "start_at" not in validated_data:
+            validated_data["start_at"] = instance.start_at
+
         if self.partial and "data" in validated_data:
             # Apply JSON Merge Patch for record data
             validated_data["data"] = merge_patch(instance.data, validated_data["data"])

src/objects/api/validators.py

@@ -9,7 +9,7 @@
 from objects.core.utils import check_objecttype
 
 from .constants import Operators
-from .utils import string_to_value
+from .utils import merge_patch, string_to_value
 
 
 class JsonSchemaValidator:
@@ -34,6 +34,9 @@ def __call__(self, attrs, serializer):
             )
             version = attrs.get("version") if "version" in attrs else instance.version
             data = attrs.get("data", {}) if "data" in attrs else instance.data
+            if serializer.partial and "data" in attrs:
+                # Apply JSON Merge Patch for record data
+                data = merge_patch(instance.data, attrs["data"])
 
         if not object_type or not version:
             return

src/objects/tests/v2/test_object_api.py

@@ -361,13 +361,16 @@ def test_patch_validates_merged_object_rather_than_partial_object(self, m):
 
         response = self.client.patch(url, data, **GEO_WRITE_KWARGS)
         self.assertEqual(response.status_code, status.HTTP_200_OK)
-
-        initial_record.refresh_from_db()
         self.assertEqual(
-            initial_record.data,
+            response.json()["record"]["data"],
             {"plantDate": "2024-10-09", "diameter": 20, "name": "Name"},
         )
 
+        last_record = initial_record.object.last_record
+        self.assertEqual(
+            last_record.data,
+            {"plantDate": "2024-10-09", "diameter": 20, "name": "Name"},
+        )
 
     def test_delete_object(self, m):
         record = ObjectRecordFactory.create(object__object_type=self.object_type)