Fix ordering in organization queryset

ohcnetwork · Jan 5, 2025 · 8250162 · 8250162
1 parent e55e7bc
commit 8250162
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/care/emr/api/viewsets/organization.py b/care/emr/api/viewsets/organization.py
@@ -41,7 +41,7 @@ class OrganizationPublicViewSet(EMRModelReadOnlyViewSet):
     permission_classes = []
 
     def get_queryset(self):
-        return Organization.objects.filter(org_type="govt")
+        return Organization.objects.filter(org_type="govt").order_by("created_date")
 
 
 class OrganizationViewSet(EMRModelViewSet):
@@ -141,7 +141,10 @@ def authorize_create(self, instance):
 
     def get_queryset(self):
         queryset = (
-            super().get_queryset().select_related("parent", "created_by", "updated_by")
+            super()
+            .get_queryset()
+            .select_related("parent", "created_by", "updated_by")
+            .order_by("created_date")
         )
         if "parent" in self.request.GET and not self.request.GET.get("parent"):
             # Filter for root organizations, For some reason its not working as intended in Django Filters

diff --git a/care/emr/resources/organization/spec.py b/care/emr/resources/organization/spec.py
@@ -12,7 +12,6 @@ class OrganizationTypeChoices(str, Enum):
     team = "team"
     govt = "govt"
     role = "role"
-    other = "other"
 
 
 class OrganizationBaseSpec(EMRResource):