Skip to content

Commit

Permalink
Merge pull request #2048 from jelanmathewjames/dev
Browse files Browse the repository at this point in the history
refactor: optimize leaderboard ranking query
  • Loading branch information
jelanmathewjames authored Jun 11, 2024
2 parents b9cca31 + 816ed8b commit 8c19cb2
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 11 deletions.
12 changes: 2 additions & 10 deletions api/launchpad/launchpad_views.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, Window, IntegerField
from django.db.models.functions import Rank
from django.db import connection
from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, IntegerField

from rest_framework.views import APIView

from .serializers import LaunchpadLeaderBoardSerializer
Expand Down Expand Up @@ -50,13 +49,6 @@ def get(self, request):
time_=Max("karma_activity_log_user__created_at"),
).order_by("-karma", "time_")

users = users.annotate(
rank=Window(
expression=Rank(),
order_by=F("karma").desc(),
)
)

paginated_queryset = CommonUtils.get_paginated_queryset(
users,
request,
Expand Down
49 changes: 48 additions & 1 deletion api/launchpad/serializers.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,14 @@
from django.db.models import Sum, Max, Prefetch, F, OuterRef, Subquery, Window, IntegerField
from django.db.models.functions import Rank

from rest_framework import serializers

from db.user import User
from db.organization import UserOrganizationLink
from db.task import KarmaActivityLog

class LaunchpadLeaderBoardSerializer(serializers.ModelSerializer):
rank = serializers.IntegerField()
rank = serializers.SerializerMethodField()
karma = serializers.IntegerField()
org = serializers.CharField()
district_name = serializers.CharField()
Expand All @@ -12,3 +17,45 @@ class LaunchpadLeaderBoardSerializer(serializers.ModelSerializer):
class Meta:
model = User
fields = ("rank", "full_name", "karma", "org", "district_name", "state")

def get_rank(self, obj):
total_karma_subquery = KarmaActivityLog.objects.filter(
user=OuterRef('id'),
task__event='launchpad',
appraiser_approved=True,
).values('user').annotate(
total_karma=Sum('karma')
).values('total_karma')
allowed_org_types = ["College", "School", "Company"]

intro_task_completed_users = KarmaActivityLog.objects.filter(
task__event='launchpad',
appraiser_approved=True,
task__hashtag='#lp24-introduction',
).values('user')

users = User.objects.filter(
karma_activity_log_user__task__event="launchpad",
karma_activity_log_user__appraiser_approved=True,
id__in=intro_task_completed_users
).prefetch_related(
Prefetch(
"user_organization_link_user",
queryset=UserOrganizationLink.objects.filter(org__org_type__in=allowed_org_types),
)
).filter(
user_organization_link_user__id__in=UserOrganizationLink.objects.filter(
org__org_type__in=allowed_org_types
).values("id")
).annotate(
karma=Subquery(total_karma_subquery, output_field=IntegerField()),
time_=Max("karma_activity_log_user__created_at"),
).order_by("-karma", "time_").annotate(
rank=Window(
expression=Rank(),
order_by=[F("karma").desc(), F("time_").asc()]
)
)

return users.get(id=obj.id).rank

0 comments on commit 8c19cb2

Please sign in to comment.