From 67824483cb5cf36679ecf4593e2f99d6647e19a0 Mon Sep 17 00:00:00 2001
From: Tobias Brunner <tobias.brunner@vshn.ch>
Date: Wed, 26 Feb 2025 10:39:23 +0100
Subject: [PATCH] better ordering on list view

---
 hub/services/views/offerings.py |  1 +
 hub/services/views/partners.py  |  6 ++++--
 hub/services/views/providers.py |  6 ++++--
 hub/services/views/services.py  | 20 ++++++++++++--------
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/hub/services/views/offerings.py b/hub/services/views/offerings.py
index bfe3dbc..883a2be 100644
--- a/hub/services/views/offerings.py
+++ b/hub/services/views/offerings.py
@@ -6,6 +6,7 @@ from hub.services.models import ServiceOffering, CloudProvider, Category, Servic
 def offering_list(request):
     offerings = (
         ServiceOffering.objects.all()
+        .order_by("service")
         .select_related("service", "cloud_provider")
         .prefetch_related(
             "service__categories",
diff --git a/hub/services/views/partners.py b/hub/services/views/partners.py
index ed46f58..9c88009 100644
--- a/hub/services/views/partners.py
+++ b/hub/services/views/partners.py
@@ -4,8 +4,10 @@ from hub.services.models import ConsultingPartner, CloudProvider, Service
 
 
 def partner_list(request):
-    partners = ConsultingPartner.objects.all().prefetch_related(
-        "services", "cloud_providers"
+    partners = (
+        ConsultingPartner.objects.all()
+        .order_by("name")
+        .prefetch_related("services", "cloud_providers")
     )
 
     services = Service.objects.all().order_by("name")
diff --git a/hub/services/views/providers.py b/hub/services/views/providers.py
index 2418fb2..b92f3ae 100644
--- a/hub/services/views/providers.py
+++ b/hub/services/views/providers.py
@@ -7,8 +7,10 @@ from hub.services.models import (
 
 
 def provider_list(request):
-    providers = CloudProvider.objects.all().prefetch_related(
-        "offerings", "consulting_partners"
+    providers = (
+        CloudProvider.objects.all()
+        .order_by("name")
+        .prefetch_related("offerings", "consulting_partners")
     )
 
     # Handle search
diff --git a/hub/services/views/services.py b/hub/services/views/services.py
index cc65f6b..a8878a5 100644
--- a/hub/services/views/services.py
+++ b/hub/services/views/services.py
@@ -9,14 +9,18 @@ from hub.services.models import (
 
 
 def service_list(request):
-    services = Service.objects.all().prefetch_related(
-        "categories",
-        "offerings",
-        "offerings__cloud_provider",
-        "offerings__plans",
-        "offerings__plans__prices",
-        "consulting_partners",
-        "external_links",
+    services = (
+        Service.objects.all()
+        .order_by("name")
+        .prefetch_related(
+            "categories",
+            "offerings",
+            "offerings__cloud_provider",
+            "offerings__plans",
+            "offerings__plans__prices",
+            "consulting_partners",
+            "external_links",
+        )
     )
     cloud_providers = CloudProvider.objects.all()
     categories = Category.objects.filter(parent=None).prefetch_related("children")