Merge pull request #2271 from gtech-mulearn/dev

Dev Server
gtech-mulearn · Nov 5, 2024 · d0870fc · d0870fc
2 parents 66fd2c3 + 23d3cbb
commit d0870fc
Showing 1 changed file with 8 additions and 4 deletions.
diff --git a/api/dashboard/learningcircle/learningcircle_views.py b/api/dashboard/learningcircle/learningcircle_views.py
@@ -103,8 +103,11 @@ def delete(self, request, circle_id: str):
 
 class LearningCircleMeetingInfoAPI(APIView):
     def get(self, request, meet_id: str):
+        user_id = None
+        if JWTUtils.is_jwt_authenticated(request):
+            user_id = JWTUtils.fetch_user_id(request)
         meet = CircleMeetingLog.objects.get(id=meet_id)
-        serializer = CircleMeetingLogListSerializer(meet)
+        serializer = CircleMeetupInfoSerializer(meet, context={"user_id": user_id})
         return CustomResponse(
             general_message="Meeting fetched successfully",
             response=serializer.data,
@@ -367,16 +370,17 @@ def get(self, request, meet_id):
             response={
                 "is_report_submitted": circle_meeting.is_report_submitted,
                 "report": circle_meeting.report_text,
-                "attendees": {
-                    attendee.user_id_id: {
+                "attendees": [
+                    {
+                        "user_id": attendee.user_id_id,
                         "full_name": attendee.user_id.full_name,
                         "muid": attendee.user_id.muid,
                         "is_lc_approved": attendee.is_lc_approved,
                         "report": attendee.report_text,
                         "report_link": attendee.report_link,
                     }
                     for attendee in attendees
-                },
+                ],
             },
         ).get_success_response()