Merge pull request #2033 from gtech-mulearn/dev

Merge dev to dev-server

api/launchpad/launchpad_views.py

@@ -1,4 +1,5 @@
-from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, IntegerField
+from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, Window, IntegerField
+from django.db.models.functions import RowNumber
 from django.db import connection
 from rest_framework.views import APIView
 
@@ -47,6 +48,11 @@ 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"),
+        ).annotate(
+            rank=Window(
+                expression=RowNumber(),
+                order_by=F('karma').desc(), F('time_').asc()
+            )
         ).order_by("-karma", "time_")
 
         paginated_queryset = CommonUtils.get_paginated_queryset(