Merge pull request #741 from maykinmedia/fix/726-settings-report

SilviaAmAm · web-flow · commit 0544ba9f9bba · 2025-03-14T14:21:03.000+01:00
[#726] Fix settings for destruction report
diff --git a/backend/src/openarchiefbeheer/config/migrations/0007_alter_archiveconfig_zaaktype.py b/backend/src/openarchiefbeheer/config/migrations/0007_alter_archiveconfig_zaaktype.py
@@ -0,0 +1,38 @@
+# Generated by Django 4.2.18 on 2025-03-11 11:18
+
+from django.db import migrations, models
+
+
+# Make sure the configuration is cleared. This is a change that we
+# cannot automatically make, so we make sure that the field is cleared
+# so that the health check can flag it.
+def clear_zaaktype_config(apps, schema_editor):
+    ArchiveConfig = apps.get_model("config", "ArchiveConfig")
+
+    config = ArchiveConfig.objects.first()
+    if not config:
+        return
+
+    config.zaaktype = ""
+    config.save()
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("config", "0006_alter_archiveconfig_zaaktypes_short_process"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="archiveconfig",
+            name="zaaktype",
+            field=models.CharField(
+                blank=True,
+                help_text="The identificatie of the zaaktype to use when creating the case for the destruction list deletion.",
+                max_length=1000,
+                verbose_name="zaaktype",
+            ),
+        ),
+        migrations.RunPython(clear_zaaktype_config, clear_zaaktype_config),
+    ]
diff --git a/backend/src/openarchiefbeheer/config/models.py b/backend/src/openarchiefbeheer/config/models.py
@@ -24,12 +24,12 @@ class ArchiveConfig(SingletonModel):
         blank=True,
         help_text=_("Source organisation RSIN"),
     )
