chore: url cleanup (#56)

Author: Aiq0

seminare/content/urls.py

@@ -3,7 +3,7 @@
 from seminare.content import views
 
 urlpatterns = [
-    path("posts/", views.PostListView.as_view(), name="post_list"),
-    path("posts/<slug>/", views.PostDetailView.as_view(), name="post_detail"),
+    path("prispevky/", views.PostListView.as_view(), name="post_list"),
+    path("prispevky/<slug>/", views.PostDetailView.as_view(), name="post_detail"),
     path("<path:slug>/", views.PageDetailView.as_view(), name="page_detail"),
 ]

seminare/content/views.py

@@ -1,4 +1,3 @@
-from django.contrib.sites.shortcuts import get_current_site
 from django.http import Http404, HttpRequest, HttpResponseBase
 from django.shortcuts import get_object_or_404, redirect
 from django.views.generic import DetailView, ListView
@@ -28,7 +27,7 @@ def dispatch(self, request: HttpRequest, *args, **kwargs) -> HttpResponseBase:
         ).first()
 
         if self.page is None:
-            if self.is_organizer:
+            if self.is_organizer and not self.kwargs.get("slug").startswith("org/"):
                 return redirect("org:page_create", slug=self.kwargs["slug"])
             raise Http404()
 
@@ -48,13 +47,17 @@ class PostListView(ListView):
     paginate_by = 15
 
     def get_queryset(self):
-        site = get_current_site(self.request)
-        return Post.objects.filter(contests__site=site)
+        contest = get_current_contest(self.request)
+        return Post.objects.filter(contests__id=contest.id).select_related("author")
 
 
 class PostDetailView(DetailView):
     template_name = "post/detail.html"
 
     def get_object(self, queryset=...):
-        site = get_current_site(self.request)
-        return get_object_or_404(Post, slug=self.kwargs["slug"], contests__site=site)
+        contest = get_current_contest(self.request)
+        return get_object_or_404(
+            Post.objects.select_related("author"),
+            slug=self.kwargs["slug"],
+            contests__id=contest.id,
+        )

seminare/organizer/forms.py

@@ -2,7 +2,6 @@
 from django.core.validators import FileExtensionValidator
 
 from seminare.content.models import Page, Post
-from seminare.contests.models import Contest
 from seminare.problems.models import Problem, ProblemSet, Text
 from seminare.rules import get_rule_engine_class
 from seminare.style.forms import DateTimeInput
@@ -162,9 +161,9 @@ class Meta:
             "content": "Obsah",
         }
 
-    def __init__(self, *, site, **kwargs):
+    def __init__(self, *, contest, **kwargs):
         super().__init__(**kwargs)
-        self.contest = Contest.objects.filter(site=site).first()
+        self.contest = contest
 
     def clean_slug(self):
         slug = self.cleaned_data["slug"]

seminare/organizer/tables.py

@@ -66,7 +66,10 @@ def get_links(
                 "Opravovanie",
                 reverse(
                     "org:grading_overview",
-                    args=[object.id],
+                    args=[
+                        object.problem_set.slug,
+                        object.number,
+                    ],
                 ),
             ),
         ]
@@ -79,7 +82,7 @@ def get_links(
                         "org:problem_update",
                         args=[
                             object.problem_set.slug,
-                            object.id,
+                            object.number,
                         ],
                     ),
                 ),

seminare/organizer/templates/org/grading/_form.html

