feat: school & enrollment check (#53)

Author: Aiq0

seminare/problems/logic.py

@@ -4,7 +4,7 @@
 
 from seminare.problems.models import Problem, ProblemSet
 from seminare.rules import Chip
-from seminare.users.models import Enrollment, User
+from seminare.users.models import User
 
 
 def inject_user_score(
@@ -17,7 +17,7 @@ def inject_user_score(
 
     rule_engine = problem_set.get_rule_engine()
 
-    enrollment = Enrollment.objects.filter(user=user, problem_set=problem_set).first()
+    enrollment = user.get_enrollment(problem_set)
 
     if enrollment is None:
         return problems

seminare/problems/models.py

@@ -57,6 +57,11 @@ def get_rule_engine(self) -> RuleEngine:
         class_ = get_rule_engine_class(self.rule_engine)
         return class_(self)
 
+    @property
+    def is_running(self) -> bool:
+        now = timezone.now()
+        return self.start_date <= now <= self.end_date
+
     def close(self):
         """Closes and finalizes the problem set."""
 

seminare/problems/templates/problems/_submit_sidebar.html

@@ -7,7 +7,13 @@
       Pre odovzdávanie sa musíš <a href="{% url "oidc_authentication_init" %}?next={{ request.path_info|urlencode }}" class="underline hover:text-red-700">prihlásiť</a>.
     </span>
   </div>
+{% elif not user.current_grade or not user.current_school %}
+  {# TODO: remove that login / logout step when no longer needed #}
+  {% message 'Nemáš nastavenú školu a ročník. Nastav si ich prosím v <a class="link" href="https://id.trojsten.sk/accounts/school/">Trojsten ID</a> a potom sa odhlás a znovu prihlás.' "warning" %}
 {% else %}
+  {% if enrollment_warning %}
+    {% message 'Tvoja aktuálna škola alebo ročník sa zmenil. Ak sú údaje vo výsledkovej listine neaktuálne, napíš na <a class="link" href="mailto:info@trojsten.sk?subject=Neaktuálne údaje vo výsledkovej listine">info@trojsten.sk</a>.' "warning" %}
+  {% endif %}
   <div data-submit--cta-target="submitForm" id="submit">
     {% for id, data in submits.items %}
       <div data-controller="submit--{{ id }}-submit">

seminare/problems/views.py

@@ -10,7 +10,7 @@
 from seminare.rules import RuleEngine
 from seminare.submits.models import FileSubmit, JudgeSubmit, TextSubmit
 from seminare.users.logic.permissions import is_contest_organizer
-from seminare.users.models import Enrollment, User
+from seminare.users.models import User
 
 
 class ProblemSetListView(ListView):
@@ -116,25 +116,19 @@ def get_object(self, queryset=None):
             ProblemSet.objects.for_user(self.request.user)
             .filter(contest=self.contest, slug=self.kwargs["problem_set_slug"])
             .select_related("contest")
+            .prefetch_related("problems")
         ).first()
 
         return get_object_or_404(
-            Problem.objects.select_related("problem_set"),
+            self.problem_set.problems,
             number=self.kwargs["number"],
-            problem_set=self.problem_set,
         )
 
-    def get_submits(self):
+    def get_submits(self, enrollment):
         if not self.request.user.is_authenticated:
             return {}
 
         rule_engine: RuleEngine = self.object.problem_set.get_rule_engine()
-        enrollment = Enrollment.objects.filter(
-            problem_set=self.object.problem_set, user=self.request.user
-        ).first()
-
-        if enrollment is not None:
-            enrollment.user = self.request.user
 
         return {
             id: {
@@ -160,6 +154,22 @@ def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         assert isinstance(self.request.user, User | AnonymousUser)
 
+        enrollment = None
+
+        if (user := self.request.user).is_authenticated:
+            assert isinstance(user, User)
+            enrollment = user.get_enrollment(self.object.problem_set)
+
+            if enrollment is not None:
+                enrollment.user = user
+                ctx["enrollment"] = enrollment
+
+                if self.problem_set.is_running and (
+                    enrollment.school_id != user.current_school_id
+                    or enrollment.grade != user.current_grade
+                ):
+                    ctx["enrollment_warning"] = True
+
         chips = self.object.problem_set.get_rule_engine().get_chips(self.request.user)
 
         ctx["texts"] = self.object.get_all_texts()
@@ -173,7 +183,7 @@ def get_context_data(self, **kwargs):
         ctx["chips"] = chips[self.object]
         if isinstance(self.request.user, User):
             ctx["is_organizer"] = is_contest_organizer(self.request.user, self.contest)
-        ctx["submits"] = self.get_submits()
+        ctx["submits"] = self.get_submits(enrollment)
         return ctx
 
 

seminare/users/models.py

@@ -1,7 +1,14 @@
+from typing import TYPE_CHECKING
+
 from django.conf import settings
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 
+if TYPE_CHECKING:
+    from django.db.models.fields.related_descriptors import RelatedManager
+
+    from seminare.problems.models import ProblemSet
+
 
 class Grade(models.TextChoices):
     YOUNG = "YNG", "<5zš"
@@ -35,6 +42,8 @@ class User(AbstractUser):
     current_school_id: int
     current_grade = models.CharField(choices=Grade.choices, max_length=3, blank=True)
 
+    enrollment_set: "RelatedManager[Enrollment]"
+
     @property
     def profile_url(self):
         return f"https://id.trojsten.sk/profile/{self.username}/"
@@ -49,6 +58,20 @@ def display_name(self):
             return self.get_full_name()
         return self.username
 
+    def get_enrollment(self, problem_set: "ProblemSet"):
+        if hasattr(self, f"enrollment_cache_{problem_set.slug}"):
+            return getattr(self, f"enrollment_cache_{problem_set.slug}")
+
+        enrollment = self.enrollment_set.filter(
+            user=self, problem_set=problem_set
+        ).first()
+
+        if enrollment is None:
+            return None
+
+        setattr(self, f"enrollment_cache_{problem_set.slug}", enrollment)
+        return enrollment
+
 
 class School(models.Model):
     name = models.CharField(blank=True, max_length=256)