✨ - feat: allow single reviewer for list with short process

Author: svenvandescheur

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

@@ -8,6 +8,7 @@
 from rest_framework.relations import SlugRelatedField
 
 from openarchiefbeheer.accounts.api.serializers import UserSerializer
+from openarchiefbeheer.config.models import ArchiveConfig
 from openarchiefbeheer.logging import logevent
 from openarchiefbeheer.zaken.api.serializers import ZaakSerializer
 from openarchiefbeheer.zaken.models import Zaak
@@ -131,25 +132,49 @@ def validate(self, attrs: dict) -> dict:
         """
         assignees = attrs.get("assignees")
 
-        if assignees:
-            # Validate that assignees can only be set when comment is provided.
-            current_reviewers = (
-                self.instance.assignees.filter(role=ListRole.reviewer)
-                if self.instance
-                else DestructionListAssignee.objects.none()
-            )
-            current_reviewer_pks = list(
-                current_reviewers.values_list("user__pk", flat=True)
-            )
-            assignee_pks = [assignee["user"].pk for assignee in assignees]
+        if not assignees:
+            return attrs
 
-            if current_reviewer_pks and current_reviewer_pks != assignee_pks:
-                comment = attrs.get("comment", "").strip()
+        # Validate that assignees can only be set when comment is provided.
+        current_reviewers = (
+            self.instance.assignees.filter(role=ListRole.reviewer)
+            if self.instance
+            else DestructionListAssignee.objects.none()
+        )
+        current_reviewer_pks = list(
+            current_reviewers.values_list("user__pk", flat=True)
+        )
+        assignee_pks = [assignee["user"].pk for assignee in assignees]
 
-                if not comment:
-                    raise ValidationError(
-                        _("A comment should be provided when changing assignees.")
+        if current_reviewer_pks and current_reviewer_pks != assignee_pks:
+            comment = attrs.get("comment", "").strip()
+
+            if not comment:
+                raise ValidationError(
+                    _("A comment should be provided when changing assignees.")
+                )
+
+        if len(assignees) == 1:
+            items = self.initial_data["items"]
+            zaken_urls = [i["zaak"] for i in items]
+            zaaktypes_urls = (
+                Zaak.objects.filter(url__in=zaken_urls)
+                .values_list("zaaktype", flat=True)
+                .distinct()
+            )
+            config = ArchiveConfig.get_solo()
+
+            if not all(
+                [
+                    zaaktype in config.zaaktypes_short_process
+                    for zaaktype in zaaktypes_urls
+                ]
+            ):
+                raise ValidationError(
+                    _(
+                        "A destruction list without a short reviewing process must have more than 1 reviewer."
                     )
+                )
 
         return attrs
 

backend/src/openarchiefbeheer/destruction/tests/test_serializers.py

@@ -11,8 +11,10 @@
 from timeline_logger.models import TimelineLog
 
 from openarchiefbeheer.accounts.tests.factories import UserFactory
+from openarchiefbeheer.config.models import ArchiveConfig
 from openarchiefbeheer.emails.models import EmailConfig
 
+from ...zaken.tests.factories import ZaakFactory
 from ..api.serializers import DestructionListReviewSerializer, DestructionListSerializer
 from ..constants import ListItemStatus, ListRole, ListStatus, ReviewDecisionChoices
 from ..models import (
@@ -122,6 +124,76 @@ def test_create_destruction_list(self):
             '[2024-05-02T16:00:00+02:00]: Destruction list "A test list" created by user record_manager.',
         )
 
+    def test_destruction_list_with_short_procedure_requires_multiple_reviewers(self):
+        reviewer = UserFactory.create(
+            username="reviewer1",
+            email="[email protected]",
+            role__can_review_destruction=True,
+        )
+        record_manager = UserFactory.create(
+            username="record_manager", role__can_start_destruction=True
+        )
+        zaak = ZaakFactory.create()
+        request = factory.get("/foo")
+        request.user = record_manager
+
+        with patch(
+            "openarchiefbeheer.config.models.ArchiveConfig.get_solo",
+            return_value=ArchiveConfig(zaaktypes_short_process=[zaak.zaaktype]),
+        ):
+            data = {
+                "name": "A test list",
+                "contains_sensitive_info": True,
+                "assignees": [
+                    {"user": reviewer.pk, "order": 0},
+                ],
+                "items": [
+                    {
+                        "zaak": zaak.url,
+                        "extra_zaak_data": {},
+                    },
+                ],
+            }
+            serializer = DestructionListSerializer(
+                data=data, context={"request": request}
+            )
+            self.assertTrue(serializer.is_valid())
+
+    def test_destruction_list_without_short_procedure_requires_multiple_reviewers(self):
+        reviewer = UserFactory.create(
+            username="reviewer1",
+            email="[email protected]",
+            role__can_review_destruction=True,
+        )
+        record_manager = UserFactory.create(
+            username="record_manager", role__can_start_destruction=True
+        )
+        zaak = ZaakFactory.create()
+        request = factory.get("/foo")
+        request.user = record_manager
+
+        data = {
+            "name": "A test list",
+            "contains_sensitive_info": True,
+            "assignees": [
+                {"user": reviewer.pk, "order": 0},
+            ],
+            "items": [
+                {
+                    "zaak": zaak.url,
+                    "extra_zaak_data": {},
+                },
+            ],
+        }
+
+        serializer = DestructionListSerializer(data=data, context={"request": request})
+        serializer.is_valid()
+
+        self.assertIn(
+            "A destruction list without a short reviewing process must have more than 1 reviewer.",
+            serializer.errors["non_field_errors"],
+        )
+
     def test_zaak_already_included_in_other_list(self):
         user1 = UserFactory.create(
             username="reviewer1", role__can_review_destruction=True

frontend/src/lib/api/destructionLists.ts

@@ -68,9 +68,11 @@ export async function createDestructionList(
   assignees: string[] | number[] | User[],
 ) {
   const urls = zaken.map((zaak) => (isPrimitive(zaak) ? zaak : zaak.url));
-  const assigneeIds = assignees.map((assignee) =>
-    isPrimitive(assignee) ? assignee.toString() : assignee.pk.toString(),
-  );
+  const assigneeIds = assignees
+    .map((assignee) =>
+      isPrimitive(assignee) ? assignee.toString() : assignee.pk.toString(),
+    )
+    .filter((v) => v);
 
   const destructionList = {
     name,

frontend/src/pages/destructionlist/create/DestructionListCreate.tsx

@@ -81,7 +81,7 @@ export function DestructionListCreatePage() {
         value: String(user.pk),
         label: user.username,
       })),
-      required: true,
+      required: false,
     },
   ];