Merge pull request #1459 from open-zaak/feature/1458-zaak-archive-val…

…idation Check that zaak is not archived
open-zaak · Sep 18, 2023 · 330aaab · 330aaab
2 parents 06d3b9b + 2a6afbd
commit 330aaab
Show file tree

Hide file tree

Showing 7 changed files with 1,041 additions and 771 deletions.
diff --git a/src/openzaak/components/zaken/api/serializers/zaakobjecten.py b/src/openzaak/components/zaken/api/serializers/zaakobjecten.py
@@ -16,6 +16,7 @@
     EitherFieldRequiredValidator,
     JQExpressionValidator,
     ObjectTypeOverigeDefinitieValidator,
+    ZaakArchiefStatusValidator,
 )
 from .address import ObjectAdresSerializer
 from .betrokkenen import (
@@ -176,6 +177,7 @@ class Meta:
                 skip_for_updates=True,
             ),
             ObjectTypeOverigeDefinitieValidator(),
+            ZaakArchiefStatusValidator(),
         ]
 
     def get_fields(self):

diff --git a/src/openzaak/components/zaken/api/serializers/zaken.py b/src/openzaak/components/zaken/api/serializers/zaken.py
@@ -78,6 +78,7 @@
     RolOccurenceValidator,
     StatusRolValidator,
     UniekeIdentificatieValidator,
+    ZaakArchiefStatusValidator,
     ZaakArchiveIOsArchivedValidator,
 )
 from .betrokkenen import (
@@ -524,6 +525,7 @@ class Meta:
             EndStatusIOsUnlockedValidator(),
             EndStatusIOsIndicatieGebruiksrechtValidator(),
             StatusRolValidator(),
+            ZaakArchiefStatusValidator(),
         ]
         extra_kwargs = {
             "url": {"lookup_field": "uuid"},
@@ -702,6 +704,7 @@ class Meta:
                 fields=["zaak", "informatieobject"],
             ),
             ObjecttypeInformatieobjecttypeRelationValidator(),
+            ZaakArchiefStatusValidator(),
         ]
         extra_kwargs = {
             "url": {"lookup_field": "uuid"},
@@ -793,7 +796,10 @@ class Meta:
                 ],
             },
         }
-        validators = [CorrectZaaktypeValidator("eigenschap")]
+        validators = [
+            CorrectZaaktypeValidator("eigenschap"),
+            ZaakArchiefStatusValidator(),
+        ]
 
     def validate(self, attrs):
         super().validate(attrs)
@@ -880,6 +886,7 @@ class Meta:
             RolOccurenceValidator(RolOmschrijving.initiator, max_amount=1),
             RolOccurenceValidator(RolOmschrijving.zaakcoordinator, max_amount=1),
             CorrectZaaktypeValidator("roltype"),
+            ZaakArchiefStatusValidator(),
         ]
         extra_kwargs = {
             "url": {"lookup_field": "uuid"},
@@ -959,7 +966,10 @@ class ResultaatSerializer(serializers.HyperlinkedModelSerializer):
     class Meta:
         model = Resultaat
         fields = ("url", "uuid", "zaak", "resultaattype", "toelichting")
-        validators = [CorrectZaaktypeValidator("resultaattype")]
+        validators = [
+            CorrectZaaktypeValidator("resultaattype"),
+            ZaakArchiefStatusValidator(),
+        ]
         extra_kwargs = {
             "url": {"lookup_field": "uuid"},
             "uuid": {"read_only": True},
@@ -1001,6 +1011,7 @@ class Meta:
                 ],
             },
         }
+        validator = [ZaakArchiefStatusValidator()]
 
     def create(self, validated_data):
         validated_data["zaak"] = self.context["parent_object"]
@@ -1023,6 +1034,7 @@ class Meta:
                 ]
             },
         }
+        validators = [ZaakArchiefStatusValidator()]
 
     def create(self, validated_data):
         with transaction.atomic():
@@ -1071,6 +1083,7 @@ class Meta:
             "zaak": {"lookup_field": "uuid"},
             "verzoek": {"validators": [verzoek_validator]},
         }
+        validators = [ZaakArchiefStatusValidator()]
 
     def create(self, validated_data):
         with transaction.atomic():

diff --git a/src/openzaak/components/zaken/api/validators.py b/src/openzaak/components/zaken/api/validators.py
@@ -507,3 +507,21 @@ def __call__(self, attrs):
 
         if gezetdoor.zaak != zaak:
             raise serializers.ValidationError(self.message, code=self.code)
+
+
+class ZaakArchiefStatusValidator:
+    code = "zaak-archiefstatus-invalid"
+    message = _(
+        "De huidige zaak archiefstatus staat dit request niet toe. "
+        "Archiefstatus moet gelijk zijn aan 'nog_te_archiveren'"
+    )
+    requires_context = True
+
+    def __call__(self, attrs, serializer):
+        zaak = get_from_serializer_data_or_instance("zaak", attrs, serializer)
+
+        if not zaak:
+            return
+
+        if zaak.archiefstatus != Archiefstatus.nog_te_archiveren:
+            raise serializers.ValidationError(self.message, code=self.code)