Merge pull request #1551 from open-zaak/feature/1550-bestandsdeel-lock

✨ [#1550] add 'lock' to BestandsDeel response

src/openzaak/components/documenten/api/serializers.py

@@ -200,9 +200,14 @@ def get_attribute(self, instance):
         return instance.get_informatieobject()
 
 
+class LockField(serializers.CharField):
+    def get_attribute(self, instance):
+        return instance.get_current_lock_value()
+
+
 class BestandsDeelSerializer(serializers.HyperlinkedModelSerializer):
-    lock = serializers.CharField(
-        write_only=True,
+    lock = LockField(
+        required=True,
         help_text="Hash string, which represents id of the lock of related informatieobject",
     )
 

src/openzaak/components/documenten/tests/test_upload.py

@@ -601,6 +601,7 @@ def _upload_part_files(self):
             )
 
             self.assertEqual(response.status_code, status.HTTP_200_OK, response.data)
+            self.assertEqual(response.json()["lock"], self.canonical.lock)
 
             part.refresh_from_db()
 
@@ -743,6 +744,63 @@ def test_upload_part_twice_correct(self):
         self.assertNotEqual(part.inhoud, "")
         self.assertEqual(part.voltooid, True)
 
+    def test_upload_part_without_lock(self):
+        """
+        Test the upload of the part file without lock
+
+        Input:
+        * part file
+
+        Expected result:
+        * 400 status
+        """
+        self._create_metadata()
+
+        # upload one of parts again
+        self.file_content.seek(0)
+        part_files = split_file(
+            self.file_content, settings.DOCUMENTEN_UPLOAD_CHUNK_SIZE
+        )
+        part = self.bestandsdelen[0]
+        part_url = get_operation_url("bestandsdeel_update", uuid=part.uuid)
+
+        response = self.client.put(
+            part_url, {"inhoud": part_files[0],}, format="multipart",
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        error = get_validation_errors(response, "lock")
+        self.assertEqual(error["code"], "required")
+
+    def test_upload_part_with_incorrect_lock(self):
+        """
+        Test the upload of the part file without lock
+
+        Input:
+        * part file
+        * lock (incorrect)
+
+        Expected result:
+        * 400 status
+        """
+        self._create_metadata()
+
+        # upload one of parts again
+        self.file_content.seek(0)
+        part_files = split_file(
+            self.file_content, settings.DOCUMENTEN_UPLOAD_CHUNK_SIZE
+        )
+        part = self.bestandsdelen[0]
+        part_url = get_operation_url("bestandsdeel_update", uuid=part.uuid)
+
+        response = self.client.put(
+            part_url, {"inhoud": part_files[0], "lock": "12345"}, format="multipart",
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
+        error = get_validation_errors(response, "nonFieldErrors")
+        self.assertEqual(error["code"], "incorrect-lock-id")
+
     def test_unlock_without_uploading(self):
         """
         Test the unlock of the document with no part files uploaded