Merge pull request #2402 from gtech-mulearn/dev

Dev Server

Author: aswanthabam

api/dashboard/achievement/achievement_views.py

@@ -9,33 +9,48 @@
 import uuid
 from django.utils.timezone import now
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
+
+
 class AchievementListAPIView(APIView):
     def get(self, request):
         user_id = JWTUtils.fetch_user_id(request)
 
         if not user_id:
-            return CustomResponse(general_message="Invalid or missing token").get_failure_response()
+            return CustomResponse(
+                general_message="Invalid or missing token"
+            ).get_failure_response()
 
         user = User.objects.filter(id=user_id).first()
 
         if not user:
-            return CustomResponse(general_message="User Not Exists").get_failure_response()
+            return CustomResponse(
+                general_message="User Not Exists"
+            ).get_failure_response()
 
         achievements = Achievement.objects.all()
-        achievements_serializer = achievement_serializer.AchievementSerializer(achievements, many=True)
+        achievements_serializer = achievement_serializer.AchievementSerializer(
+            achievements, many=True
+        )
+
+        return CustomResponse(
+            response=achievements_serializer.data
+        ).get_success_response()
 
-        return CustomResponse(response=achievements_serializer.data).get_success_response()
 
 class AchievementCreateAPIView(APIView):
     def post(self, request):
         user_id = JWTUtils.fetch_user_id(request)
 
         if not user_id:
-            return CustomResponse(general_message="Invalid or missing token").get_failure_response()
+            return CustomResponse(
+                general_message="Invalid or missing token"
+            ).get_failure_response()
 
         user = User.objects.filter(id=user_id).first()
         if not user:
-            return CustomResponse(general_message="User Not Exists").get_failure_response()
+            return CustomResponse(
+                general_message="User Not Exists"
+            ).get_failure_response()
 
         data = request.data
         required_fields = ["name", "description", "icon", "tags", "type", "has_vc"]
@@ -47,14 +62,18 @@ def post(self, request):
             ).get_failure_response()
 
         if Achievement.objects.filter(name=data["name"]).exists():
-            return CustomResponse(general_message="Name already exists").get_failure_response()
+            return CustomResponse(
+                general_message="Name already exists"
+            ).get_failure_response()
 
         level = None
         if "level_id" in data and data["level_id"]:
             try:
                 level = Level.objects.get(id=data["level_id"])
             except Level.DoesNotExist:
-                return CustomResponse(general_message="Invalid level_id").get_failure_response()
+                return CustomResponse(
+                    general_message="Invalid level_id"
+                ).get_failure_response()
 
         achievement = Achievement.objects.create(
             id=str(uuid.uuid4()),
@@ -73,27 +92,36 @@ def post(self, request):
         )
 
         return CustomResponse(
-            general_message=f"Achievement '{achievement.name}' created successfully!").get_success_response()
+            general_message=f"Achievement '{achievement.name}' created successfully!"
+        ).get_success_response()
 
 
 class AchievementUpdateAPIView(APIView):
     def put(self, request, achievement_id=None):
         user_id = JWTUtils.fetch_user_id(request)
 
         if not user_id:
-            return CustomResponse(general_message="Invalid or missing token").get_failure_response()
+            return CustomResponse(
+                general_message="Invalid or missing token"
+            ).get_failure_response()
 
         user = User.objects.filter(id=user_id).first()
         if not user:
-            return CustomResponse(general_message="User Not Exists").get_failure_response()
+            return CustomResponse(
+                general_message="User Not Exists"
+            ).get_failure_response()
 
         if not achievement_id:
-            return CustomResponse(general_message="Achievement ID is required").get_failure_response()
+            return CustomResponse(
+                general_message="Achievement ID is required"
+            ).get_failure_response()
 
         try:
             achievement = Achievement.objects.get(id=achievement_id)
         except Achievement.DoesNotExist:
-            return CustomResponse(general_message="Achievement not found").get_failure_response()
+            return CustomResponse(
+                general_message="Achievement not found"
+            ).get_failure_response()
 
         data = request.data.copy()
         data["updated_by"] = user_id
@@ -104,106 +132,139 @@ def put(self, request, achievement_id=None):
                     level = Level.objects.get(id=data["level_id"])
                     data["level_id"] = level.id
                 except Level.DoesNotExist:
