Merge pull request #2098 from gtech-mulearn/dev

Dev
gtech-mulearn · Jun 20, 2024 · 0922337 · 0922337
2 parents 464311d + e2411c3
commit 0922337
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 11 deletions.
diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py
@@ -25,7 +25,7 @@ def get(self, request):
         ).values('user').annotate(
             total_karma=Sum('karma')
         ).values('total_karma')
-        allowed_org_types = ["College", "School", "Company", "Community"]
+        allowed_org_types = ["College", "School", "Company"]
 
         intro_task_completed_users = KarmaActivityLog.objects.filter(
             task__event='launchpad',
@@ -43,9 +43,9 @@ def get(self, request):
                 queryset=UserOrganizationLink.objects.filter(org__org_type__in=allowed_org_types),
             )
         ).filter(
-            Q(user_organization_link_user__user_id__in=UserOrganizationLink.objects.filter(
+            Q(user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
                 org__org_type__in=allowed_org_types
-            ).values("user_id")) | Q(user_organization_link_user__id__isnull=True)
+            ).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"),
@@ -93,9 +93,9 @@ def get(self, request):
                 queryset=UserRoleLink.objects.filter(verified=True, role__title__in=allowed_levels).select_related('role')
             )
         ).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(
             org=F("user_organization_link_user__org__title"),
             district_name=F("user_organization_link_user__org__district__name"),

diff --git a/api/launchpad/serializers.py b/api/launchpad/serializers.py
@@ -32,7 +32,7 @@ def get_rank(self, obj):
         ).values('user').annotate(
             total_karma=Sum('karma')
         ).values('total_karma')
-        allowed_org_types = ["College", "School", "Company", "Community"]
+        allowed_org_types = ["College", "School", "Company"]
 
         intro_task_completed_users = KarmaActivityLog.objects.filter(
             task__event='launchpad',
@@ -50,9 +50,9 @@ def get_rank(self, obj):
                 queryset=UserOrganizationLink.objects.filter(org__org_type__in=allowed_org_types),
             )
         ).filter(
-            Q(user_organization_link_user__user_id__in=UserOrganizationLink.objects.filter(
+            Q(user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
                 org__org_type__in=allowed_org_types
-            ).values("user_id")) | Q(user_organization_link_user__id__isnull=True)
+            ).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"),
@@ -69,9 +69,9 @@ def get_rank(self, obj):
 
 
 class LaunchpadParticipantsSerializer(serializers.ModelSerializer):
-    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)
     level = serializers.CharField()
 
     class Meta: