Merge pull request #2389 from gtech-mulearn/dev

Dev Server

Author: aswanthabam

api/dashboard/achievement/achievement_serializer.py

@@ -1,5 +1,5 @@
 from rest_framework import serializers
-from db.achievement import Achievement, UserAchievements
+from db.achievement import Achievement, UserAchievementsLog
 # from db.user import User
 
 class AchievementSerializer(serializers.ModelSerializer):
@@ -13,11 +13,11 @@ class AchievementBasicSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Achievement
-        fields = ['id', 'achievement_name', 'description', 'icon', 'level_based', 'tags', 'template_id']
+        fields = ['id', 'achievement_name', 'description', 'icon', 'level_id', 'tags', 'template_id']
 
 class UserAchievementsSerializer(serializers.ModelSerializer):
     achievement = AchievementBasicSerializer(source='achievement_id', read_only=True)
 
     class Meta:
-        model = UserAchievements
+        model = UserAchievementsLog
         fields = ['id', 'user_id', 'achievement', 'is_issued', 'vc_url']

api/dashboard/achievement/achievement_views.py

@@ -1,66 +1,44 @@
 from rest_framework.generics import get_object_or_404
 from rest_framework.views import APIView
 from . import achievement_serializer
-from db.achievement import Achievement, UserAchievements
+from db.achievement import Achievement, UserAchievementsLog
 from utils.response import CustomResponse
 from utils.permission import JWTUtils
 from db.user import User
+from db.task import Level
 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
-        )
-
-        return CustomResponse(
-            response=achievements_serializer.data
-        ).get_success_response()
+        achievements_serializer = achievement_serializer.AchievementSerializer(achievements, many=True)
 
+        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",
-            "level_based",
-            "has_vc",
-        ]
+        required_fields = ["name", "description", "icon", "tags", "type", "has_vc"]
 
         missing_fields = [field for field in required_fields if field not in data]
         if missing_fields:
@@ -69,9 +47,14 @@ 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()
 
         achievement = Achievement.objects.create(
             id=str(uuid.uuid4()),
@@ -80,7 +63,7 @@ def post(self, request):
             icon=data["icon"],
             tags=data["tags"],
             type=data["type"],
-            level_based=data["level_based"],
+            level_id=level,
             has_vc=data["has_vc"],
             template_id=data.get("template_id"),
             created_by=user,
@@ -89,158 +72,138 @@ def post(self, request):
             updated_at=now(),
         )
 
-        # Serialize and return success response
-        serializer = achievement_serializer.AchievementSerializer(achievement)
-        return CustomResponse(response=serializer.data).get_success_response()
+        return CustomResponse(
+            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
 
-        serializer = achievement_serializer.AchievementSerializer(
-            achievement, data=data, partial=True
-        )
+        if "level_id" in data:
+            if data["level_id"]:
+                try:
+                    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()
+            else:
+                data["level_id"] = None
+
+        serializer = achievement_serializer.AchievementSerializer(achievement, data=data, partial=True)
 
         if serializer.is_valid():
             serializer.save()
-            return CustomResponse(
-                response=serializer.data,
-                general_message="Achievement updated successfully",
-            ).get_success_response()
-        return CustomResponse(
-            general_message="Invalid Data", response=serializer.errors
-        ).get_failure_response()
+            return CustomResponse(general_message="Achievement updated successfully").get_success_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 = UserAchievements.objects.filter(
-                user_id=user.id
-            ).select_related("achievement_id")
+            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')
+            )
 
-            # If no achievements found
-            # if not user_achievements.exists():
-            #     return CustomResponse(general_message="No achievements found for this user").get_failure_response()
 
-            # Serialize and return response
-            serializer = achievement_serializer.UserAchievementsSerializer(
-                user_achievements, many=True
-            )
+            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)
             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 = UserAchievements.objects.get(
-                user_id=user_id, achievement_id=achievement_id
-            )
-        except UserAchievements.DoesNotExist:
-            return CustomResponse(
-                general_message="Achievement record not found"
-            ).get_failure_response()
+            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()
 
         if user_achievement.is_issued:
-            return CustomResponse(
-                general_message="This achievement has already been issued"
-            ).get_failure_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()
+
+
+
+
+
+
+
+
+
+
+
+
+
 
-        UserAchievements.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/profile/profile_serializer.py

@@ -490,9 +490,38 @@ def update(self, instance, validated_data):
         return instance
 
 
+
 class ResetPasswordSerialzier(serializers.Serializer):
     current_password = serializers.CharField(required=True, allow_null=False)
     password = serializers.CharField(required=True, allow_null=False)
 
     class Meta:
         fields = ("current_password", "password")
+        
+        
+class UserPermuteSerializer(serializers.ModelSerializer):
+    full_name = serializers.CharField()
+    user_domains = serializers.SerializerMethodField()
+    college_name = serializers.SerializerMethodField()
+
+    class Meta:
+        model = User
+        fields = ["full_name", "user_domains", "college_name"]
+
+    def get_user_domains(self, obj):
+        return obj.user_domains.values_list("domain_name", flat=True)
+
+    def _get_user_org_link(self, obj, org_type):
+        if not hasattr(self, "user_org_link"):
+            self.user_org_link = obj.user_organization_link_user.filter(
+                org__org_type=org_type
+            ).first()
+        return self.user_org_link
+
+    def _get_org_type(self, obj):
+        return OrganizationType.COLLEGE.value
+
+    def get_college_name(self, obj):
+        org_type = self._get_org_type(obj)
+        user_org_link = self._get_user_org_link(obj, org_type)
+        return user_org_link.org.title if user_org_link and user_org_link.org else None