Merge pull request #382 from maykinmedia/fix/377-fix-review-responses

[#377] Fix review responses

Author: SilviaAmAm

backend/docs/developers/index.rst

@@ -14,4 +14,5 @@ Content
 
     e2e-tests
     gherkin-like-tests
-    vcr-tests
+    vcr-tests
+    logic

backend/docs/developers/logic.rst

@@ -0,0 +1,14 @@
+.. _developers_logic:
+
+
+Processing a review
+===================
+
+After a reviewer has reviewed a destruction list, the record manager needs to process the feedback.
+For each zaak that has been "rejected" by the reviewer, the record manager can:
+
+- Keep the zaak in the destruction list (go against the suggestion of the reviewer). In this case, no details of the zaak can be updated.
+- Remove the zaak from the destruction list. When removing the zaak, the record manager should either:
+
+   - Update the selectielijstklasse of the zaak. This should automatically update the archiefactiedatum of the zaak (this is currently done by the frontend). This is for example desirable in the case that the zaak has the wrong selectielijstklasse by accident.
+   - Update the archiefactiedatum of the zaak. In this case the selectielijstklasse is correct, but for whatever reason the zaak needs to be kept for longer.

backend/src/openarchiefbeheer/destruction/api/serializers.py

@@ -18,11 +18,13 @@
 from openarchiefbeheer.zaken.models import Zaak
 
 from ..constants import (
+    DestructionListItemAction,
     InternalStatus,
     ListItemStatus,
     ListRole,
     ListStatus,
     ReviewDecisionChoices,
+    ZaakActionType,
 )
 from ..models import (
     DestructionList,
@@ -502,11 +504,53 @@ class Meta:
             "pk",
             "review_item",
             "action_item",
+            "action_zaak_type",
             "action_zaak",
             "created",
             "comment",
         )
 
+    def validate(self, attrs: dict) -> dict:
+        action_zaak = attrs.get("action_zaak", {})
+        if attrs["action_item"] == DestructionListItemAction.keep and action_zaak:
+            raise ValidationError(
+                {
+                    "action_zaak": _(
+                        "The case cannot be changed if it is kept in the destruction list."
+                    )
+                }
+            )
+
+        zaak_action_type = attrs.get("action_zaak_type")
+        selectielijstklasse = action_zaak.get("selectielijstklasse")
+        if (
+            attrs["action_item"] == DestructionListItemAction.remove
+            and zaak_action_type == ZaakActionType.bewaartermijn
+            and selectielijstklasse
+        ):
+            raise ValidationError(
+                {
+                    "action_zaak_type": _(
+                        "The selectielijstklasse cannot be changed if the case action type is 'bewaartermijn'."
+                    )
+                }
+            )
+
+        if (
+            attrs["action_item"] == DestructionListItemAction.remove
+            and zaak_action_type == ZaakActionType.selectielijstklasse_and_bewaartermijn
+            and not selectielijstklasse
+        ):
+            raise ValidationError(
+                {
+                    "selectielijstklasse": _(
+                        "The selectielijstklasse is required for action type is 'selectielijstklasse_and_bewaartermijn'."
+                    )
+                }
+            )
+
+        return attrs
+
 
 class ReviewResponseSerializer(serializers.ModelSerializer):
     items_responses = ReviewItemResponseSerializer(many=True)

backend/src/openarchiefbeheer/destruction/constants.py

@@ -33,6 +33,13 @@ class DestructionListItemAction(models.TextChoices):
     remove = "remove", _("remove")
 
 
+class ZaakActionType(models.TextChoices):
+    selectielijstklasse_and_bewaartermijn = "selectielijstklasse_and_bewaartermijn", _(
+        "selectielijstklasse and bewaartermijn"
+    )
+    bewaartermijn = "bewaartermijn", _("bewaartermijn")
+
+
 class InternalStatus(models.TextChoices):
     new = "new", _("new")
     queued = "queued", _("queued")

backend/src/openarchiefbeheer/destruction/migrations/0022_reviewitemresponse_action_zaak_type.py

@@ -0,0 +1,30 @@
+# Generated by Django 4.2.15 on 2024-09-23 13:12
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("destruction", "0021_destructionlist_planned_destruction_date"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="reviewitemresponse",
+            name="action_zaak_type",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    (
+                        "selectielijstklasse_and_bewaartermijn",
+                        "selectielijstklasse and bewaartermijn",
+                    ),
+                    ("bewaartermijn", "bewaartermijn"),
+                ],
+                help_text="What type of change to do on the case. ",
+                max_length=80,
+                verbose_name="action zaak type",
+            ),
+        ),
+    ]

backend/src/openarchiefbeheer/destruction/models.py

@@ -24,6 +24,7 @@
     ListRole,
     ListStatus,
     ReviewDecisionChoices,
+    ZaakActionType,
 )
 from .exceptions import ZaakArchiefactiedatumInFuture, ZaakNotFound
 
@@ -468,6 +469,13 @@ class ReviewItemResponse(models.Model):
         choices=DestructionListItemAction.choices,
         max_length=80,
     )
+    action_zaak_type = models.CharField(
+        _("action zaak type"),
+        choices=ZaakActionType.choices,
+        max_length=80,
+        help_text=_("What type of change to do on the case. "),
+        blank=True,
+    )
     action_zaak = models.JSONField(
         _("action case"),
         blank=True,
@@ -501,7 +509,7 @@ class Meta:
     def __str__(self):
         return f"Response to {self.review_item}"
 
-    def process(self):
+    def process(self) -> None:
         if self.processing_status == InternalStatus.succeeded:
             return
 
@@ -514,7 +522,6 @@ def process(self):
             destruction_list_item.status = ListItemStatus.removed
             destruction_list_item.save()
 
-        if self.action_zaak:
             destruction_list_item.zaak.update_data(self.action_zaak)
 
         self.processing_status = InternalStatus.succeeded