@@ -1,5 +1,5 @@
 {# Grading form #}
-<form class="gap-y-4 text-sm flex-1 flex flex-col" enctype="multipart/form-data" method="post" action="{% url 'org:grading_submit' submit.submit_id %}" hx-boost="true">
+<form class="gap-y-4 text-sm flex-1 flex flex-col" enctype="multipart/form-data" method="post" action="{% url 'org:grading_submit' problem_set.slug problem.number submit.submit_id %}" hx-boost="true">
   <textarea name="comment" class="input flex-1 {% if form.comment.errors %}border-red-600 placeholder-red-600{% endif %}" rows=7 placeholder="Komentár">{{ form.comment.value }}</textarea>
 
   {% if type == 'file' %}

seminare/organizer/templates/org/grading/_overview_score.html

@@ -7,7 +7,7 @@
     {{ submit.score|floatformat:"g" }}
   {% endif %}
   <iconify-icon icon="mdi:pencil" class="text-gray-800/40 group-hover:text-gray-800"></iconify-icon>
-  <a href="{% url "org:grading_submit" submit.submit_id %}" class="inset-0 absolute" {% if submit.scored_by %}data-tippy-content="{{ submit.scored_by.display_name }}"{% endif %}></a>
+  <a href="{% url "org:grading_submit" problem_set.slug problem.number submit.submit_id %}" class="inset-0 absolute" {% if submit.scored_by %}data-tippy-content="{{ submit.scored_by.display_name }}"{% endif %}></a>
 {% else %}
   <span class="text-gray-400">neodovzdané</span>
 {% endif %}

seminare/organizer/templates/org/grading/submit.html

@@ -7,14 +7,14 @@
 {% block org_body %}
 <div class="flex w-full h-full max-h-screen">
   <div class="border-r w-80 shrink-0 px-4 py-3 overflow-auto space-y-1" hx-boost="true">
-    <a href="{% url 'org:grading_overview' submit.problem_id %}#user-{{ submit.enrollment.user_id }}" class="link flex items-center mb-2">
+    <a href="{% url 'org:grading_overview' problem_set.slug problem.number %}#user-{{ submit.enrollment.user_id }}" class="link flex items-center mb-2">
       <iconify-icon icon="mdi:arrow-left" class="mr-1"></iconify-icon>
       Späť na hodnotenie úlohy
     </a>
 
     {% for row in other_users %}
     {% if row.submit %}
-    <a href="{% url 'org:grading_submit' row.submit.submit_id %}" class="block text-gray-800 px-3 py-2 hover:bg-gray-50 {% if row.user.id == submit.enrollment.user_id %}bg-gray-100 scroll-to-me{% endif %} rounded">
+    <a href="{% url 'org:grading_submit' problem_set.slug problem.number row.submit.submit_id %}" class="block text-gray-800 px-3 py-2 hover:bg-gray-50 {% if row.user.id == submit.enrollment.user_id %}bg-gray-100 scroll-to-me{% endif %} rounded">
       <div class="flex items-center justify-between font-semibold">
         <span>{{ row.user.display_name }}</span>
         {% if row.submit.score is not None %}
@@ -44,9 +44,9 @@
       {% for osubmit in other_submits %}
         {% if osubmit.type == "submit" %}
           {% with other_submit=osubmit.submit %}
-            <a href="{% url 'org:grading_submit' other_submit.submit_id %}" class="block text-gray-800 px-3 py-2 hover:bg-gray-50 {% if other_submit == submit %}bg-gray-100 scroll-to-me{% endif %} rounded">
+            <a href="{% url 'org:grading_submit' problem_set.slug problem.number other_submit.submit_id %}" class="block text-gray-800 px-3 py-2 hover:bg-gray-50 {% if other_submit == submit %}bg-gray-100 scroll-to-me{% endif %} rounded">
               <div class="flex items-center justify-between font-semibold gap-1">
-                <span class="text-ellipsis overflow-hidden text-sm">{{ submit.created_at }}</span>
+                <span class="text-ellipsis overflow-hidden text-sm">{{ other_submit.created_at }}</span>
                 <span data-submit-score="{{ other_submit.id }}"class="text-green-600 whitespace-nowrap shrink-0 tabular-nums">{% if other_submit.score is not None %}{{ other_submit.score|floatformat:"g" }} b{% endif %}</span>
               </div>
             </a>

seminare/organizer/urls.py

@@ -1,71 +1,72 @@
-from django.urls import include, path
+from django.urls import path
 
 from seminare.organizer.views import dashboard, grading, page, post, problem, problemset
 
 app_name = "org"
 
-contest_patterns = [
+urlpatterns = [
     path("", dashboard.ContestDashboardView.as_view(), name="contest_dashboard"),
-    path("sets/", problemset.ProblemSetListView.as_view(), name="problemset_list"),
+    path("kola/", problemset.ProblemSetListView.as_view(), name="problemset_list"),
     path(
-        "sets/create/",
+        "kola/vytvorit/",
         problemset.ProblemSetCreateView.as_view(),
         name="problemset_create",
     ),
     path(
-        "sets/<slug>/",
+        "kola/<problem_set_slug>/",
         problemset.ProblemSetUpdateView.as_view(),
         name="problemset_update",
     ),
     path(
-        "grading/problem/<int:problem_id>/",
+        "kola/<problem_set_slug>/ulohy/<int:number>/opravovanie/",
         grading.GradingOverviewView.as_view(),
         name="grading_overview",
     ),
     path(
-        "grading/problem/<int:problem_id>/bulk/",
+        "kola/<problem_set_slug>/ulohy/<int:number>/opravovanie/hromadne/",
         grading.BulkGradingView.as_view(),
         name="bulk_grading",
     ),
     path(
-        "grading/problem/<int:problem_id>/bulk/download/",
+        "kola/<problem_set_slug>/ulohy/<int:number>/opravovanie/hromadne/stiahnut/",
         grading.BulkGradingDownloadView.as_view(),
         name="bulk_grading_download",
     ),
     path(
-        "grading/submit/<submit_id:submit_id>/",
+        "kola/<problem_set_slug>/ulohy/<int:number>/opravovanie/<submit_id:submit_id>/",
         grading.GradingSubmitView.as_view(),
         name="grading_submit",
     ),
     path(
-        "sets/<problem_set_slug>/problems/",
+        "kola/<problem_set_slug>/ulohy/",
         problem.ProblemListView.as_view(),
         name="problem_list",
     ),
     path(
-        "sets/<problem_set_slug>/problems/<int:problem_id>/",
+        "kola/<problem_set_slug>/ulohy/<int:number>/",
         problem.ProblemUpdateView.as_view(),
         name="problem_update",
     ),
     path(
-        "sets/<problem_set_slug>/problems/create/",
+        "kola/<problem_set_slug>/ulohy/vytvorit/",
         problem.ProblemCreateView.as_view(),
         name="problem_create",
     ),
-    path("posts/", post.PostListView.as_view(), name="post_list"),
-    path("posts/<int:pk>/", post.PostUpdateView.as_view(), name="post_update"),
-    path("posts/<int:pk>/delete/", post.PostDeleteView.as_view(), name="post_delete"),
-    path("posts/create/", post.PostCreateView.as_view(), name="post_create"),
-]
-
-
-urlpatterns = [
-    path("contests/", include(contest_patterns)),
-    path("pages/", page.PageListView.as_view(), name="page_list"),
-    path("pages/<int:pk>/", page.PageUpdateView.as_view(), name="page_update"),
-    path("pages/<int:pk>/delete/", page.PageDeleteView.as_view(), name="page_delete"),
-    path("pages/create/", page.PageCreateView.as_view(), name="page_create"),
+    path("prispevky/", post.PostListView.as_view(), name="post_list"),
+    path("prispevky/<int:pk>/", post.PostUpdateView.as_view(), name="post_update"),
+    path(
+        "prispevky/<int:pk>/vymazat/", post.PostDeleteView.as_view(), name="post_delete"
+    ),
+    path("prispevky/vytvorit/", post.PostCreateView.as_view(), name="post_create"),
+    path("stranky/", page.PageListView.as_view(), name="page_list"),
+    path("stranky/<int:pk>/", page.PageUpdateView.as_view(), name="page_update"),
+    path(
+        "stranky/<int:pk>/vymazat/", page.PageDeleteView.as_view(), name="page_delete"
+    ),
+    path("stranky/vytvorit/", page.PageCreateView.as_view(), name="page_create"),
     path(
-        "pages/create/<path:slug>/", page.PageCreateView.as_view(), name="page_create"
+        "stranky/vytvorit/<path:slug>/",
+        page.PageCreateView.as_view(),
+        name="page_create",
     ),
 ]

seminare/organizer/views/__init__.py

@@ -6,7 +6,7 @@
 
 from seminare.contests.models import Contest
 from seminare.contests.utils import get_current_contest
-from seminare.problems.models import ProblemSet
+from seminare.problems.models import Problem, ProblemSet
 from seminare.submits.models import BaseSubmit
 
 
@@ -37,21 +37,25 @@ def get_context_data(self, **kwargs):
         return ctx
 
 
-class WithProblemSet(MixinProtocol):
+class WithProblemSet(WithContest, MixinProtocol):
     @cached_property
     def problem_set(self) -> ProblemSet:
-        return get_object_or_404(ProblemSet, slug=self.kwargs["problem_set_slug"])
+        return get_object_or_404(
+            ProblemSet, slug=self.kwargs["problem_set_slug"], contest=self.contest
+        )
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx["problem_set"] = self.problem_set
         return ctx
 
 
-class WithProblem(MixinProtocol):
+class WithProblem(WithProblemSet, MixinProtocol):
     @cached_property
-    def problem(self) -> ProblemSet:
-        return get_object_or_404(ProblemSet, id=self.kwargs["problem_id"])
+    def problem(self) -> Problem:
+        return get_object_or_404(
+            Problem, problem_set=self.problem_set, number=self.kwargs["number"]
+        )
 
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)

seminare/organizer/views/grading.py

@@ -8,7 +8,6 @@
 from django.core.files.base import ContentFile
 from django.db.models.fields.files import FieldFile
 from django.http import FileResponse, HttpResponseRedirect
-from django.shortcuts import get_object_or_404
 from django.template.defaultfilters import slugify
 from django.urls import reverse
 from django.utils.functional import cached_property
@@ -19,20 +18,17 @@
 from seminare.organizer.views import (
     MixinProtocol,
     WithBreadcrumbs,
-    WithContest,
+    WithProblem,
     WithSubmit,
 )
 from seminare.organizer.views.generic import GenericFormView
-from seminare.problems.models import Problem
 from seminare.rules import RuleEngine
 from seminare.submits.models import BaseSubmit, FileSubmit, JudgeSubmit, TextSubmit
 from seminare.users.mixins.permissions import ContestOrganizerRequired
 from seminare.users.models import Enrollment
 
 
-class WithSubmitList(WithContest, MixinProtocol):
-    problem: Problem | cached_property
-
+class WithSubmitList(WithProblem, MixinProtocol):
     @cached_property
     def rule_engine(self) -> RuleEngine:
         return self.problem.problem_set.get_rule_engine()
@@ -80,16 +76,13 @@ def get_users_with_submits(self, limit_types=None):
 
 
 class GradingOverviewView(
-    ContestOrganizerRequired, WithSubmitList, WithBreadcrumbs, TemplateView
+    ContestOrganizerRequired,
+    WithSubmitList,
+    WithBreadcrumbs,
+    TemplateView,
 ):
     template_name = "org/grading/overview.html"
 
-    @cached_property
-    def problem(self):
-        return get_object_or_404(
-            Problem, id=self.kwargs["problem_id"], problem_set__contest=self.contest
-        )
-
     def get_context_data(self, **kwargs):
         ctx = super().get_context_data(**kwargs)
         ctx["problem"] = self.problem
@@ -99,7 +92,10 @@ def get_context_data(self, **kwargs):
                 "default",
                 "mdi:human-queue",
                 "Hromadné opravovanie",
-                reverse("org:bulk_grading", args=[self.problem.id]),
+                reverse(
+                    "org:bulk_grading",
+                    args=[self.problem_set.slug, self.problem.number],
+                ),
             )
         ]
         return ctx
