Merge pull request #2603 from gtech-mulearn/dev

[FEATURE] IG Levels

Author: nanda-kshr

.env.sample

@@ -46,4 +46,6 @@ DISCORD_GUILD_ID=xxx
 DISCORD_BOT_TOKEN=xxx
 
 QSEVERSE_BASE_URL=
-QSEVERSE_API_KEY=
+QSEVERSE_API_KEY=
+
+BACKEND_API_KEY=

api/dashboard/profile/profile_serializer.py

@@ -5,7 +5,7 @@
 from django.db.models import F, Sum, Q
 from rest_framework import serializers
 from rest_framework.serializers import ModelSerializer
-
+from db.task import UserIgLvlLink
 from db.organization import UserOrganizationLink, District
 from db.task import (
     InterestGroup,
@@ -15,6 +15,7 @@
     Wallet,
     UserIgLink,
     UserLvlLink,
+    UserIgLvlLink,
 )
 from db.user import User, UserSettings, Socials
 from utils.exception import CustomException
@@ -25,6 +26,7 @@
     MainRoles,
     WebHookActions,
     WebHookCategory,
+    UnitType,
 )
 from utils.utils import DateTimeUtils, DiscordWebhooks
 
@@ -178,25 +180,37 @@ def get_karma_distribution(self, obj):
         )
 
     def get_interest_groups(self, obj):
+        
+        # Get all IGs where user has a level entry (has interacted with this IG)
+        user_ig_levels = UserIgLvlLink.objects.filter(user=obj).select_related('ig', 'level')
+        
+        # Get user's currently selected IGs
+        selected_ig_ids = set(
+            UserIgLink.objects.filter(user=obj).values_list('ig_id', flat=True)
+        )
+        
         interest_groups = []
