Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Dev server #2277

Merged
merged 21 commits into from
Jan 4, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
756fe2c
Merge pull request #2234 from gtech-mulearn/dev
nashnsulthan Oct 6, 2024
eb7f607
Merge pull request #2237 from gtech-mulearn/dev
nashnsulthan Oct 7, 2024
3c603b7
Merge pull request #2239 from gtech-mulearn/dev
nashnsulthan Oct 8, 2024
f353900
Merge pull request #2242 from gtech-mulearn/dev
nashnsulthan Oct 11, 2024
00e469c
Merge pull request #2244 from gtech-mulearn/dev
nashnsulthan Oct 12, 2024
d339c55
Merge pull request #2246 from gtech-mulearn/dev
nashnsulthan Oct 12, 2024
a2a1726
Merge pull request #2249 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
0e00f7b
Merge pull request #2251 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
4abb040
Merge pull request #2253 from gtech-mulearn/dev
nashnsulthan Oct 13, 2024
4c47ecb
Merge pull request #2256 from gtech-mulearn/dev
nashnsulthan Oct 20, 2024
3c49f5d
Merge pull request #2258 from gtech-mulearn/dev
nashnsulthan Oct 20, 2024
cc26835
Merge pull request #2261 from gtech-mulearn/dev
nashnsulthan Oct 29, 2024
c722c8e
Merge pull request #2263 from gtech-mulearn/dev
nashnsulthan Nov 1, 2024
4e4d34a
Merge pull request #2265 from gtech-mulearn/dev
nashnsulthan Nov 5, 2024
fcb5768
Merge pull request #2267 from gtech-mulearn/dev
nashnsulthan Nov 5, 2024
66fd2c3
Merge pull request #2269 from gtech-mulearn/dev
aswanthabam Nov 5, 2024
d0870fc
Merge pull request #2271 from gtech-mulearn/dev
aswanthabam Nov 5, 2024
403ad38
Merge pull request #2273 from gtech-mulearn/dev
aswanthabam Nov 9, 2024
9dcbff6
Merge pull request #2275 from gtech-mulearn/dev
aswanthabam Nov 17, 2024
0c4c4d6
fix(leaderboard): fix leaderboard apis
Jan 4, 2025
7095dd4
Merge pull request #2276 from gtech-mulearn/fix-leaderboard
aswanthabam Jan 4, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions api/leaderboard/leaderboard_view.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ def get(self, request):
queryset=UserOrganizationLink.objects.filter(
org__org_type=OrganizationType.COLLEGE.value
).select_related("org"),
to_attr="colleges"
to_attr="colleges",
)
)
.order_by("-wallet_user__karma")[:20]
Expand All @@ -50,7 +50,6 @@ def get(self, request):
exist_in_guild=True,
)
.annotate(
full_name=F("full_name"),
institution=F("user_organization_link_user__org__title"),
total_karma=Coalesce(
Sum(
Expand All @@ -70,12 +69,18 @@ def get(self, request):
"total_karma",
"institution",
)
.order_by("-total_karma")
.order_by("-total_karma")[:20]
)
data = [
{
"full_name": student.full_name,
"total_karma": student.total_karma,
"institution": student.institution,
}
for student in student_monthly_leaderboard
]

return CustomResponse(
response=student_monthly_leaderboard
).get_success_response()
return CustomResponse(response=data).get_success_response()


class CollegeLeaderboard(APIView):
Expand Down
5 changes: 2 additions & 3 deletions api/leaderboard/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,9 +78,8 @@ def get_rank(self, obj):

class StudentLeaderboardSerializer(serializers.ModelSerializer):
institution = serializers.SerializerMethodField()
total_karma = serializers.IntegerField(
source="wallet_user.karma", default=0)
full_name = serializers.CharField(source="full_name")
total_karma = serializers.IntegerField(source="wallet_user.karma", default=0)
full_name = serializers.CharField()

def get_institution(self, user):
return user.colleges[0].org.title if user.colleges else None
Expand Down
Loading