✨ [#234] Add filtering on review

Author: SilviaAmAm

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

@@ -3,7 +3,7 @@
 from rest_framework import serializers
 from rest_framework_gis.fields import GeometryField
 
-from openarchiefbeheer.destruction.models import DestructionList
+from openarchiefbeheer.destruction.models import DestructionList, DestructionListReview
 
 from ..models import Zaak
 
@@ -94,5 +94,11 @@ class ZaakTypeChoicesQueryParamSerializer(serializers.Serializer):
     destruction_list = serializers.SlugRelatedField(
         slug_field="uuid",
         required=False,
-        queryset=DestructionList.objects.all().prefetch_related("items", "items__zaak"),
+        queryset=DestructionList.objects.all().prefetch_related("items__zaak"),
+    )
+    review = serializers.PrimaryKeyRelatedField(
+        required=False,
+        queryset=DestructionListReview.objects.all().prefetch_related(
+            "item_reviews__destruction_list_item__zaak",
+        ),
     )

backend/src/openarchiefbeheer/zaken/api/views.py

@@ -17,6 +17,7 @@
 from ..tasks import retrieve_and_cache_zaken_from_openzaak
 from ..utils import (
     get_zaaktypen_choices_from_list,
+    get_zaaktypen_choices_from_review,
     retrieve_selectielijstklasse_choices,
     retrieve_zaaktypen_choices,
 )
@@ -70,6 +71,8 @@ def get(self, request, *args, **kwargs):
 
         if destruction_list := param_serializer.validated_data.get("destruction_list"):
             zaaktypen_choices = get_zaaktypen_choices_from_list(destruction_list)
+        elif review := param_serializer.validated_data.get("review"):
+            zaaktypen_choices = get_zaaktypen_choices_from_review(review)
         else:
             zaaktypen_choices = retrieve_zaaktypen_choices()
 

backend/src/openarchiefbeheer/zaken/utils.py

@@ -25,7 +25,10 @@
 from .types import DropDownChoice
 
 if TYPE_CHECKING:
-    from openarchiefbeheer.destruction.models import DestructionList
+    from openarchiefbeheer.destruction.models import (
+        DestructionList,
+        DestructionListReview,
+    )
 
 
 def pagination_helper(
@@ -112,25 +115,44 @@ def retrieve_zaaktypen_choices() -> list[DropDownChoice]:
     return sorted(zaaktypen_choices, key=lambda zaaktype: zaaktype["label"])
 
 
-def get_zaaktypen_choices_from_list(
-    destruction_list: "DestructionList",
-) -> list[DropDownChoice]:
-    items_qs = destruction_list.items.filter(status=ListItemStatus.suggested).distinct(
-        "zaak__zaaktype"
-    )
-    zaaktypen_to_include = items_qs.values_list(
-        "zaak__zaaktype", "zaak___expand__zaaktype__identificatie"
-    )
+def _get_zaaktype_choices(zaaktypen_to_include: dict[list]) -> list[DropDownChoice]:
+    """Return formatted zaaktype choices
 
+    Takes a dictionary where the key is the identificatie of a zaaktype and
+    the value is a list of all the URLs for the different versions of that zaaktype."""
     zaaktypen = defaultdict(list)
     for zaaktype_url, zaaktype_identificatie in zaaktypen_to_include:
         zaaktypen[zaaktype_identificatie].append(zaaktype_url)
+
     zaaktypen_choices = [
         {"label": key, "value": ",".join(value)} for key, value in zaaktypen.items()
     ]
     return sorted(zaaktypen_choices, key=lambda zaaktype: zaaktype["label"])
 
 
+def get_zaaktypen_choices_from_list(
+    destruction_list: "DestructionList",
+) -> list[DropDownChoice]:
+    zaaktypen_to_include = (
+        destruction_list.items.filter(status=ListItemStatus.suggested)
+        .distinct("zaak__zaaktype")
+        .values_list("zaak__zaaktype", "zaak___expand__zaaktype__identificatie")
+    )
+    return _get_zaaktype_choices(zaaktypen_to_include)
+
+
+def get_zaaktypen_choices_from_review(
+    review: "DestructionListReview",
+) -> list[DropDownChoice]:
+    zaaktypen_to_include = review.item_reviews.distinct(
+        "destruction_list_item__zaak__zaaktype"
+    ).values_list(
+        "destruction_list_item__zaak__zaaktype",
+        "destruction_list_item__zaak___expand__zaaktype__identificatie",
+    )
+    return _get_zaaktype_choices(zaaktypen_to_include)
+
+
 def format_selectielijstklasse_choice(resultaat: Resultaat) -> DropDownChoice:
     description = f"{resultaat.get('volledig_nummer', resultaat['nummer'])} - {resultaat['naam']} - {resultaat['waardering']}"
     if resultaat.get("bewaartermijn"):