-        for ig_link in UserIgLink.objects.filter(user=obj):
+        for ig_level_link in user_ig_levels:
+            # Calculate IG-specific karma
             total_ig_karma = (
-                0
-                if KarmaActivityLog.objects.filter(
-                    task__ig=ig_link.ig, user=obj, appraiser_approved=True
+                KarmaActivityLog.objects.filter(
+                    task__ig=ig_level_link.ig, user=obj, appraiser_approved=True
                 )
                 .aggregate(Sum("karma"))
-                .get("karma__sum")
-                is None
-                else KarmaActivityLog.objects.filter(
-                    task__ig=ig_link.ig, user=obj, appraiser_approved=True
-                )
-                .aggregate(Sum("karma"))
-                .get("karma__sum")
-            )
-            interest_groups.append(
-                {"id": ig_link.ig.id, "name": ig_link.ig.name, "karma": total_ig_karma}
+                .get("karma__sum") or 0
             )
+            
+            interest_groups.append({
+                "id": ig_level_link.ig.id,
+                "name": ig_level_link.ig.name,
+                "karma": total_ig_karma,
+                "selected": ig_level_link.ig.id in selected_ig_ids,
+                "level": {
+                    "count": ig_level_link.level.level_order,
+                    "unit": UnitType.LEVEL.value
+                }
+            })
+        
         return interest_groups
 
 
@@ -414,6 +428,31 @@ def update(self, instance, validated_data):
             if len(user_ig_links) > 3:
                 raise CustomException("Cannot add more than 3 interest groups")
             UserIgLink.objects.bulk_create(user_ig_links)
+            
+            # Initialize IG levels for newly added IGs
+            from django.db import connection
+            for ig_id in ig_details:
+                # Get level 1 ID
+                with connection.cursor() as cursor:
+                    cursor.execute("SELECT id FROM level WHERE level_order = 1 LIMIT 1")
+                    level_1_id = cursor.fetchone()
+                    if level_1_id:
+                        # UPSERT: Insert level 1 if doesn't exist, do nothing if exists
+                        cursor.execute("""
+                            INSERT INTO user_ig_lvl_link (id, user_id, ig_id, level_id, created_by, created_at, updated_by, updated_at)
+                            VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
+                            ON DUPLICATE KEY UPDATE updated_at = updated_at
+                        """, [
+                            str(uuid.uuid4()),
+                            str(instance.id),
+                            str(ig_id),
+                            level_1_id[0],
+                            str(instance.id),
+                            DateTimeUtils.get_current_utc_time(),
+                            str(instance.id),
+                            DateTimeUtils.get_current_utc_time()
+                        ])
+            
             return super().update(instance, validated_data)
 
     class Meta:

api/dashboard/profile/profile_view.py

@@ -105,11 +105,6 @@ def patch(self, request):
         user_id = JWTUtils.fetch_user_id(request)
         user = User.objects.get(id=user_id)
 
-        old_ig_links = list(user.user_ig_link_user.all())
-        old_ig_ids = set(link.ig_id for link in old_ig_links)
-        old_role_links = list(user.user_role_link_user.all())
-        old_role_ids = set(link.role_id for link in old_role_links)
-
         serializer = profile_serializer.UserIgEditSerializer(
             user, data=request.data, partial=True
         )
@@ -118,35 +113,7 @@ def patch(self, request):
             return CustomResponse(response=serializer.errors).get_failure_response()
 
         serializer.save()
-        new_ig_links = list(user.user_ig_link_user.all())
-        new_ig_ids = set(link.ig_id for link in new_ig_links)
-
-        old_ig_roles = set()
-        for ig_id in old_ig_ids:
-            ig = InterestGroup.objects.filter(id=ig_id).first()
-            if ig:
-                role = Role.objects.filter(title=ig.name).first()
-                if role:
-                    old_ig_roles.add(role.id)
-        UserRoleLink.objects.filter(user=user, role_id__in=old_ig_roles).delete()
-
-
-        new_ig_roles = set()
-        for ig_id in new_ig_ids:
-            ig = InterestGroup.objects.filter(id=ig_id).first()
-            if ig:
-                role = Role.objects.filter(title=ig.name).first()
-                if role:
-                    new_ig_roles.add(role.id)
-
-        for role_id in new_ig_roles:
-            if not UserRoleLink.objects.filter(user=user, role_id=role_id).exists():
-                UserRoleLink.objects.create(
-                    user=user,
-                    role_id=role_id,
-                    created_by=user,
-                    verified=True,
-                )
+        
 
         DiscordWebhooks.general_updates(
             WebHookCategory.USER.value,

db/task.py

@@ -230,6 +230,36 @@ class Meta:
         db_table = "user_ig_link"
 
 
+class UserIgLvlLink(models.Model):
+    id = models.CharField(primary_key=True, max_length=36, default=uuid.uuid4)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="user_ig_lvl_link_user")
+    ig = models.ForeignKey(InterestGroup, on_delete=models.CASCADE, related_name="user_ig_lvl_link_ig")
+    level = models.ForeignKey(Level, on_delete=models.CASCADE, related_name="user_ig_lvl_link_level")
+    updated_by = models.ForeignKey(User, on_delete=models.SET(settings.SYSTEM_ADMIN_ID), db_column="updated_by",
+                                   related_name="user_ig_lvl_link_updated_by")
+    updated_at = models.DateTimeField(auto_now=True)
+    created_by = models.ForeignKey(User, on_delete=models.SET(settings.SYSTEM_ADMIN_ID), db_column="created_by",
+                                   related_name="user_ig_lvl_link_created_by")
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        managed = False
+        db_table = "user_ig_lvl_link"
+        unique_together = [("user", "ig")]
+
+
+class UserIgLvlLog(models.Model):
+    id = models.CharField(primary_key=True, max_length=36, default=uuid.uuid4)
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name="user_ig_lvl_log_user")
+    ig = models.ForeignKey(InterestGroup, on_delete=models.CASCADE, related_name="user_ig_lvl_log_ig")
+    level = models.ForeignKey(Level, on_delete=models.CASCADE, related_name="user_ig_lvl_log_level")
+    created_at = models.DateTimeField(auto_now_add=True)
+
+    class Meta:
+        managed = False
+        db_table = "user_ig_lvl_log"
+
+
 class VoucherLog(models.Model):
     id = models.CharField(primary_key=True, max_length=36)
     code = models.CharField(unique=True, max_length=255)

utils/types.py

@@ -192,6 +192,16 @@ def get_all_values(cls):
         return [member.value for member in cls]
 
 
+class UnitType(Enum):
+    LEVEL = "level"
+    KARMA = "karma"
+    TASK = "task"
+
+    @classmethod
+    def get_all_values(cls):
+        return [member.value for member in cls]
+
+
 DEFAULT_HACKATHON_FORM_FIELDS = {
     "name": "system",
     "gender": "system",