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.

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

Jump to bottom

Add consistency to participation in /contest #1743

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

Add consistency to participation in /contest #1743

Changes from 3 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
792f7ca
Add consistency to participation in /contest
jtyliu Aug 4, 2021
7308028
Add consistency to participation in /particition and /user
jtyliu Aug 10, 2021
11dba54
Remove redundant value from /user endpoint
jtyliu Aug 10, 2021
9c6311f
Merge branch 'master' into api-consistency
jtyliu Aug 23, 2021
bfd94f0
Update consistency for #1751
jtyliu Aug 23, 2021
e3ef05a
Use annotate instead
jtyliu Aug 23, 2021
a13f00c
Include attributes in .only
Aug 26, 2021
f2cd2cd
Remove old_performance
Aug 27, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
58 changes: 50 additions & 8 deletions judge/views/api/api_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,8 @@ def get_object_data(self, contest):
username=F('user__user__username'),
old_rating=Subquery(old_ratings_subquery.values('rating')[:1]),
new_rating=Subquery(new_ratings_subquery.values('rating')[:1]),
old_volatility=Subquery(old_ratings_subquery.values('volatility')[:1]),
new_volatility=Subquery(new_ratings_subquery.values('volatility')[:1]),
)
.order_by('-score', 'cumtime', 'tiebreaker')
)
Expand Down Expand Up @@ -318,6 +320,8 @@ def get_object_data(self, contest):
'tiebreaker': participation.tiebreaker,
'old_rating': participation.old_rating,
'new_rating': participation.new_rating,
'old_volatility': participation.old_volatility,
'new_volatility': participation.new_volatility,
'is_disqualified': participation.is_disqualified,
'solutions': contest.format.get_problem_breakdown(participation, problems),
} for participation in participations
Expand Down Expand Up @@ -352,9 +356,22 @@ def get_unfiltered_queryset(self):
q |= Q(view_contest_scoreboard=self.request.profile)
visible_contests = visible_contests.filter(q)

new_ratings_subquery = Rating.objects.filter(participation=OuterRef('pk'))
old_ratings_subquery = (
Rating.objects
.filter(user=OuterRef('user__pk'), contest__end_time__lt=OuterRef('contest__end_time'))
.order_by('-contest__end_time')
)

return (
ContestParticipation.objects
jtyliu marked this conversation as resolved.
Show resolved Hide resolved
.filter(virtual__gte=0, contest__in=visible_contests)
.annotate(
old_rating=Subquery(old_ratings_subquery.values('rating')[:1]),
new_rating=Subquery(new_ratings_subquery.values('rating')[:1]),
old_volatility=Subquery(old_ratings_subquery.values('volatility')[:1]),
new_volatility=Subquery(new_ratings_subquery.values('volatility')[:1]),
)
.select_related('user__user', 'contest')
.order_by('id')
.only(
Expand All @@ -369,6 +386,10 @@ def get_unfiltered_queryset(self):
'tiebreaker',
'is_disqualified',
'virtual',
'old_rating',
'new_rating',
'old_volatility',
'new_volatility',
)
)

Expand All @@ -381,6 +402,10 @@ def get_object_data(self, participation):
'score': participation.score,
'cumulative_time': participation.cumtime,
'tiebreaker': participation.tiebreaker,
'old_rating': participation.old_rating,
'new_rating': participation.new_rating,
'old_volatility': participation.old_volatility,
'new_volatility': participation.new_volatility,
'is_disqualified': participation.is_disqualified,
'virtual_participation_number': participation.virtual,
}
Expand Down Expand Up @@ -527,6 +552,13 @@ def get_object_data(self, profile):

last_rating = profile.ratings.order_by('-contest__end_time').first()

new_ratings_subquery = Rating.objects.filter(participation=OuterRef('pk'))
old_ratings_subquery = (
Rating.objects
.filter(user=OuterRef('user__pk'), contest__end_time__lt=OuterRef('contest__end_time'))
.order_by('-contest__end_time')
)

contest_history = []
participations = (
ContestParticipation.objects
jtyliu marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -536,17 +568,27 @@ def get_object_data(self, profile):
contest__in=Contest.get_visible_contests(self.request.user),
contest__end_time__lt=self._now,
)
.annotate(
old_rating=Subquery(old_ratings_subquery.values('rating')[:1]),
new_rating=Subquery(new_ratings_subquery.values('rating')[:1]),
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure if this gets optimized properly, but why not just use rating__rating and rating__volatility instead of a subquery here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's true, could the same reasoning be applied to https://github.com/JoshuaTianYangLiu/online-judge/blob/api-consistency/judge/views/api/api_v2.py#L255?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes

old_volatility=Subquery(old_ratings_subquery.values('volatility')[:1]),
new_volatility=Subquery(new_ratings_subquery.values('volatility')[:1]),
)
.order_by('contest__end_time')
)
for contest_key, score, cumtime, rating, volatility in participations.values_list(
'contest__key', 'score', 'cumtime', 'rating__rating', 'rating__volatility',
):
for participation in participations:
contest_history.append({
'key': contest_key,
'score': score,
'cumulative_time': cumtime,
'rating': rating,
'volatility': volatility,
'key': participation.contest.key,
'start_time': participation.start.isoformat(),
'end_time': participation.end_time.isoformat(),
'score': participation.score,
'cumulative_time': participation.cumtime,
'tiebreaker': participation.tiebreaker,
'old_rating': participation.old_rating,
'new_rating': participation.new_rating,
'old_volatility': participation.old_volatility,
'new_volatility': participation.new_volatility,
'is_disqualified': participation.is_disqualified,
})

return {
Expand Down