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

Skip to content

code cleanup, bug fixes #933

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.

Sign up for GitHub

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

Merged
fredfalcon merged 1 commit into from
Aug 24, 2022
Merged

code cleanup, bug fixes #933

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
10 changes: 5 additions & 5 deletions bugheist/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
import comments.views
import website.views
from website.views import (
EachmonthLeaderboardView,
UserProfileDetailView,
IssueCreate,
UploadCreate,
InboundParseWebhookView,
LeaderboardView,
EachmonthLeaderboardView,
GloalLeaderboardView,
SpecificMonthLeaderboardView,
LeaderboardApiViewSet,
LikeIssueApiView,
FlagIssueApiView,
MonthlyLeaderboardView,
IssueView,
AllIssuesView,
SpecificIssuesView,
Expand Down Expand Up @@ -278,8 +278,8 @@
re_path(r"^follow/(?P<user>[^/]+)/", website.views.follow_user, name="follow_user"),
re_path(r"^all_activity/$", AllIssuesView.as_view(), name="all_activity"),
re_path(r"^label_activity/$", SpecificIssuesView.as_view(), name="all_activity"),
re_path(r"^leaderboard/$", LeaderboardView.as_view(), name="leaderboard"),
re_path(r"^leaderboard/monthly/$", MonthlyLeaderboardView.as_view(), name="leaderboard_monthly"),
re_path(r"^leaderboard/$", GloalLeaderboardView.as_view(), name="leaderboard_global"),
re_path(r"^leaderboard/monthly/$", SpecificMonthLeaderboardView.as_view(), name="leaderboard_specific_month"),
re_path(r"^leaderboard/each-month/$", EachmonthLeaderboardView.as_view(), name="leaderboard_eachmonth"),
re_path(r"^leaderboard/api/$", LeaderboardApiViewSet.as_view(), name="leaderboard_api"),
re_path(r"^api/v1/issue/like/(?P<id>\w+)/$", LikeIssueApiView.as_view(), name="like_issue"),
Expand Down
3 changes: 2 additions & 1 deletion website/templates/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,8 @@ <h1 class="page-sub-header">Latest activity</h1>
{% endif %}
</div>
<a href="/leaderboard" class="btn btn-default btn-block submit_button">View All</a>
<a href="/leaderboard/monthly" class="btn btn-default btn-block submit_button">View Monthly</a>
<a href="/leaderboard/monthly" class="btn btn-default btn-block submit_button">Filter Monthly</a>
<a href="/leaderboard/each-month" class="btn btn-default btn-block submit_button">View Monthly</a>
</div>
</div>
</div>
Expand Down
2 changes: 1 addition & 1 deletion website/templates/leaderboard_eachmonth.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ <h1 class="page-header">Monthly Leaderboard</h1>
{% else %}
{% if month.user.userprofile.avatar %}
<img src="{{ month.user.userprofile.avatar }}" class="img-responsive img-thumbnail profileimage">
{% elif month.user.socialaccount_set.all.0.get_avatar_url %}
{% elif user.socialaccount_set.all.0.get_avatar_url %}
<img src="{{ month.user.socialaccount_set.all.0.get_avatar_url }}" class="profileimage">
{% else %}
<img src="{% gravatar_url month.user.email 50 %}" class="profileimage">
Expand Down
0 website/templates/leaderboard.html → website/templates/leaderboard_global.html
View file
Open in desktop
File renamed without changes.
0 website/templates/leaderboard_monthly.html → ...templates/leaderboard_specific_month.html
View file
Open in desktop
File renamed without changes.
115 changes: 60 additions & 55 deletions website/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,93 +1136,97 @@ def get_context_data(self, *args, **kwargs):
context["label"] = self.request.GET.get("label")
return context


class LeaderboardView(ListView):
model = User
template_name = "leaderboard.html"

class LeaderboardBase():
'''
get:
1) ?monthly=true will give list of winners for current month
2) ?year=2022 will give list of winner of every month from month 1-12 else None

'''

def curr_month_leaderboard(self):

'''
def get_leaderboard(self,month=None,year=None,api=False):
'''
return: querydict containing list of users with points scored in current month in descending order
all user scores for specified month and year
'''


return (
User.objects
.values("username")
.annotate(total_score=Sum("points__score"))
.order_by("-total_score")
.filter(
total_score__gt=0,
points__created__month=datetime.now().month,
points__created__year=datetime.now().year
)
)

if year and not month:
data = User.objects.filter(points__created__year=year)

if year and month:
data = User.objects.filter(
Q(points__created__year=year) &
Q(points__created__month=month)
)

def month_leaderboard(self,month,year,api=True):
'''
return: list of dict of current/specified month users leaderboard
'''

data = (
User.objects
data
.annotate(total_score=Sum('points__score'))
.order_by('-total_score')
.filter(
total_score__gt=0,
points__created__month=month,
points__created__year=year
)
)

if api:
return data.values('username')

return data


def monthly_leaderboard(self,year,api=False) -> list:
def current_month_leaderboard(self,api=False):
'''
leaderboard which includes current month users scores
'''
return (
self.get_leaderboard(
month=int(datetime.now().month),
year=int(datetime.now().year),
api=api
)
)

def monthly_year_leaderboard(self,year,api=False):

'''
return: list of dict of monthly winners ordered from 1-12 for queried year
leaderboard which includes current year top user from each month
'''

monthly_winner = []

# iterating over months 1-12
for month in range(1,13):
month_winner = self.month_leaderboard(month,year,api)
month_winner = self.get_leaderboard(month,year,api).first()
monthly_winner.append(month_winner)


return monthly_winner


def get_context_data(self, *args, **kwargs):
# monthly = self.request.query_params.get("monthly")

context = super(LeaderboardView, self).get_context_data(*args, **kwargs)
class GloalLeaderboardView(LeaderboardBase,ListView):
model = User
template_name = "leaderboard_global.html"

def get_context_data(self, *args, **kwargs):
context = super(GloalLeaderboardView, self).get_context_data(*args, **kwargs)

if self.request.user.is_authenticated:
context["wallet"] = Wallet.objects.get(user=self.request.user)
year = int(datetime.now().year)
context["leaderboard"] = self.monthly_leaderboard(year)
context["leaderboard"] = self.get_leaderboard(year=int(datetime.now().year))
admin = context["leaderboard"][0]
return context


class EachmonthLeaderboardView(LeaderboardView,ListView):
class EachmonthLeaderboardView(LeaderboardBase,ListView):

'''
gives top user from each month for current year
'''

model = User
template_name = "leaderboard_eachmonth.html"

def get_context_data(self, *args, **kwargs):

context = super(LeaderboardView, self).get_context_data(*args, **kwargs)
context = super(EachmonthLeaderboardView, self).get_context_data(*args, **kwargs)

if self.request.user.is_authenticated:
context["wallet"] = Wallet.objects.get(user=self.request.user)
Expand All @@ -1236,28 +1240,28 @@ def get_context_data(self, *args, **kwargs):

year = int(year)

leaderboard = self.monthly_leaderboard(year)
leaderboard = self.monthly_year_leaderboard(year)
month_winners = []

months = ["January","February","March","April","May","June","July","August","September","October","Novermber","December"]

for indx,month in enumerate(leaderboard):
for month_indx,usr in enumerate(leaderboard):


month = {"user":month.first(),"month":months[indx]}
month_winners.append(month)
month_winner = {"user":usr,"month":months[month_indx]}
month_winners.append(month_winner)

context["leaderboard"] = month_winners

return context

class MonthlyLeaderboardView(LeaderboardView,ListView):
class SpecificMonthLeaderboardView(LeaderboardBase,ListView):
model = User
template_name = "leaderboard_monthly.html"
template_name = "leaderboard_specific_month.html"

def get_context_data(self, *args, **kwargs):
# monthly = self.request.query_params.get("monthly")

context = super(LeaderboardView, self).get_context_data(*args, **kwargs)

context = super(SpecificMonthLeaderboardView, self).get_context_data(*args, **kwargs)

if self.request.user.is_authenticated:
context["wallet"] = Wallet.objects.get(user=self.request.user)
Expand All @@ -1279,22 +1283,23 @@ def get_context_data(self, *args, **kwargs):
if not (month>=1 and month<=12):
raise Http404(f"Invalid query passed | Month:{month}")



context["leaderboard"] = self.month_leaderboard(month,year,api=False)
context["leaderboard"] = self.get_leaderboard(month,year,api=False)
return context

class LeaderboardApiViewSet(LeaderboardView,APIView):
class LeaderboardApiViewSet(LeaderboardBase,APIView):

def get(self,request,format=None):

response = Response({"params":"no params passed [(monthly,bool),(year,int)]"})

if request.query_params.get('monthly')=="true":
queryset = self.curr_month_leaderboard()
queryset = self.current_month_leaderboard()
response = Response(queryset,status=200)

elif request.query_params.get('year'):
queryset = self.monthly_leaderboard(year=request.query_params.get('year'))
queryset = self.monthly_year_leaderboard(year=request.query_params.get('year'))
response = Response(queryset,status=200)

return response
Expand Down