Thanks to visit codestin.com
Credit goes to github.com

Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
35 changes: 29 additions & 6 deletions website/api/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -305,13 +305,36 @@ def filter(self,request,*args,**kwargs):
except:
return Response(f"Invalid month or year passed",status=400)

queryset = global_leaderboard.get_leaderboard(month,year,api=True)

page = paginator.paginate_queryset(queryset,request)
queryset = global_leaderboard.get_leaderboard(month,year,api=True)
users= list()
rank_user =1
for each in queryset :
temp = dict()
temp["rank"]=rank_user
temp["id"]=each["id"]
temp["User"]=each["username"]
temp["score"] = Points.objects.filter(user=each["id"]).aggregate(
total_score=Sum("score")
)
temp["image"] = list(
UserProfile.objects.filter(user=each["id"]).values("user_avatar")
)[0]
temp["title_type"] = list(
UserProfile.objects.filter(user=each["id"]).values("title")
)[0]
temp["follows"] = list(
UserProfile.objects.filter(user=each["id"]).values("follows")
)[0]
temp["savedissue"] = list(
UserProfile.objects.filter(user=each["id"]).values("issue_saved")
)[0]
rank_user = rank_user+1
users.append(temp)

page = paginator.paginate_queryset(users,request)
return paginator.get_paginated_response(page)




def group_by_month(self,request,*args,**kwargs):


Expand Down Expand Up @@ -395,4 +418,4 @@ def post(self, request, *args, **kwargs):
return Response({"found": True, "issue": data})

else:
return Response({"found": False})
return Response({"found": False})
2 changes: 1 addition & 1 deletion website/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1254,7 +1254,7 @@ def get_leaderboard(self,month=None,year=None,api=False):
)
)
if api:
return data.values('username','total_score')
return data.values('id','username','total_score')

return data

Expand Down