Merge pull request #2020 from gtech-mulearn/dev

Merge dev to dev-server
gtech-mulearn · Jun 7, 2024 · fe88b5b · fe88b5b
2 parents 48e3d5e + b2762db
commit fe88b5b
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py
@@ -41,16 +41,12 @@ def get(self, request):
             district_name=F("user_organization_link_user__org__district__name"),
             state=F("user_organization_link_user__org__district__zone__state__name"),
             time_=Max("karma_activity_log_user__created_at"),
-        ).order_by("-karma")
+        ).order_by("-karma", "time_")
 
         paginated_queryset = CommonUtils.get_paginated_queryset(
             users,
             request,
-            ["full_name", "karma", "org", "district_name", "state"],
-            sort_fields={
-                "karma": "karma",
-                "time_": "time_",
-            },
+            ["full_name", "karma", "org", "district_name", "state"]
         )
 
         serializer = LaunchpadLeaderBoardSerializer(