Merge pull request #2092 from gtech-mulearn/dev-server

Dev server
gtech-mulearn · Jun 20, 2024 · 60d0589 · 60d0589
2 parents 5940132 + f580b7f
commit 60d0589
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py
@@ -43,9 +43,9 @@ def get(self, request):
                 queryset=UserOrganizationLink.objects.filter(org__org_type__in=allowed_org_types),
             )
         ).filter(
-            user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
+            Q(user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
                 org__org_type__in=allowed_org_types
-            ).values("id")
+            ).values("id")) | Q(user_organization_link_user__id__isnull=True)
         ).annotate(
             karma=Subquery(total_karma_subquery, output_field=IntegerField()),
             org=F("user_organization_link_user__org__title"),
@@ -171,7 +171,7 @@ def get(self, request):
 class CollegeData(APIView):
     def get(self, request):
         allowed_levels = LaunchPadLevels.get_all_values()
-        
+
         org = Organization.objects.filter(
             org_type="College",
         ).prefetch_related(
@@ -204,7 +204,7 @@ def get(self, request):
                 filter=Q(user_organization_link_org__user__user_role_link_user__role__title=LaunchPadLevels.LEVEL_4.value)
             )
         ).order_by("-total_users")
-
+        
         paginated_queryset = CommonUtils.get_paginated_queryset(
             org,
             request,

diff --git a/api/launchpad/serializers.py b/api/launchpad/serializers.py
@@ -1,6 +1,6 @@
 import uuid
 
-from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, IntegerField
+from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, IntegerField, Q
 
 from rest_framework import serializers
 
@@ -16,9 +16,9 @@ class LaunchpadLeaderBoardSerializer(serializers.ModelSerializer):
     rank = serializers.SerializerMethodField()
     karma = serializers.IntegerField()
     actual_karma = serializers.IntegerField(source="wallet_user.karma", default=None)
-    org = serializers.CharField()
-    district_name = serializers.CharField()
-    state = serializers.CharField()
+    org = serializers.CharField(allow_null=True, allow_blank=True)
+    district_name = serializers.CharField(allow_null=True, allow_blank=True)
+    state = serializers.CharField(allow_null=True, allow_blank=True)
 
     class Meta:
         model = User
@@ -50,9 +50,9 @@ def get_rank(self, obj):
                 queryset=UserOrganizationLink.objects.filter(org__org_type__in=allowed_org_types),
             )
         ).filter(
-            user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
+            Q(user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
                 org__org_type__in=allowed_org_types
-            ).values("id")
+            ).values("id")) | Q(user_organization_link_user__id__isnull=True)
         ).annotate(
             karma=Subquery(total_karma_subquery, output_field=IntegerField()),
             time_=Max("karma_activity_log_user__created_at"),