Completely overwrite content instances on resource data import

Fixes #1502

Author: bkis

Tekst-API/tekst/models/common.py

@@ -127,8 +127,6 @@ async def insert(self, **kwargs):
     async def apply_updates(
         self,
         updates_model: ModelBase,
-        *,
-        write_to_db: bool = True,
     ) -> "DocumentBase":
         """
         Custom method to apply updates to the document, excluding any fields that are
@@ -148,10 +146,7 @@ async def apply_updates(
             # set attribute
             setattr(self, field, getattr(updates_model, field))
 
-        if write_to_db:
-            return await self.replace()
-        else:
-            return self
+        return await self.replace()
 
     @classmethod
     def _validate_against_field(

Tekst-API/tekst/routers/resources.py

@@ -828,8 +828,7 @@ async def _import_resource_task(
 
     # get content models
     content_model = resource_types_mgr.get(resource_doc.resource_type).content_model()
-    doc_model: ContentBaseDocument = content_model.document_model()
-    content_update_model = content_model.update_model()
+    content_doc_model: ContentBaseDocument = content_model.document_model()
 
     created_count = 0
     updated_count = 0
@@ -857,24 +856,28 @@ async def _import_resource_task(
                 raise errors.E_400_IMPORT_ID_NON_EXISTENT
 
             # check if this content already exists
-            content_doc = await doc_model.find_one(
-                doc_model.resource_id == resource_doc.id,
-                doc_model.location_id == loc_id,
+            content_doc = await content_doc_model.find_one(
+                content_doc_model.resource_id == resource_doc.id,
+                content_doc_model.location_id == loc_id,
             )
 
-            # validate content against model
+            # create ready-to-write content model instances
+            # and validate content against model
             try:
                 if content_doc:
-                    await content_doc.apply_updates(
-                        content_update_model(
-                            resource_type=resource_doc.resource_type,
-                            **content,
-                        ),
-                        write_to_db=False,
+                    # this is an update to an existing content document
+                    # (we replace it COMPLETELY but keep the ID)
+                    new_content_doc = content_doc_model(
+                        id=content_doc.id,
+                        resource_type=resource_doc.resource_type,
+                        resource_id=resource_doc.id,
+                        location_id=loc_id,
+                        **content,
                     )
-                    contents.append((content_doc, True))
+                    contents.append((new_content_doc, True))
                 else:
-                    content_doc = doc_model(
+                    # this is a new content document
+                    content_doc = content_doc_model(
                         resource_type=resource_doc.resource_type,
                         resource_id=resource_doc.id,
                         location_id=loc_id,

Tekst-API/tests/test_api_contents.py

@@ -118,7 +118,7 @@ async def test_find_contents(
     )["resources"][0]
     await login(is_superuser=True)
 
-    # find all contents
+    # find all contents of resource
     resp = await test_client.get(
         "/contents",
         params={"res": [resource_id], "limit": 100},
@@ -127,7 +127,7 @@ async def test_find_contents(
     assert isinstance(resp.json(), list)
     assert len(resp.json()) > 0
 
-    # find all contents of resource
+    # find all contents
     resp = await test_client.get(
         "/contents",
         params={"limit": 100},

Tekst-API/tests/test_api_resources.py

@@ -1268,15 +1268,6 @@ async def test_import_resource(
     assert "id" in resp.json()
     assert not await wait_for_task_success(resp.json()["id"])
 
-    # upload valid resource data file
-    resp = await test_client.post(
-        f"/resources/{resource_id}/import",
-        files={"file": ("foo.json", import_sample_string, "application/json")},
-    )
-    assert_status(202, resp)
-    assert "id" in resp.json()
-    assert await wait_for_task_success(resp.json()["id"])
-
     # fail to upload resource data without write permissions
     await login()
     resp = await test_client.post(
@@ -1314,6 +1305,55 @@ async def test_import_resource(
     assert "id" in resp.json()
     assert not await wait_for_task_success(resp.json()["id"])
 
+    # upload valid resource data file
+    resp = await test_client.post(
+        f"/resources/{resource_id}/import",
+        files={"file": ("foo.json", import_sample_string, "application/json")},
+    )
+    assert_status(202, resp)
+    assert "id" in resp.json()
+    assert await wait_for_task_success(resp.json()["id"])
+
+    # upload update to valid resource data
+    resp = await test_client.post(
+        f"/resources/{resource_id}/import",
+        files={
+            "file": (
+                "foo.json",
+                json.dumps(
+                    {
+                        "contents": [
+                            {
+                                "locationId": additional_location_id,
+                                "text": "Frustrationstoleranz",
+                            },
+                        ],
+                        "resourceId": resource_id,
+                    }
+                ),
+                "application/json",
+            )
+        },
+    )
+    assert_status(202, resp)
+    assert "id" in resp.json()
+    assert await wait_for_task_success(resp.json()["id"])
+
+    # check if content doc was updated correctly:
+    # find all contents of resource
+    resp = await test_client.get(
+        "/contents",
+        params={"res": [resource_id], "limit": 100},
+    )
+    assert_status(200, resp)
+    assert isinstance(resp.json(), list)
+    assert len(resp.json()) > 0
+    # check if target content is a-okay
+    for c in resp.json():
+        if c["locationId"] == additional_location_id:
+            assert c["text"] == "Frustrationstoleranz"
+            break
+
 
 @pytest.mark.anyio
 async def test_export_content(