-                    return CustomResponse(general_message="Invalid level_id").get_failure_response()
+                    return CustomResponse(
+                        general_message="Invalid level_id"
+                    ).get_failure_response()
             else:
                 data["level_id"] = None
 
-        serializer = achievement_serializer.AchievementSerializer(achievement, data=data, partial=True)
+        serializer = achievement_serializer.AchievementSerializer(
+            achievement, data=data, partial=True
+        )
 
         if serializer.is_valid():
             serializer.save()
-            return CustomResponse(general_message="Achievement updated successfully").get_success_response()
+            return CustomResponse(
+                general_message="Achievement updated successfully"
+            ).get_success_response()
 
-        return CustomResponse(general_message="Invalid Data", response=serializer.errors).get_failure_response()
+        return CustomResponse(
+            general_message="Invalid Data", response=serializer.errors
+        ).get_failure_response()
 
 
 class AchievementDeleteAPIView(APIView):
     def delete(self, request, achievement_id):
         user_id = JWTUtils.fetch_user_id(request)
 
         if not user_id:
-            return CustomResponse(general_message="Invalid or missing token").get_failure_response()
+            return CustomResponse(
+                general_message="Invalid or missing token"
+            ).get_failure_response()
 
         user = User.objects.filter(id=user_id).first()
         if not user:
-            return CustomResponse(general_message="User Not Exists").get_failure_response()
+            return CustomResponse(
+                general_message="User Not Exists"
+            ).get_failure_response()
 
         try:
             achievement = Achievement.objects.get(id=achievement_id)
         except Achievement.DoesNotExist:
-            return CustomResponse(general_message="Achievement not found").get_failure_response()
+            return CustomResponse(
+                general_message="Achievement not found"
+            ).get_failure_response()
 
         achievement.delete()
-        return CustomResponse(general_message="Achievement deleted successfully").get_success_response()
+        return CustomResponse(
+            general_message="Achievement deleted successfully"
+        ).get_success_response()
+
 
 class UserAchievementsListAPIView(APIView):
     def get(self, request, muid):
         try:
             user = get_object_or_404(User, muid=muid)
 
             user_achievements = (
-                UserAchievementsLog.objects
-                .filter(user_id=user.id)
-                .select_related('achievement_id')
-                .only('id', 'user_id', 'achievement_id', 'is_issued', 'vc_url', 'achievement_id__name', 'achievement_id__description')
+                UserAchievementsLog.objects.filter(user_id=user.id)
+                .select_related("achievement_id")
+                .only(
+                    "id",
+                    "user_id",
+                    "achievement_id",
+                    "is_issued",
+                    "vc_url",
+                    "achievement_id__name",
+                    "achievement_id__description",
+                )
             )
 
+            # if not user_achievements.exists():
+            #     return CustomResponse(
+            #         general_message="No achievements found for this user"
+            #     ).get_failure_response()
 
-            if not user_achievements.exists():
-                return CustomResponse(general_message="No achievements found for this user").get_failure_response()
-
-
-            serializer = achievement_serializer.UserAchievementsSerializer(user_achievements, many=True)
+            serializer = achievement_serializer.UserAchievementsSerializer(
+                user_achievements, many=True
+            )
             return CustomResponse(response=serializer.data).get_success_response()
 
         except ValidationError:
-            return CustomResponse(general_message="Invalid format for muid").get_failure_response()
+            return CustomResponse(
+                general_message="Invalid format for muid"
+            ).get_failure_response()
 
         except Exception as e:
-            return CustomResponse(general_message=f"An unexpected error occurred: {str(e)}").get_failure_response()
+            return CustomResponse(
+                general_message=f"An unexpected error occurred: {str(e)}"
+            ).get_failure_response()
 
 
 class UserAchievementsIssueAPIView(APIView):
     def post(self, request):
         user_id = JWTUtils.fetch_user_id(request)
         if not user_id:
-            return CustomResponse(general_message="Invalid or missing token").get_failure_response()
+            return CustomResponse(
+                general_message="Invalid or missing token"
+            ).get_failure_response()
 
         achievement_id = request.data.get("achievement_id")
         vc_url = request.data.get("vc_url")
 
         if not achievement_id:
