diff --git a/judge/models/contest.py b/judge/models/contest.py
index 94994fc40d..441b37cb6d 100644
--- a/judge/models/contest.py
+++ b/judge/models/contest.py
@@ -1,3 +1,5 @@
+from typing import Optional
+
from django.core.exceptions import ValidationError
from django.core.validators import MaxValueValidator, MinValueValidator, RegexValidator
from django.db import models, transaction
@@ -382,35 +384,30 @@ def access_check(self, user):
return
raise self.PrivateContest()
- # Assumes the user can access, to avoid the cost again
- def is_live_joinable_by(self, user):
- if not self.started:
- return False
+ def get_join_type(self, user) -> Optional[int]:
+ if self.ended:
+ return None # Virtual Join should not be LIVE or SPECTATE
if not user.is_authenticated:
- return False
+ return None
if user.profile.id in self.editor_ids or user.profile.id in self.tester_ids:
- return False
+ return ContestParticipation.SPECTATE
- if self.has_completed_contest(user):
- return False
+ if not self.started:
+ return None
- if self.limit_join_organizations:
- return self.join_organizations.filter(id__in=user.profile.organizations.all()).exists()
- return True
+ if user.profile.id in self.spectator_ids:
+ return ContestParticipation.SPECTATE
- # Also skips access check
- def is_spectatable_by(self, user):
- if not user.is_authenticated:
- return False
+ if (self.limit_join_organizations and
+ not self.join_organizations.filter(id__in=user.profile.organizations.all()).exists()):
+ return None
- if user.profile.id in self.editor_ids or user.profile.id in self.tester_ids:
- return True
+ if self.has_completed_contest(user):
+ return ContestParticipation.SPECTATE
- if self.limit_join_organizations:
- return self.join_organizations.filter(id__in=user.profile.organizations.all()).exists()
- return True
+ return ContestParticipation.LIVE
def is_accessible_by(self, user):
try:
@@ -522,13 +519,21 @@ def set_disqualified(self, disqualified):
self.contest.banned_users.remove(self.user)
set_disqualified.alters_data = True
+ @classmethod
+ def is_live(cls, participation_type: int) -> bool:
+ return participation_type == cls.LIVE
+
+ @classmethod
+ def is_spectate(cls, participation_type: int) -> bool:
+ return participation_type == cls.SPECTATE
+
@property
def live(self):
- return self.virtual == self.LIVE
+ return self.is_live(self.virtual)
@property
def spectate(self):
- return self.virtual == self.SPECTATE
+ return self.is_spectate(self.virtual)
@cached_property
def start(self):
diff --git a/judge/models/tests/test_contest.py b/judge/models/tests/test_contest.py
index 5be197e22b..a6dd0931fc 100644
--- a/judge/models/tests/test_contest.py
+++ b/judge/models/tests/test_contest.py
@@ -1,3 +1,5 @@
+from typing import Optional
+
from django.core.exceptions import ValidationError
from django.test import SimpleTestCase, TestCase
from django.utils import timezone
@@ -319,8 +321,7 @@ def test_basic_contest_methods(self):
'superuser': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse, # author
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate, # author
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertTrue,
'is_in_contest': self.assertFalse,
@@ -328,8 +329,7 @@ def test_basic_contest_methods(self):
'staff_contest_edit_own': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse, # author
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate, # author
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertTrue,
'is_in_contest': self.assertFalse,
@@ -337,8 +337,7 @@ def test_basic_contest_methods(self):
'staff_contest_see_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertLive,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -346,8 +345,7 @@ def test_basic_contest_methods(self):
'staff_contest_edit_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertLive,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertTrue,
'is_in_contest': self.assertFalse,
@@ -356,8 +354,7 @@ def test_basic_contest_methods(self):
# scoreboard checks don't do accessibility checks
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertLive,
'is_accessible_by': self.assertFalse,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -365,8 +362,7 @@ def test_basic_contest_methods(self):
'non_staff_tester': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -374,8 +370,7 @@ def test_basic_contest_methods(self):
'anonymous': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertFalse,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertFalse,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -454,8 +449,7 @@ def test_contest_hidden_scoreboard_contest_methods(self):
'normal_before_window': {
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertLive,
'has_completed_contest': self.assertFalse,
},
'normal_during_window': {
@@ -466,15 +460,13 @@ def test_contest_hidden_scoreboard_contest_methods(self):
'normal_after_window': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertFalse,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
'has_completed_contest': self.assertTrue,
},
'non_staff_tester': {
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
'has_completed_contest': self.assertFalse,
},
}
@@ -588,32 +580,25 @@ def test_tester_see_scoreboard_contest_methods(self):
def test_public_limit_organization_join_contest(self):
data = {
'non_staff_tester': {
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
},
'non_staff_author': {
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
},
'staff_contest_edit_own': {
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue, # curator
+ 'get_join_type': self.assertSpectate, # curator
},
'staff_contest_edit_all': {
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertFalse,
+ 'get_join_type': self.assertCantJoin,
},
'normal': {
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertFalse,
+ 'get_join_type': self.assertCantJoin,
},
'normal_open_org': {
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertLive,
},
'normal_after_window': {
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertFalse, # not in org
+ 'get_join_type': self.assertCantJoin, # not in org
},
}
self._test_object_methods_with_users(self.public_limit_organization_join_contest, data)
@@ -623,26 +608,32 @@ def test_future_contest_methods(self):
'non_staff_spectator': {
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
+ 'get_join_type': self.assertCantJoin,
},
'non_staff_tester': {
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
+ 'get_join_type': self.assertSpectate,
},
'non_staff_author': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
},
'staff_contest_edit_own': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
},
'staff_contest_edit_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertCantJoin,
},
'normal': {
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
+ 'get_join_type': self.assertCantJoin,
},
}
self._test_object_methods_with_users(self.future_contest, data)
@@ -656,12 +647,11 @@ def test_private_contest_methods(self):
self.private_contest.access_check(self.users['normal_open_org'])
self.private_contest.organizations.add(self.organizations['open'])
+ # Join checks are moot, since the contest is over.
data = {
'normal_open_org': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -696,6 +686,7 @@ def test_organization_private_contest_methods(self):
# scoreboard checks don't do accessibility checks
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertLive, # Not an editor on the contest
'is_accessible_by': self.assertFalse,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -703,6 +694,7 @@ def test_organization_private_contest_methods(self):
'staff_contest_see_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertLive, # Not an editor on the contest
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -710,6 +702,7 @@ def test_organization_private_contest_methods(self):
'staff_contest_edit_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertLive, # Not an editor on the contest
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertTrue,
'is_in_contest': self.assertFalse,
@@ -717,8 +710,7 @@ def test_organization_private_contest_methods(self):
'normal': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertTrue,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertLive,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -726,6 +718,7 @@ def test_organization_private_contest_methods(self):
'non_staff_tester': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -733,6 +726,7 @@ def test_organization_private_contest_methods(self):
'anonymous': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertFalse,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -745,8 +739,7 @@ def test_future_organization_private_contest_methods(self):
'staff_contest_edit_own': {
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertFalse,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -754,8 +747,7 @@ def test_future_organization_private_contest_methods(self):
'staff_contest_see_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -763,8 +755,7 @@ def test_future_organization_private_contest_methods(self):
'staff_contest_edit_all': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertTrue,
'is_in_contest': self.assertFalse,
@@ -772,8 +763,7 @@ def test_future_organization_private_contest_methods(self):
'normal': {
'can_see_own_scoreboard': self.assertTrue,
'can_see_full_scoreboard': self.assertTrue,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -782,8 +772,7 @@ def test_future_organization_private_contest_methods(self):
# False because contest has not begun
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertTrue,
+ 'get_join_type': self.assertSpectate,
'is_accessible_by': self.assertTrue,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -792,8 +781,7 @@ def test_future_organization_private_contest_methods(self):
# False because contest has not begun
'can_see_own_scoreboard': self.assertFalse,
'can_see_full_scoreboard': self.assertFalse,
- 'is_live_joinable_by': self.assertFalse,
- 'is_spectatable_by': self.assertFalse,
+ 'get_join_type': self.assertCantJoin,
'is_accessible_by': self.assertFalse,
'is_editable_by': self.assertFalse,
'is_in_contest': self.assertFalse,
@@ -1002,6 +990,15 @@ def test_virtual_participation(self):
self.assertEqual(participation.start, participation.real_start)
self.assertIsInstance(participation.end_time, timezone.datetime)
+ def assertLive(self, arg: Optional[int], msg: Optional[str] = None) -> None:
+ self.assertEqual(arg, ContestParticipation.LIVE, msg=msg)
+
+ def assertSpectate(self, arg: Optional[int], msg: Optional[str] = None) -> None:
+ self.assertEqual(arg, ContestParticipation.SPECTATE, msg=msg)
+
+ def assertCantJoin(self, arg: Optional[int], msg: Optional[str] = None) -> None:
+ self.assertIsNone(arg, msg=msg)
+
class ContestTagTestCase(TestCase):
@classmethod
diff --git a/judge/views/contests.py b/judge/views/contests.py
index 993bc15221..72c422362f 100644
--- a/judge/views/contests.py
+++ b/judge/views/contests.py
@@ -122,6 +122,8 @@ def get_context_data(self, **kwargs):
context['current_contests'] = present
context['future_contests'] = future
context['finished_contests'] = finished
+ context['is_live'] = ContestParticipation.is_live
+ context['is_spectate'] = ContestParticipation.is_spectate
context['now'] = self._now
context['first_page_href'] = '.'
context['page_suffix'] = '#past-contests'
@@ -192,6 +194,10 @@ def get_context_data(self, **kwargs):
context['is_spectator'] = self.is_spectator
context['can_edit'] = self.can_edit
+ participation_type = self.object.get_join_type(self.request.user)
+ context['can_live_join'] = participation_type == ContestParticipation.LIVE
+ context['can_spectate'] = participation_type == ContestParticipation.SPECTATE
+
if not self.object.og_image or not self.object.summary:
metadata = generate_opengraph('generated-meta-contest:%d' % self.object.id,
self.object.description, 'contest')
@@ -379,14 +385,8 @@ def join_contest(self, request, access_code=None):
else:
break
else:
- SPECTATE = ContestParticipation.SPECTATE
- LIVE = ContestParticipation.LIVE
-
- if contest.is_live_joinable_by(request.user):
- participation_type = LIVE
- elif contest.is_spectatable_by(request.user):
- participation_type = SPECTATE
- else:
+ participation_type = contest.get_join_type(request.user)
+ if participation_type is None:
return generic_message(request, _('Cannot enter'),
_('You are not able to join this contest.'))
try:
@@ -404,7 +404,7 @@ def join_contest(self, request, access_code=None):
else:
if participation.ended:
participation = ContestParticipation.objects.get_or_create(
- contest=contest, user=profile, virtual=SPECTATE,
+ contest=contest, user=profile, virtual=ContestParticipation.SPECTATE,
defaults={'real_start': timezone.now()},
)[0]
diff --git a/templates/contest/contest-tabs.html b/templates/contest/contest-tabs.html
index eb8366df90..3cf2a79b34 100644
--- a/templates/contest/contest-tabs.html
+++ b/templates/contest/contest-tabs.html
@@ -58,7 +58,7 @@
{{- _('Leave contest') -}}
{% endif %}">
- {% elif contest.is_live_joinable_by(request.user) %}
+ {% elif can_live_join %}
- {% elif contest.is_spectatable_by(request.user) %}
+ {% elif can_spectate %}