Merge pull request #2391 from gtech-mulearn/dev

Dev Server

Author: aswanthabam

api/dashboard/learningcircle/learningcircle_views.py

@@ -526,6 +526,7 @@ def get(self, request):
 class LearningCircleMeetingListAPI(APIView):
 
     def get(self, request):
+
         request_data = request.query_params
         category = request_data.get("category", None)
         saved = request_data.get("saved", "0")

api/leaderboard/leaderboard_view.py

@@ -15,7 +15,6 @@ def get(self, request):
         students_leaderboard = (
             User.objects.prefetch_related(
                 "user_role_link_user__role",
-                "user_organization_link_user__org",
             )
             .filter(
                 user_organization_link_user__org__org_type=OrganizationType.COLLEGE.value,

api/management/commands/generate_acheivements.py

@@ -0,0 +1,38 @@
+from django.core.management.base import BaseCommand
+from typing import Any, Optional
+from db.achievement import Achievement, UserAchievements
+
+from db.user import User
+
+
+class Command(BaseCommand):
+
+    help = "Comamnd to generate achievements for users"
+
+    def add_arguments(self, parser):
+        pass
+
+    def handle(self, *args: Any, **options: Any) -> Optional[str]:
+        users = User.objects.select_related("user_lvl_link_user__level").filter()
+        levels = {}
+
+        for i in range(1, 7):
+            levels[i] = Achievement.objects.get(level__level_order=i)
+
+        for user in users:
+            try:
+                level_link = user.user_lvl_link_user
+            except:
+                continue
+            if not level_link:
+                continue
+            level = level_link.level
+            level_order = level.level_order
+            for i in range(1, level_order + 1):
+                achievement = levels[i]
+                UserAchievements.objects.create(
+                    user_id=user, achievement_id=achievement
+                )
+            print(
+                "Achievements generated for user: ", user.muid, "Level: ", level_order
+            )

db/achievement.py

@@ -2,37 +2,72 @@
 import uuid
 from db.user import User
 
+
 class Achievement(models.Model):
-    id                = models.CharField(primary_key=True, default=uuid.uuid4, max_length=36)
-    name              = models.CharField(max_length=75, unique=True)
-    level_id          = models.ForeignKey('Level', on_delete=models.CASCADE, db_column='level_id')
-    description       = models.CharField(max_length=300)
-    icon              = models.CharField(max_length=100)
-    has_vc            = models.BooleanField()
-    tags              = models.JSONField()
-    type              = models.CharField(max_length=36)
-    template_id       = models.CharField(max_length=100, null=True, blank=True)
-    updated_by        = models.ForeignKey(User, on_delete=models.CASCADE, related_name='achievements_updated_by', db_column='updated_by')
-    updated_at        = models.DateTimeField(auto_now=True)
-    created_by        = models.ForeignKey(User, on_delete=models.CASCADE, related_name='achievements_created_by', db_column='created_by')
-    created_at        = models.DateTimeField(auto_now_add=True)
+    id = models.CharField(primary_key=True, default=uuid.uuid4, max_length=36)
+    name = models.CharField(max_length=75, unique=True)
+    level_id = models.ForeignKey(
+        "Level", on_delete=models.CASCADE, db_column="level_id"
+    )
+    description = models.CharField(max_length=300)
+    icon = models.CharField(max_length=100)
+    has_vc = models.BooleanField()
+    tags = models.JSONField()
+    type = models.CharField(max_length=36)
+    template_id = models.CharField(max_length=100, null=True, blank=True)
+    updated_by = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="achievements_updated_by",
+        db_column="updated_by",
+    )
+    updated_at = models.DateTimeField(auto_now=True)
+    created_by = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="achievements_created_by",
+        db_column="created_by",
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
-        db_table = 'achievement'
+        db_table = "achievement"
         managed = False
 
 
 class UserAchievementsLog(models.Model):
-    id                 = models.CharField(primary_key=True, default=uuid.uuid4, max_length=36)
-    user_id            = models.ForeignKey('User', on_delete=models.CASCADE, related_name='achievements', db_column='user_id', db_index=True)
-    achievement_id     = models.ForeignKey('Achievement', on_delete=models.CASCADE, related_name='users', db_column='achievement_id', db_index=True)
-    is_issued          = models.BooleanField(default=False)
-    vc_url             = models.CharField(max_length=100)
-    updated_by         = models.ForeignKey(User, on_delete=models.CASCADE, related_name='user-achievements_updated_by',db_column='updated_by')
-    updated_at         = models.DateTimeField(auto_now=True)
-    created_by         = models.ForeignKey(User, on_delete=models.CASCADE, related_name='user-achievements_created_by',db_column='created_by')
-    created_at         = models.DateTimeField(auto_now_add=True)
+    id = models.CharField(primary_key=True, default=uuid.uuid4, max_length=36)
+    user_id = models.ForeignKey(
+        "User",
+        on_delete=models.CASCADE,
+        related_name="achievements",
+        db_column="user_id",
+        db_index=True,
+    )
+    achievement_id = models.ForeignKey(
+        "Achievement",
+        on_delete=models.CASCADE,
+        related_name="users",
+        db_column="achievement_id",
+        db_index=True,
+    )
+    is_issued = models.BooleanField(default=False)
+    vc_url = models.CharField(max_length=100)
+    updated_by = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="user_achievements_updated_by",
+        db_column="updated_by",
+    )
+    updated_at = models.DateTimeField(auto_now=True)
+    created_by = models.ForeignKey(
+        User,
+        on_delete=models.CASCADE,
+        related_name="user_achievements_created_by",
+        db_column="created_by",
+    )
+    created_at = models.DateTimeField(auto_now_add=True)
 
     class Meta:
-        db_table = 'user_achievements_log'
+        db_table = "user_achievements_log"
         managed = False