-            return CustomResponse(general_message="Achievement ID is required").get_failure_response()
+            return CustomResponse(
+                general_message="Achievement ID is required"
+            ).get_failure_response()
 
         if not vc_url:
-            return CustomResponse(general_message="VC URL is required").get_failure_response()
+            return CustomResponse(
+                general_message="VC URL is required"
+            ).get_failure_response()
 
         if not User.objects.filter(id=user_id).exists():
-            return CustomResponse(general_message="User Not Exists").get_failure_response()
+            return CustomResponse(
+                general_message="User Not Exists"
+            ).get_failure_response()
 
         try:
-            user_achievement = UserAchievementsLog.objects.get(user_id=user_id, achievement_id=achievement_id)
+            user_achievement = UserAchievementsLog.objects.get(
+                user_id=user_id, achievement_id=achievement_id
+            )
         except UserAchievementsLog.DoesNotExist:
-            return CustomResponse(general_message="Achievement record not found").get_failure_response()
+            return CustomResponse(
+                general_message="Achievement record not found"
+            ).get_failure_response()
 
         if user_achievement.is_issued:
-            return CustomResponse(general_message="This achievement has already been issued").get_failure_response()
-
-        UserAchievementsLog.objects.filter(user_id=user_id, achievement_id=achievement_id).update(is_issued=True, vc_url=vc_url)
-
-        return CustomResponse(general_message="Achievement issued successfully").get_success_response()
-
-
-
-
-
-
-
-
-
-
-
-
-
+            return CustomResponse(
+                general_message="This achievement has already been issued"
+            ).get_failure_response()
 
+        UserAchievementsLog.objects.filter(
+            user_id=user_id, achievement_id=achievement_id
+        ).update(is_issued=True, vc_url=vc_url)
 
+        return CustomResponse(
+            general_message="Achievement issued successfully"
+        ).get_success_response()

api/dashboard/learningcircle/learningcircle_serializer.py

@@ -487,7 +487,7 @@ class CircleMeetupMinSerializer(serializers.ModelSerializer):
     is_ended = serializers.SerializerMethodField()
     is_joined = serializers.SerializerMethodField()
     is_rsvp = serializers.SerializerMethodField()
-    attendees = serializers.SerializerMethodField()
+    attendees_count = serializers.SerializerMethodField()
     created_by = serializers.CharField(source="created_by.full_name", read_only=True)
     created_by_id = serializers.CharField(source="created_by.id", read_only=True)
     ig_id = serializers.CharField(source="circle_id.ig.id", read_only=True)
@@ -517,44 +517,8 @@ def get_is_rsvp(self, obj):
             ).exists()
         return False
 
-    def get_attendees(self, obj):
-        query = (
-            obj.circle_meeting_attendance_meet_id.select_related("user_id")
-            .prefetch_related("user_id__user_organization_link_user")
-            .only(
-                "user_id__full_name",
-                "is_joined",
-                "is_report_submitted",
-                "user_id__user_organization_link_user__org_id",
-            )[:3]
-        )
-        data = []
-        user_id = self.context.get("user_id")
-        cur_user_org = None
-        if user_id:
-            try:
-                cur_user = (
-                    User.objects.prefetch_related("user_organization_link_user")
-                    .only("user_organization_link_user__org_id")
-                    .get(id=user_id)
-                )
-                cur_user_org = cur_user.user_organization_link_user__org_id
-            except:
-                pass
-        for attendee in query:
-            data.append(
-                {
-                    "full_name": attendee.user_id.full_name,
-                    "is_joined": attendee.is_joined,
-                    "is_report_submitted": attendee.is_report_submitted,
-                    "profile_pic": attendee.user_id.profile_pic,
-                    "is_same_org": cur_user_org
-                    in attendee.user_id.user_organization_link_user.all().values_list(
-                        "org_id", flat=True
-                    ),
-                }
-            )
-        return data
+    def get_attendees_count(self, obj):
+        return obj.circle_meeting_attendance_meet_id.count()
 
     class Meta:
         model = CircleMeetingLog
@@ -577,7 +541,7 @@ class Meta:
             "is_started",
             "is_ended",
             "is_joined",
-            "attendees",
+            "attendees_count",
             "created_by",
             "created_by_id",
         ]