Merge pull request #1402 from open-zaak/feature/besluit-list-optimiza…

…tion

besluiten list api optimization

src/openzaak/components/besluiten/models.py

@@ -200,7 +200,7 @@ def __init__(self, *args, **kwargs):
         if isinstance(self, ProxyMixin):
             self._previous_zaak = self.zaak
         else:
-            self._previous_zaak = self._zaak
+            self._previous_zaak_id = self._zaak_id
             self._previous_zaak_url = self._zaak_url
 
     def __str__(self):
@@ -217,10 +217,15 @@ def unique_representation(self):
 
     @property
     def previous_zaak(self):
-        if self._previous_zaak:
+        from openzaak.components.zaken.models import Zaak
+
+        if getattr(self, "_previous_zaak", None):
             return self._previous_zaak
 
-        if self._previous_zaak_url:
+        if getattr(self, "_previous_zaak_id", None):
+            return Zaak.objects.get(pk=self._previous_zaak_id)
+
+        if getattr(self, "_previous_zaak_url", None):
             remote_model = apps.get_model("zaken", "Zaak")
             return AuthorizedRequestsLoader().load(
                 url=self._previous_zaak_url, model=remote_model

src/openzaak/components/besluiten/tests/test_auth.py

@@ -77,6 +77,28 @@ def test_besluit_list(self):
             results[0]["besluittype"], f"http://testserver{reverse(self.besluittype)}"
         )
 
+    def test_besluit_list_empty_max_vertrouwelijkheidaanduiding(self):
+        """
+        max_vertrouwelijkheidaanduiding is not used for besluiten
+        """
+        self.autorisatie.max_vertrouwelijkheidaanduiding = ""
+        self.autorisatie.save()
+
+        BesluitFactory.create(besluittype=self.besluittype)
+        BesluitFactory.create()
+        url = reverse("besluit-list")
+
+        response = self.client.get(url)
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
+        results = response.data["results"]
+
+        self.assertEqual(len(results), 1)
+        self.assertEqual(
+            results[0]["besluittype"], f"http://testserver{reverse(self.besluittype)}"
+        )
+
     def test_besluit_retreive(self):
         """
         Assert you can only read BESLUITen of the besluittypes of your authorization

src/openzaak/utils/query.py

@@ -119,15 +119,16 @@ def get_filters(self, scope, authorizations, local=True) -> dict:
             loose_fk_objecten.append(loose_fk_object)
 
             # extract the order and map it to the database value
-            choice_item = VertrouwelijkheidsAanduiding.get_choice(
-                authorization.max_vertrouwelijkheidaanduiding
-            )
-            vertrouwelijkheidaanduiding_whens.append(
-                When(
-                    **{f"{prefix}{loose_fk_field}": loose_fk_object},
-                    then=Value(choice_item.order),
+            if authorization.max_vertrouwelijkheidaanduiding:
+                choice_item = VertrouwelijkheidsAanduiding.get_choice(
+                    authorization.max_vertrouwelijkheidaanduiding
+                )
+                vertrouwelijkheidaanduiding_whens.append(
+                    When(
+                        **{f"{prefix}{loose_fk_field}": loose_fk_object},
+                        then=Value(choice_item.order),
+                    )
                 )
-            )
 
         # filtering:
         # * only allow the white-listed loose-fk objects, explicitly