Merge pull request #715 from maykinmedia/fix/712-broken-filter

[#712] Broken filter not_in_destruction_list_except

Author: SilviaAmAm

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

@@ -58,7 +58,15 @@ def _retrieve_zaaktypen(self, request):
         if not is_valid:
             raise ValidationError(filterset.errors)
 
-        zaaktypen = filterset.qs.distinct("_expand__zaaktype__url").values_list(
+        # FIXME issue #712
+        # The filter not_in_destruction_list_except does an order_by on "in_exception_list" and "pk"
+        # However, we cannot combine a distinct and an order_by on different fields.
+        # So we add an order by on "_expand__zaaktype__url" as a bandaid fix until we fix the ordering in the filter
+        qs = filterset.qs
+        if filterset.data.get("not_in_destruction_list_except"):
+            qs = qs.order_by("_expand__zaaktype__url")
+
+        zaaktypen = qs.distinct("_expand__zaaktype__url").values_list(
             "_expand__zaaktype", flat=True
         )
         zaaktypen_choices = format_zaaktype_choices(zaaktypen)

backend/src/openarchiefbeheer/zaken/tests/test_views.py

@@ -439,6 +439,22 @@ def test_retrieve_zaaktypen_choices_invalid_filters(self):
             response.json()["inDestructionList"][0], _("Enter a valid UUID.")
         )
 
+    def test_retrieve_zaaktypen_choices_not_in_destruction_list_except(self):
+        user = UserFactory.create()
+
+        ZaakFactory.create()
+
+        destruction_list = DestructionListFactory.create()
+
+        self.client.force_authenticate(user=user)
+        url = reverse("api:retrieve-zaaktypen-choices")
+
+        response = self.client.post(
+            url, data={"not_in_destruction_list_except": destruction_list.uuid}
+        )
+
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+
 
 class SelectielijstklasseChoicesViewTests(ClearCacheMixin, APITestCase):