Merge pull request #1996 from gtech-mulearn/dev

Update launchpad leaderboard serializers
gtech-mulearn · Jun 1, 2024 · af071d8 · af071d8
2 parents 97b1d20 + 36c3912
commit af071d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/api/launchpad/launchpad_views.py b/api/launchpad/launchpad_views.py
@@ -1,4 +1,5 @@
-from django.db.models import Q, Sum, Max, Prefetch
+from django.db.models import Q, Sum, Max, Prefetch, F
+from django.db.models.functions import Coalesce
 
 from rest_framework.views import APIView
 
@@ -32,6 +33,9 @@ def get(self, request):
                         karma_activity_log_user__appraiser_approved=True,
                     ),
                 ),
+                org=F("user_organization_link_user__org__title"),
+                district_name=F("user_organization_link_user__org__district__name"),
+                state=F("user_organization_link_user__org__district__zone__state__name"),
                 time_=Max("karma_activity_log_user__created_at"),
             )
             .order_by("-karma", "time_")

diff --git a/api/launchpad/serializers.py b/api/launchpad/serializers.py
@@ -4,9 +4,9 @@
 
 class LaunchpadLeaderBoardSerializer(serializers.ModelSerializer):
     karma = serializers.IntegerField()
-    org = serializers.ReadOnlyField(source="user_organization_link_user.org.title")
-    district_name = serializers.ReadOnlyField(source="user_organization_link_user.org.district.name")
-    state = serializers.ReadOnlyField(source="user_organization_link_user.org.district.zone.state.name")
+    org = serializers.CharField()
+    district_name = serializers.CharField()
+    state = serializers.CharField()
 
     class Meta:
         model = User