@@ -187,12 +183,6 @@ class BulkGradingView(ContestOrganizerRequired, WithSubmitList, GenericFormView)
     form_header_template = "org/grading/_bulk_header.html"
     form_multipart = True
 
-    @cached_property
-    def problem(self):
-        return get_object_or_404(
-            Problem, id=self.kwargs["problem_id"], problem_set__contest=self.contest
-        )
-
     def form_valid(self, form):
         enrollments = self.rule_engine.get_enrollments().select_related("user")
 
@@ -262,12 +252,17 @@ def get_form_links(self):
                 "default",
                 "mdi:download",
                 "Stiahnuť ZIP na opravovanie",
-                reverse("org:bulk_grading_download", args=[self.kwargs["problem_id"]]),
+                reverse(
+                    "org:bulk_grading_download",
+                    args=[self.problem_set.slug, self.problem.number],
+                ),
             )
         ]
 
     def get_success_url(self):
-        return reverse("org:grading_overview", args=[self.kwargs["problem_id"]])
+        return reverse(
+            "org:grading_overview", args=[self.problem_set.slug, self.problem.number]
+        )
 
     def get_breadcrumbs(self):
         return [
@@ -281,18 +276,18 @@ def get_breadcrumbs(self):
                 ),
             ),
             (self.problem, ""),
-            ("Opravovanie", reverse("org:grading_overview", args=[self.problem.id])),
+            (
+                "Opravovanie",
+                reverse(
+                    "org:grading_overview",
+                    args=[self.problem_set.slug, self.problem.number],
+                ),
+            ),
             ("Hromadné opravovanie", ""),
         ]
 
 
 class BulkGradingDownloadView(ContestOrganizerRequired, WithSubmitList, View):
-    @cached_property
-    def problem(self):
-        return get_object_or_404(
-            Problem, id=self.kwargs["problem_id"], problem_set__contest=self.contest
-        )
-
     def get(self, request, *args, **kwargs):
         enrollments = self.rule_engine.get_enrollments().select_related("user")
         enrollments_by_id = {enrollment.id: enrollment for enrollment in enrollments}