Merge pull request #407 from maykinmedia/issue/269-correctionfor

fix for correctionFor = null
maykinmedia · May 31, 2024 · 4549268 · 4549268
2 parents 1e57f38 + c0bf5ac
commit 4549268
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 12 deletions.
diff --git a/src/objects/api/serializers.py b/src/objects/api/serializers.py
@@ -18,6 +18,7 @@ class ObjectRecordSerializer(serializers.ModelSerializer):
         source="correct",
         slug_field="index",
         required=False,
+        allow_null=True,
         help_text=_("Index of the record corrected by the current record"),
     )
     correctedBy = serializers.SlugRelatedField(

diff --git a/src/objects/api/v1/openapi.yaml b/src/objects/api/v1/openapi.yaml
@@ -642,8 +642,6 @@ components:
           minimum: 0
           description: Version of the OBJECTTYPE for data in the object record
         data:
-          type: object
-          additionalProperties: {}
           description: Object data, based on OBJECTTYPE
         geometry:
           allOf:
@@ -794,8 +792,6 @@ components:
           minimum: 0
           description: Version of the OBJECTTYPE for data in the object record
         data:
-          type: object
-          additionalProperties: {}
           description: Object data, based on OBJECTTYPE
         geometry:
           allOf:
@@ -825,6 +821,7 @@ components:
           maximum: 2147483647
           minimum: 0
           description: Index of the record corrected by the current record
+          nullable: true
         correctedBy:
           type: integer
           maximum: 2147483647

diff --git a/src/objects/api/v2/openapi.yaml b/src/objects/api/v2/openapi.yaml
@@ -730,8 +730,6 @@ components:
           minimum: 0
           description: Version of the OBJECTTYPE for data in the object record
         data:
-          type: object
-          additionalProperties: {}
           description: Object data, based on OBJECTTYPE
         geometry:
           allOf:
@@ -890,8 +888,6 @@ components:
           minimum: 0
           description: Version of the OBJECTTYPE for data in the object record
         data:
-          type: object
-          additionalProperties: {}
           description: Object data, based on OBJECTTYPE
         geometry:
           allOf:
@@ -921,6 +917,7 @@ components:
           maximum: 2147483647
           minimum: 0
           description: Index of the record corrected by the current record
+          nullable: true
         correctedBy:
           type: integer
           maximum: 2147483647
@@ -1044,8 +1041,6 @@ components:
           type: boolean
           description: Use field-based authorization
         fields:
-          type: object
-          additionalProperties: {}
           nullable: true
           title: Mode
           description: Fields allowed for this token in relation to objecttype versions.

diff --git a/src/objects/tests/v2/test_object_api.py b/src/objects/tests/v2/test_object_api.py
@@ -327,8 +327,8 @@ def test_history_object(self, m):
             ],
         )
 
-    # In the ticket https://github.com/maykinmedia/objects-api/issues/282 we descovered that updating an object \
-    # where the startAt value has been moddified with an earlier date causes an 500 response.
+    # In the ticket https://github.com/maykinmedia/objects-api/issues/282 we discovered that updating an object \
+    # where the startAt value has been modified with an earlier date causes an 500 response.
     def test_updating_object_after_changing_the_startAt_value_returns_200(self, m):
         mock_service_oas_get(m, OBJECT_TYPES_API, "objecttypes")
         m.get(
@@ -388,3 +388,40 @@ def test_updating_object_after_changing_the_startAt_value_returns_200(self, m):
             response_updating_data_after_startAt_modification.status_code,
             status.HTTP_200_OK,
         )
+
+    # regression test for https://github.com/maykinmedia/objects-api/issues/268
+    def test_update_object_correctionFor(self, m):
+        mock_service_oas_get(m, OBJECT_TYPES_API, "objecttypes")
+        m.get(
+            f"{self.object_type.url}/versions/1",
+            json=mock_objecttype_version(self.object_type.url),
+        )
+        m.get(self.object_type.url, json=mock_objecttype(self.object_type.url))
+
+        initial_record = ObjectRecordFactory.create(
+            object__object_type=self.object_type, version=1
+        )
+        object = initial_record.object
+        # correction record
+        ObjectRecordFactory.create(object=object, version=1, correct=initial_record)
+
+        url = reverse("object-detail", args=[object.uuid])
+        modified_data = {
+            "type": self.object_type.url,
+            "record": {
+                "typeVersion": 1,
+                "data": {"plantDate": "2020-04-12", "diameter": 30},
+                "startAt": "2024-01-01",
+                "correctionFor": None,
+            },
+        }
+
+        response = self.client.put(url, data=modified_data, **GEO_WRITE_KWARGS)
+
+        self.assertEqual(response.status_code, 200)
+
+        object.refresh_from_db()
+        self.assertEqual(object.records.count(), 3)
+
+        last_record = object.last_record
+        self.assertIsNone(last_record.correct)