Merge branch 'dev' into dev-server

gtech-mulearn · Dec 12, 2023 · 6f5d7da · 6f5d7da
2 parents 15b4f13 + bb6922b
commit 6f5d7da
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/api/dashboard/lc/dash_lc_serializer.py b/api/dashboard/lc/dash_lc_serializer.py
@@ -466,7 +466,7 @@ def get_previous_meetings(self, obj):
         return previous_meetings
 
 
-class LearningCircleDataSerializer(serializers.ModelSerializer):
+class LearningCircleStatsSerializer(serializers.ModelSerializer):
     interest_group = serializers.SerializerMethodField()
     college = serializers.SerializerMethodField()
     learning_circle = serializers.SerializerMethodField()

diff --git a/api/dashboard/lc/dash_lc_view.py b/api/dashboard/lc/dash_lc_view.py
@@ -17,7 +17,7 @@
 from utils.utils import send_template_mail, DateTimeUtils
 from .dash_lc_serializer import LearningCircleSerializer, LearningCircleCreateSerializer, LearningCircleDetailsSerializer, \
     LearningCircleUpdateSerializer, LearningCircleJoinSerializer, \
-    LearningCircleMainSerializer, LearningCircleNoteSerializer, LearningCircleDataSerializer, \
+    LearningCircleMainSerializer, LearningCircleNoteSerializer, LearningCircleStatsSerializer, \
     LearningCircleMemberListSerializer, MeetRecordsCreateEditDeleteSerializer, IgTaskDetailsSerializer, \
     ScheduleMeetingSerializer, ListAllMeetRecordsSerializer, AddMemberSerializer
 
@@ -90,7 +90,7 @@ def post(self, request):
         ).get_success_response()
 
 
-class LearningCircleDataAPI(APIView):
+class LearningCircleStatsAPI(APIView):
     """
         API endpoint for retrieving basic data about all learning circles.
 
@@ -103,7 +103,7 @@ class LearningCircleDataAPI(APIView):
     def get(self, request):
         learning_circle = LearningCircle.objects.all()
 
-        serializer = LearningCircleDataSerializer(
+        serializer = LearningCircleStatsSerializer(
             learning_circle,
             many=False
         )

diff --git a/api/dashboard/lc/urls.py b/api/dashboard/lc/urls.py
@@ -4,6 +4,7 @@
 
 urlpatterns = [
     path('user-list/', dash_lc_view.UserLearningCircleListApi.as_view(), name='main'),  # list all lc's of user
+    path('stats/', dash_lc_view.LearningCircleStatsAPI.as_view(), name='data'),
     path('<str:circle_id>/details/', dash_lc_view.LearningCircleDetailsApi.as_view(), name='lc-detailed'),  # individual ls details
     # dashboard search listing
     path('<str:circle_id>/schedule-meet/', dash_lc_view.ScheduleMeetAPI.as_view(), name='schedule-meet'),
@@ -25,7 +26,6 @@
     path('list/', dash_lc_view.LearningCircleMainApi.as_view(), name='list'), # public page listing
     path('list-all/', dash_lc_view.TotalLearningCircleListApi.as_view(), name='list-all'), # dashboard search listing
 
-    # path('data/', dash_lc_view.LearningCircleDataAPI.as_view(), name='data'),
     # path('list-members/<str:circle_id>/', dash_lc_view.LearningCircleListMembersApi.as_view(), name='list-members'),
     # path('invite/', dash_lc_view.LearningCircleInviteLeadAPI.as_view()),
     # path('meet-record/list-all/<str:circle_id>/', dash_lc_view.SingleReportDetailAPI.as_view(), name='list-all-meet-record'),  # optim