Merge pull request #1503 from gtech-mulearn/dev

kkem clg wise rpt
gtech-mulearn · Nov 2, 2023 · c92682e · c92682e
2 parents f63911d + a1ebe72
commit c92682e
Showing 1 changed file with 17 additions and 4 deletions.
diff --git a/api/common/common_views.py b/api/common/common_views.py
@@ -129,7 +129,8 @@ def get(self, request):
             request,
             search_fields=["first_name", "last_name", "muid", "circle_name", 'circle_ig', "organisation", "dwms_id",
                            "karma_earned"],
-            sort_fields={"first_name": "first_name", "muid": "muid", "circle_name": "circle_name",
+            sort_fields={"first_name": "first_name", "last_name": "last_name", "muid": "muid",
+                         "circle_name": "circle_name",
                          "circle_ig": "circle_ig", "organisation": "organisation", "dwms_id": "dwms_id",
                          "karma_earned": "karma_earned"},
         )
@@ -206,7 +207,7 @@ def get(self, request):
                 LearningCircle.objects.filter(org__org_type=OrganizationType.COLLEGE.value, created_at__date=date)
                 .values(org_title=F("org__title"))
                 .annotate(
-                    learning_circle_count=Count("id"), user_count=Count("usercirclelink")
+                    learning_circle_count=Count("id"), user_count=Count("user_circle_link_circle")
                 )
                 .order_by("org_title")
             )
@@ -215,12 +216,24 @@ def get(self, request):
                 LearningCircle.objects.filter(org__org_type=OrganizationType.COLLEGE.value)
                 .values(org_title=F("org__title"))
                 .annotate(
-                    learning_circle_count=Count("id"), user_count=Count("usercirclelink")
+                    learning_circle_count=Count("id"), user_count=Count("user_circle_link_circle")
                 )
                 .order_by("org_title")
             )
 
-        return CustomResponse(response=learning_circles_info).get_success_response()
+        paginated_queryset = CommonUtils.get_paginated_queryset(
+            learning_circles_info,
+            request,
+            search_fields=["org_title", "learning_circle_count", "user_count"],
+            sort_fields={"org_title": "org_title", "learning_circle_count": "learning_circle_count",
+                         "user_count": "user_count"},
+        )
+
+        collegewise_info_data = CollegeInfoSerializer(paginated_queryset.get("queryset"), many=True).data
+
+        return CustomResponse().paginated_response(
+            data=collegewise_info_data, pagination=paginated_queryset.get("pagination")
+        )
 
 
 class GlobalCountAPI(APIView):