-    zaaktype = models.URLField(
+    zaaktype = models.CharField(
         "zaaktype",
         blank=True,
         max_length=1000,
         help_text=_(
-            "The case type URL to use when creating the case for the destruction list deletion."
+            "The identificatie of the zaaktype to use when creating the case for the destruction list deletion."
         ),
     )
     statustype = models.URLField(
diff --git a/backend/src/openarchiefbeheer/zaken/api/mixins.py b/backend/src/openarchiefbeheer/zaken/api/mixins.py
@@ -10,6 +10,6 @@ def get_query_params(self, request: Request) -> HashableDict:
         serializer = ZaaktypeFilterSerializer(data=request.query_params)
         serializer.is_valid(raise_exception=True)
         query_params = HashableDict()
-        query_params.update(serializer.validated_data)
+        query_params.update(serializer.data)
 
         return query_params
diff --git a/backend/src/openarchiefbeheer/zaken/api/serializers.py b/backend/src/openarchiefbeheer/zaken/api/serializers.py
@@ -2,6 +2,7 @@
 
 from django.utils.translation import gettext_lazy as _
 
+from djangorestframework_camel_case.util import camelize
 from drf_spectacular.utils import extend_schema_field
 from furl import furl
 from rest_framework import serializers
@@ -96,6 +97,13 @@ class ZaaktypeFilterSerializer(serializers.Serializer):
         required=False,
         help_text=_("The URL of the zaaktype on which to filter."),
     )
+    zaaktype_identificatie = serializers.CharField(
+        required=False,
+        help_text=_("The identificatie of the zaaktype on which to filter."),
+    )
+
+    def to_representation(self, instance):
+        return camelize(instance)
 
 
 @lru_cache
diff --git a/backend/src/openarchiefbeheer/zaken/api/views.py b/backend/src/openarchiefbeheer/zaken/api/views.py
@@ -10,6 +10,7 @@
 from rest_framework import status
 from rest_framework.exceptions import ValidationError
 from rest_framework.permissions import IsAdminUser, IsAuthenticated
+from rest_framework.request import Request
 from rest_framework.response import Response
 from rest_framework.views import APIView
 
@@ -253,6 +254,37 @@ def get(self, request, *args, **kwargs):
 class InformatieobjecttypeChoicesView(FilterOnZaaktypeMixin, APIView):
     permission_classes = [IsAuthenticated]
 
+    # TODO
+    # Remove once https://github.com/open-zaak/open-zaak/issues/1939 is fixed
+    def get_query_params(self, request: Request) -> HashableDict:
+        """
+        We need to filter the informatieobjecttypen on zaaktype URL, but we only have the identificatie.
+        The identificatie can represent multiple versions of the zaaktype (multiple URLs).
+        As a bandaid fix, we use the URL of the latest version (highest begin_geldigheid field).
+        """
+        query_params = HashableDict()
+        if not request.GET.get("zaaktype_identificatie"):
+            return query_params
+
+        serializer = ZaaktypeFilterSerializer(data=request.query_params)
+        serializer.is_valid(raise_exception=True)
+
+        zaaktypen_query_params = HashableDict()
+        zaaktypen_query_params.update(
+            {"identificatie": serializer.validated_data["zaaktype_identificatie"]}
+        )
+        zaaktypen = retrieve_zaaktypen(zaaktypen_query_params)
+        if not zaaktypen:
+            return query_params
+
+        # Sort in descending order, so that the zaaktype with the most recent begin date is first. (Latest zaaktype version)
+        zaaktypen = sorted(
+            zaaktypen, key=lambda zaaktype: zaaktype["begin_geldigheid"], reverse=True
+        )
+        query_params.update({"zaaktype": zaaktypen[0]["url"]})
+
+        return query_params
+
     @extend_schema(
         summary=_("Retrieve informatieobjecttypen choices"),
         description=_(
diff --git a/backend/src/openarchiefbeheer/zaken/tests/vcr/cassettes/InformatieobjecttypenChoicesViewTests.test_retrieve_choices_with_filters.yaml b/backend/src/openarchiefbeheer/zaken/tests/vcr/cassettes/InformatieobjecttypenChoicesViewTests.test_retrieve_choices_with_filters.yaml
@@ -7,7 +7,64 @@ interactions:
       Accept-Encoding:
       - gzip, deflate, br
       Authorization:
-      - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0LXZjciIsImlhdCI6MTczOTc5Nzc1NCwiY2xpZW50X2lkIjoidGVzdC12Y3IiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.yLGVdWLUP1fTlN1e_AGBtF8A_OS1Aon2Ky_t-rLb9eY
+      - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0LXZjciIsImlhdCI6MTc0MTY5MjMxMywiY2xpZW50X2lkIjoidGVzdC12Y3IiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.STB3xuL_Kixe2V2Fo-3RlB1dMU_A_a7KZd4qKAEPO3w
+      Connection:
+      - keep-alive
+      User-Agent:
+      - python-requests/2.32.3
+    method: GET
+    uri: http://localhost:8003/catalogi/api/v1/zaaktypen?identificatie=ZAAKTYPE-2018-0000000001
+  response:
+    body:
+      string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/zaaktypen/be210495-20b6-48ff-8d3d-3e44f74c43a4","identificatie":"ZAAKTYPE-2018-0000000001","omschrijving":"brand
+        world-class initiatives","omschrijvingGeneriek":"","vertrouwelijkheidaanduiding":"","doel":"Trouble
+        red compare produce animal. Everything today Democrat student enter. By probably
+        adult.","aanleiding":"Couple toward trip old nice memory system instead.","toelichting":"","indicatieInternOfExtern":"extern","handelingInitiator":"indienen","onderwerp":"Evenementvergunning","handelingBehandelaar":"uitvoeren","doorlooptijd":"P30D","servicenorm":null,"opschortingEnAanhoudingMogelijk":true,"verlengingMogelijk":false,"verlengingstermijn":null,"trefwoorden":[],"publicatieIndicatie":true,"publicatietekst":"","verantwoordingsrelatie":[],"productenOfDiensten":["https://example.com/product/123"],"selectielijstProcestype":"https://selectielijst.openzaak.nl/api/v1/procestypen/aa8aa2fd-b9c6-4e34-9a6c-58a677f60ea0","referentieproces":{"naam":"ReferentieProces
+        0","link":""},"concept":false,"verantwoordelijke":"100000000","beginGeldigheid":"2018-01-01","eindeGeldigheid":null,"versiedatum":"2018-01-01","beginObject":"2018-01-01","eindeObject":null,"catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/ec77ad39-0954-4aeb-bcf2-6f45263cde77","statustypen":["http://localhost:8003/catalogi/api/v1/statustypen/9438e56a-5d78-4dc8-9d9a-2404781f818d"],"resultaattypen":["http://localhost:8003/catalogi/api/v1/resultaattypen/12903100-b7a0-4441-9645-eda7df2ad106"],"eigenschappen":[],"informatieobjecttypen":["http://localhost:8003/catalogi/api/v1/informatieobjecttypen/a8089bdf-72d3-414f-a9cd-953cfa602b6c"],"roltypen":[],"besluittypen":["http://localhost:8003/catalogi/api/v1/besluittypen/588d7ec5-89e6-4aa0-a654-7475f0d5ac8e"],"deelzaaktypen":[],"gerelateerdeZaaktypen":[],"zaakobjecttypen":[]}]}'
+    headers:
+      API-version:
+      - 1.3.1
+      Allow:
+      - GET, POST, HEAD, OPTIONS
+      Connection:
+      - keep-alive
+      Content-Length:
+      - '1905'
+      Content-Security-Policy:
+      - 'frame-src ''self''; img-src ''self'' data: cdn.redoc.ly cdnjs.cloudflare.com
+        *.tile.openstreetmap.org; font-src ''self'' fonts.gstatic.com; default-src
+        ''self''; worker-src ''self'' blob:; object-src ''none''; script-src ''self''
+        ''unsafe-inline'' cdnjs.cloudflare.com; style-src ''self'' ''unsafe-inline''
+        fonts.googleapis.com cdnjs.cloudflare.com; form-action ''self''; frame-ancestors
+        ''none''; base-uri ''self''; connect-src ''self'' raw.githubusercontent.com'
+      Content-Type:
+      - application/json
+      Cross-Origin-Opener-Policy:
+      - same-origin
+      Date:
+      - Tue, 11 Mar 2025 11:25:13 GMT
+      Referrer-Policy:
+      - same-origin
+      Server:
+      - nginx/1.27.0
+      Vary:
+      - Accept, origin
+      X-Content-Type-Options:
+      - nosniff
+      X-Frame-Options:
+      - DENY
+    status:
+      code: 200
+      message: OK
+- request:
+    body: null
+    headers:
+      Accept:
+      - '*/*'
+      Accept-Encoding:
+      - gzip, deflate, br
+      Authorization:
+      - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0LXZjciIsImlhdCI6MTc0MTY5MjMxMywiY2xpZW50X2lkIjoidGVzdC12Y3IiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.STB3xuL_Kixe2V2Fo-3RlB1dMU_A_a7KZd4qKAEPO3w
       Connection:
       - keep-alive
       User-Agent:
@@ -30,18 +87,18 @@ interactions:
       Content-Length:
       - '1137'
       Content-Security-Policy:
-      - 'img-src ''self'' data: cdn.redoc.ly cdnjs.cloudflare.com *.tile.openstreetmap.org;
-        object-src ''none''; script-src ''self'' ''unsafe-inline'' cdnjs.cloudflare.com;
-        worker-src ''self'' blob:; form-action ''self''; style-src ''self'' ''unsafe-inline''
-        fonts.googleapis.com cdnjs.cloudflare.com; default-src ''self''; frame-src
-        ''self''; font-src ''self'' fonts.gstatic.com; frame-ancestors ''none''; connect-src
-        ''self'' raw.githubusercontent.com; base-uri ''self'''
+      - 'frame-src ''self''; img-src ''self'' data: cdn.redoc.ly cdnjs.cloudflare.com
+        *.tile.openstreetmap.org; font-src ''self'' fonts.gstatic.com; default-src
+        ''self''; worker-src ''self'' blob:; object-src ''none''; script-src ''self''
+        ''unsafe-inline'' cdnjs.cloudflare.com; style-src ''self'' ''unsafe-inline''
+        fonts.googleapis.com cdnjs.cloudflare.com; form-action ''self''; frame-ancestors
+        ''none''; base-uri ''self''; connect-src ''self'' raw.githubusercontent.com'
       Content-Type:
       - application/json
       Cross-Origin-Opener-Policy:
       - same-origin
       Date:
-      - Mon, 17 Feb 2025 13:09:14 GMT
+      - Tue, 11 Mar 2025 11:25:13 GMT
       Referrer-Policy:
       - same-origin
       Server:
diff --git a/backend/src/openarchiefbeheer/zaken/tests/vcr/cassettes/ResultaattypenChoicesViewTests.test_retrieve_choices_with_filters.yaml b/backend/src/openarchiefbeheer/zaken/tests/vcr/cassettes/ResultaattypenChoicesViewTests.test_retrieve_choices_with_filters.yaml
@@ -7,13 +7,13 @@ interactions:
       Accept-Encoding:
       - gzip, deflate, br
       Authorization:
-      - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0LXZjciIsImlhdCI6MTczNjg1MTA1NCwiY2xpZW50X2lkIjoidGVzdC12Y3IiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.lxTut69IIIa6tkLAkRO51N7KMonJQGK07R_BNpLTz8o
+      - Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJ0ZXN0LXZjciIsImlhdCI6MTc0MTY5MjQwNSwiY2xpZW50X2lkIjoidGVzdC12Y3IiLCJ1c2VyX2lkIjoiIiwidXNlcl9yZXByZXNlbnRhdGlvbiI6IiJ9.NHP1eJnPCGTK0pYNWCzip8OPXjuV8lV3oD_RDJFXyCc
       Connection:
       - keep-alive
       User-Agent:
       - python-requests/2.32.3
     method: GET
-    uri: http://localhost:8003/catalogi/api/v1/resultaattypen?zaaktype=http%3A%2F%2Flocalhost%3A8003%2Fcatalogi%2Fapi%2Fv1%2Fzaaktypen%2Fbe210495-20b6-48ff-8d3d-3e44f74c43a4
+    uri: http://localhost:8003/catalogi/api/v1/resultaattypen?zaaktypeIdentificatie=ZAAKTYPE-2018-0000000001
   response:
     body:
       string: '{"count":1,"next":null,"previous":null,"results":[{"url":"http://localhost:8003/catalogi/api/v1/resultaattypen/12903100-b7a0-4441-9645-eda7df2ad106","zaaktype":"http://localhost:8003/catalogi/api/v1/zaaktypen/be210495-20b6-48ff-8d3d-3e44f74c43a4","zaaktypeIdentificatie":"ZAAKTYPE-2018-0000000001","omschrijving":"Successful","resultaattypeomschrijving":"Successful","omschrijvingGeneriek":"","selectielijstklasse":"https://selectielijst.openzaak.nl/api/v1/resultaten/cc5ae4e3-a9e6-4386-bcee-46be4986a829","toelichting":"","archiefnominatie":"","archiefactietermijn":null,"brondatumArchiefprocedure":{"afleidingswijze":"","datumkenmerk":"","einddatumBekend":false,"objecttype":"","registratie":"","procestermijn":null},"procesobjectaard":"","indicatieSpecifiek":null,"procestermijn":null,"catalogus":"http://localhost:8003/catalogi/api/v1/catalogussen/ec77ad39-0954-4aeb-bcf2-6f45263cde77","besluittypen":[],"besluittypeOmschrijving":[],"informatieobjecttypen":[],"informatieobjecttypeOmschrijving":[],"beginGeldigheid":null,"eindeGeldigheid":null,"beginObject":null,"eindeObject":null}]}'
@@ -26,12 +26,19 @@ interactions:
       - keep-alive
       Content-Length:
       - '1088'
+      Content-Security-Policy:
+      - 'frame-src ''self''; img-src ''self'' data: cdn.redoc.ly cdnjs.cloudflare.com
+        *.tile.openstreetmap.org; font-src ''self'' fonts.gstatic.com; default-src
+        ''self''; worker-src ''self'' blob:; object-src ''none''; script-src ''self''
+        ''unsafe-inline'' cdnjs.cloudflare.com; style-src ''self'' ''unsafe-inline''
+        fonts.googleapis.com cdnjs.cloudflare.com; form-action ''self''; frame-ancestors
+        ''none''; base-uri ''self''; connect-src ''self'' raw.githubusercontent.com'
       Content-Type:
       - application/json
       Cross-Origin-Opener-Policy:
       - same-origin
       Date:
-      - Tue, 14 Jan 2025 10:37:34 GMT
+      - Tue, 11 Mar 2025 11:26:45 GMT
       Referrer-Policy:
       - same-origin
       Server:
diff --git a/backend/src/openarchiefbeheer/zaken/tests/vcr/test_views.py b/backend/src/openarchiefbeheer/zaken/tests/vcr/test_views.py
@@ -123,9 +123,7 @@ def test_retrieve_choices_with_filters(self):
         user = UserFactory.create()
 
         endpoint = furl(reverse("api:retrieve-external-resultaattype-choices"))
-        endpoint.args["zaaktype"] = (
-            "http://localhost:8003/catalogi/api/v1/zaaktypen/be210495-20b6-48ff-8d3d-3e44f74c43a4"
-        )
+        endpoint.args["zaaktypeIdentificatie"] = "ZAAKTYPE-2018-0000000001"
 
         self.client.force_authenticate(user=user)
         response = self.client.get(endpoint.url)
@@ -186,9 +184,7 @@ def test_retrieve_choices_with_filters(self):
         user = UserFactory.create()
 
         endpoint = furl(reverse("api:retrieve-informatieobjecttype-choices"))
-        endpoint.args["zaaktype"] = (
-            "http://localhost:8003/catalogi/api/v1/zaaktypen/be210495-20b6-48ff-8d3d-3e44f74c43a4"
-        )
+        endpoint.args["zaaktypeIdentificatie"] = "ZAAKTYPE-2018-0000000001"
 
         self.client.force_authenticate(user=user)
         response = self.client.get(endpoint.url)
diff --git a/frontend/src/lib/api/private.ts b/frontend/src/lib/api/private.ts
@@ -10,7 +10,7 @@ import { request } from "./request";
  * the field 'omschrijving'.
  */
 export async function listInformatieObjectTypeChoices(
-  zaaktypeUrl?: string,
+  zaaktypeIdentificatie?: string,
   signal?: AbortSignal,
 ) {
   return cacheMemo(
@@ -20,7 +20,7 @@ export async function listInformatieObjectTypeChoices(
         "GET",
         "/_informatieobjecttype-choices/",
         {
-          zaaktype: zaaktypeUrl,
+          zaaktypeIdentificatie: zaaktypeIdentificatie,
         },
         undefined,
         undefined,
@@ -30,7 +30,7 @@ export async function listInformatieObjectTypeChoices(
 
       return promise;
     },
-    [zaaktypeUrl],
+    [zaaktypeIdentificatie],
   );
 }
 
@@ -39,7 +39,7 @@ export async function listInformatieObjectTypeChoices(
  * 'omschrijving'.
  */
 export async function listStatusTypeChoices(
-  zaaktypeUrl?: string,
+  zaaktypeIdentificatie?: string,
   signal?: AbortSignal,
 ) {
   return cacheMemo(
@@ -49,7 +49,7 @@ export async function listStatusTypeChoices(
         "GET",
         "/_statustype-choices/",
         {
-          zaaktype: zaaktypeUrl,
+          zaaktypeIdentificatie: zaaktypeIdentificatie,
         },
         undefined,
         undefined,
@@ -59,7 +59,7 @@ export async function listStatusTypeChoices(
 
       return promise;
     },
-    [zaaktypeUrl],
+    [zaaktypeIdentificatie],
   );
 }
 
@@ -68,7 +68,7 @@ export async function listStatusTypeChoices(
  * resultaattype. The label is the field 'omschrijving'.
  */
 export async function listResultaatTypeChoices(
-  zaaktypeUrl?: string,
+  zaaktypeIdentificatie?: string,
   signal?: AbortSignal,
 ) {
   return cacheMemo(
@@ -78,7 +78,7 @@ export async function listResultaatTypeChoices(
         "GET",
         "/_external-resultaattype-choices/",
         {
-          zaaktype: zaaktypeUrl,
+          zaaktypeIdentificatie: zaaktypeIdentificatie,
         },
         undefined,
         undefined,
@@ -88,7 +88,7 @@ export async function listResultaatTypeChoices(
 
       return promise;
     },
-    [zaaktypeUrl],
+    [zaaktypeIdentificatie],
   );
 }
 
@@ -130,7 +130,7 @@ export async function listSelectielijstKlasseChoices(
 
 /**
  * Retrieve zaaktypen from Open Zaak and return a value and a label per zaaktype.
- * The label is the 'omschrijving' field, and the value is the URL. The response is cached for 15 minutes.
+ * The label is the 'omschrijving' field, and the value is the identificatie. The response is cached for 15 minutes.
  * @param [params] - Additional search parameters for filtering (this keeps filters in sync with objects on page).
  * @param [external=false] - Fetch zaaktypen from ZRC Service (Open Zaak) (slower/can't be combined with other filtering options).
  * @param signal - Abort signal, should be called in cleanup function in React `useEffect()` hooks.
diff --git a/frontend/src/pages/settings/pages/destruction-report/DestructionReportSettingsPage.tsx b/frontend/src/pages/settings/pages/destruction-report/DestructionReportSettingsPage.tsx
@@ -64,7 +64,7 @@ export function DestructionReportSettingsPage() {
     [valuesState.zaaktype],
   );
   const { data: informatieObjectTypeChoices } = useDataFetcher(
-    (signal) => listInformatieObjectTypeChoices(valuesState.zaakType, signal),
+    (signal) => listInformatieObjectTypeChoices(valuesState.zaaktype, signal),
     {
       initialState: [],
       errorMessage:

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ export function DestructionReportSettingsPage() {`
`64`	`64`	`[valuesState.zaaktype],`
`65`	`65`	`);`
`66`	`66`	`const { data: informatieObjectTypeChoices } = useDataFetcher(`
`67`		`- (signal) => listInformatieObjectTypeChoices(valuesState.zaakType, signal),`
	`67`	`+ (signal) => listInformatieObjectTypeChoices(valuesState.zaaktype, signal),`
`68`	`68`	`{`
`69`	`69`	`initialState: [],`
`70`	`70`	`errorMessage:`