correct ordering of services in provider

hub/services/views/providers.py

@@ -2,6 +2,7 @@ from django.shortcuts import render, get_object_or_404
 from django.db.models import Q
 from hub.services.models import (
     Service,
+    ServiceOffering,
     CloudProvider,
 )
 
@@ -39,13 +40,30 @@ def provider_detail(request, slug):
 
     # Get all services offered by this provider through offerings
     services = (
-        Service.objects.filter(offerings__cloud_provider=provider)
+        Service.objects.filter(
+            offerings__cloud_provider=provider, disable_listing=False
+        )
         .distinct()
         .prefetch_related("categories")
     )
 
+    # Get the provider's offerings and sort them by service attributes
+    # Exclude offerings with disabled services
+    ordered_offerings = (
+        ServiceOffering.objects.filter(
+            cloud_provider=provider, service__disable_listing=False
+        )
+        .select_related("service")
+        .order_by(
+            "-service__is_featured",  # Featured first (True before False)
+            "service__is_coming_soon",  # Coming soon last (False before True)
+            "service__name",  # Alphabetically within each group
+        )
+    )
+
     context = {
         "provider": provider,
         "services": services,
+        "ordered_offerings": ordered_offerings,
     }
     return render(request, "services/provider_detail.html", context)