Merge pull request #512 from maykinmedia/issue/#503-sorting

🐛 - fix: sorting the zaaktypen

Author: Xaohs

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

@@ -8,7 +8,10 @@
 
 from openarchiefbeheer.destruction.tests.factories import DestructionListItemFactory
 from openarchiefbeheer.utils.results_store import ResultStore
-from openarchiefbeheer.zaken.utils import delete_zaak_and_related_objects
+from openarchiefbeheer.zaken.utils import (
+    delete_zaak_and_related_objects,
+    format_zaaktype_choices,
+)
 
 
 class DeletingZakenWithErrorsTests(TestCase):
@@ -143,3 +146,75 @@ def test_failure_on_deleting_zaak_relation_is_handled(self, m):
 
         with self.assertRaises(ConnectTimeout):
             delete_zaak_and_related_objects(destruction_list_item.zaak, result_store)
+
+
+class FormatZaaktypeChoicesTests(TestCase):
+    def test_format_zaaktype_choices_with_multiple_versions(self):
+        # Test that the function picks the latest version of each zaaktype based on versiedatum
+        # And test that the output is sorted by label
+        zaaktypen = [
+            {
+                "identificatie": "ZKT-001",
+                "url": "http://localhost:8000/api/v1/zaaktypen/1",
+                "omschrijving": "Zaaktype 1",
+                "versiedatum": "2023-01-01",
+            },
+            {
+                "identificatie": "ZKT-001",
+                "url": "http://localhost:8000/api/v1/zaaktypen/2",
+                "omschrijving": "Zaaktype 1 Updated",
+                "versiedatum": "2023-06-01",
+            },
+            {
+                "identificatie": "ZKT-002",
+                "url": "http://localhost:8000/api/v1/zaaktypen/3",
+                "omschrijving": "Zaaktype 2",
+                "versiedatum": "2022-12-01",
+            },
+        ]
+
+        # Expecting the most recent version for each zaaktype, with URLs aggregated
+        expected_result = [
+            {
+                "label": "Zaaktype 1 Updated (ZKT-001)",
+                "value": "http://localhost:8000/api/v1/zaaktypen/1,http://localhost:8000/api/v1/zaaktypen/2",
+            },
+            {
+                "label": "Zaaktype 2 (ZKT-002)",
+                "value": "http://localhost:8000/api/v1/zaaktypen/3",
+            },
+        ]
+
+        result = format_zaaktype_choices(zaaktypen)
+        self.assertEqual(result, expected_result)
+
+    def test_format_zaaktype_choices_with_no_identificatie(self):
+        # Test how the function handles zaaktypen with no identificatie
+        zaaktypen = [
+            {
+                "identificatie": None,
+                "url": "http://localhost:8000/api/v1/zaaktypen/1",
+                "omschrijving": "Zaaktype without ID",
+                "versiedatum": "2023-01-01",
+            }
+        ]
+
+        # Should fall back to using "no identificatie" in the label
+        expected_result = [
+            {
+                "label": "Zaaktype without ID (no identificatie)",
+                "value": "http://localhost:8000/api/v1/zaaktypen/1",
+            }
+        ]
+
+        result = format_zaaktype_choices(zaaktypen)
+        self.assertEqual(result, expected_result)
+
+    def test_format_zaaktype_choices_with_empty_input(self):
+        # Test the behavior with an empty input list
+        zaaktypen = []
+        expected_result = []
+
+        # Should return an empty list
+        result = format_zaaktype_choices(zaaktypen)
+        self.assertEqual(result, expected_result)

backend/src/openarchiefbeheer/zaken/utils.py

@@ -109,6 +109,7 @@ def format_zaaktype_choices(zaaktypen: Iterable[dict]) -> list[DropDownChoice]:
         label = f"{omschrijving} ({identificatie or _("no identificatie")})"
         value = ",".join(urls)
         formatted_zaaktypen.append({"label": label, "value": value})
+    formatted_zaaktypen = sorted(formatted_zaaktypen, key=lambda x: x["label"])
     return formatted_zaaktypen