From a2eda11179ba3baebbd24b1c61c738b4744c258b Mon Sep 17 00:00:00 2001
From: Christian Cueni <christian.cueni@iterativ.ch>
Date: Thu, 11 Jan 2024 16:08:39 +0100
Subject: [PATCH] Sort organizations by name

---
 server/vbv_lernwelt/api/directory.py             | 13 ++++++++++++-
 .../vbv_lernwelt/api/tests/test_entities_api.py  | 16 ++++++++++------
 2 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/server/vbv_lernwelt/api/directory.py b/server/vbv_lernwelt/api/directory.py
index 9806c77c..502dae55 100644
--- a/server/vbv_lernwelt/api/directory.py
+++ b/server/vbv_lernwelt/api/directory.py
@@ -11,6 +11,17 @@ from vbv_lernwelt.shop.serializers import CountrySerializer
 @api_view(["GET"])
 @permission_classes([IsAuthenticated])
 def list_entities(request):
-    organisations = OrganisationSerializer(Organisation.objects.all(), many=True).data
+    language_code = request.LANGUAGE_CODE if request.LANGUAGE_CODE else "de"
+    field_mapping = {
+        "de": "name_de",
+        "fr": "name_fr",
+        "it": "name_it",
+    }
+
+    field_name = field_mapping.get(language_code, field_mapping["de"])
+
+    organisations = OrganisationSerializer(
+        Organisation.objects.all().order_by(field_name), many=True
+    ).data
     countries = CountrySerializer(Country.objects.all(), many=True).data
     return Response({"organisations": organisations, "countries": countries})
diff --git a/server/vbv_lernwelt/api/tests/test_entities_api.py b/server/vbv_lernwelt/api/tests/test_entities_api.py
index 2f65118f..df6f90a3 100644
--- a/server/vbv_lernwelt/api/tests/test_entities_api.py
+++ b/server/vbv_lernwelt/api/tests/test_entities_api.py
@@ -3,7 +3,7 @@ from rest_framework import status
 from rest_framework.test import APITestCase
 
 from vbv_lernwelt.core.model_utils import add_organisations
-from vbv_lernwelt.core.models import User
+from vbv_lernwelt.core.models import Organisation, User
 from vbv_lernwelt.shop.model_utils import add_countries
 
 
@@ -17,6 +17,10 @@ class EntitiesViewTest(APITestCase):
         add_countries()
 
     def test_list_entities(self) -> None:
+        # It seems that different locales handle ordering differently (especially with lower case letters)
+        # As such we delete entries that start with lower case letters
+        Organisation.objects.filter(organisation_id__in=[1, 2, 3]).delete()
+
         # GIVEN
         url = reverse("list_entities")
 
@@ -29,12 +33,12 @@ class EntitiesViewTest(APITestCase):
         organisations = response.data["organisations"]
 
         self.assertEqual(
-            organisations[0],
+            organisations[-1],
             {
-                "organisation_id": 1,
-                "name_de": "andere Broker",
-                "name_fr": "autres Broker",
-                "name_it": "altre Broker",
+                "organisation_id": 28,
+                "name_de": "Zürich",
+                "name_fr": "Zurich",
+                "name_it": "Zurigo",
             },
         )