Merge pull request #1661 from opengisch/default_value_data_loss_fix

Fix data loss scenario when applying a feature addition delta on a layer with attributes having valid default values set to apply on update

Author: nirvn

docker-app/qfieldcloud/core/tests/test_delta.py

@@ -74,6 +74,13 @@ def setUp(self):
         )
         self.project1.save()
 
+        self.project3 = Project.objects.create(
+            name="project3",
+            is_public=False,
+            owner=self.org1,
+        )
+        self.project3.save()
+
         OrganizationMember.objects.create(
             organization=self.org1,
             member=self.user2,
@@ -170,6 +177,57 @@ def upload_project_files(self, project) -> Project:
 
         raise Exception("Projectfile never set on project")
 
+    def upload_project3_files(self, project) -> Project:
+        for project_file in [
+            "testdata.gpkg",
+            "project3.qgs",
+        ]:
+            file_path = testdata_path(f"delta/{project_file}")
+            response = self.client.post(
+                f"/api/v1/files/{project.id}/{project_file}/",
+                {"file": open(file_path, "rb")},
+                format="multipart",
+            )
+            self.assertTrue(
+                status.is_success(response.status_code),
+                f"Failed to upload file '{project_file}'",
+            )
+
+        # wait until the project file check are ready
+        for i in range(30):
+            updated_project = Project.objects.get(id=project.id)
+            if updated_project.has_the_qgis_file:
+                return updated_project
+
+            time.sleep(1)
+
+        raise Exception("Projectfile never set on project")
+
+    def test_push_apply_delta_file_add_feature_default_value(self):
+        self.client.credentials(HTTP_AUTHORIZATION="Token " + self.token1.key)
+
+        project = self.upload_project3_files(self.project3)
+
+        self.upload_and_check_deltas(
+            project=project,
+            delta_filename="singlelayer_singledelta_add_feature_default_value.json",
+            token=self.token1.key,
+            final_values=[
+                [
+                    "c8c421cd-e39c-40a0-97d8-a319c245ba14",
+                    "STATUS_APPLIED",
+                    self.user1.username,
+                ]
+            ],
+        )
+
+        gdf = self.read_gpkg_layer(project, "testdata.gpkg", "polygons")
+
+        f = gdf.iloc[2]
+        self.assertEqual(1, f["int"])
+        self.assertEqual(1.0, f["dbl"])
+        self.assertEqual("correct!", f["str"])
+
     def test_push_apply_delta_file(self):
         self.client.credentials(HTTP_AUTHORIZATION="Token " + self.token1.key)
         project = self.upload_project_files(self.project1)
@@ -1273,7 +1331,7 @@ def check_deltas_by_file_id(
                 self.assertEqual(payload[idx]["created_by"], created_by)
 
         job = Job.objects.filter(
-            project=self.project1,
+            project=project,
             type=Job.Type.DELTA_APPLY,
         ).latest("updated_at")
 

docker-app/qfieldcloud/core/tests/testdata/delta/deltas/singlelayer_singledelta_add_feature_default_value.json

@@ -0,0 +1,26 @@
+{
+    "deltas": [
+        {
+            "uuid": "c8c421cd-e39c-40a0-97d8-a319c245ba14",
+            "clientId": "cd517e24-a520-4021-8850-e5af70e3a612",
+            "exportId": "f70c7286-fcec-4dbe-85b5-63d4735dac47",
+            "localPk": "1",
+            "sourcePk": "1",
+            "localLayerId": "polygons_e12da475_70fc_439d_b679_71afabb3ebef",
+            "sourceLayerId": "polygons_e12da475_70fc_439d_b679_71afabb3ebef",
+            "method": "create",
+            "new": {
+                "geometry": "POLYGON((1 1, 2 1, 2 2, 1 2, 1 1))'",
+                "attributes": {
+                    "dbl": 1.0,
+                    "int": 1,
+                    "str": "correct!"
+                }
+            }
+        }
+    ],
+    "files": [],
+    "id": "469e13a0-5a97-40cd-b39d-fa0368339caa",
+    "project": "e02d02cc-af1b-414c-a14c-e2ed5dfee52f",
+    "version": "1.0"
+}