From 74607111e8b102b73c98fa231b4e8777b4fdb705 Mon Sep 17 00:00:00 2001
From: MMcLovin <gabriel@LAPTOP-P2KJ6ET1>
Date: Fri, 24 Nov 2023 13:37:58 -0300
Subject: [PATCH 01/14] fix: removed FINISHED from is_accessible conditions

---
 apps/tasks/models.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/apps/tasks/models.py b/apps/tasks/models.py
index 3443d00..f5e608c 100644
--- a/apps/tasks/models.py
+++ b/apps/tasks/models.py
@@ -25,7 +25,4 @@ def __str__(self) -> str:
 
     @property
     def is_accessible(self) -> bool:
-        return self.contest.status in (
-            ContestStatus.RUNNING,
-            ContestStatus.FINISHED,
-        )
+        return self.contest.status in (ContestStatus.RUNNING,)

From 07d6e7c57729a32d838c4e5ba694effc49e9dc51 Mon Sep 17 00:00:00 2001
From: MMcLovin <122990047+MMcLovin@users.noreply.github.com>
Date: Mon, 27 Nov 2023 12:48:51 -0300
Subject: [PATCH 02/14] Revert "fix: removed FINISHED from is_accessible
 conditions"

This reverts commit 74607111e8b102b73c98fa231b4e8777b4fdb705.
---
 apps/tasks/models.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/apps/tasks/models.py b/apps/tasks/models.py
index f5e608c..3443d00 100644
--- a/apps/tasks/models.py
+++ b/apps/tasks/models.py
@@ -25,4 +25,7 @@ def __str__(self) -> str:
 
     @property
     def is_accessible(self) -> bool:
-        return self.contest.status in (ContestStatus.RUNNING,)
+        return self.contest.status in (
+            ContestStatus.RUNNING,
+            ContestStatus.FINISHED,
+        )

From bb5cca41975924ba240268def7c7577b99f4da7c Mon Sep 17 00:00:00 2001
From: HladczukLe <leticia.cassia.hr@gmail.com>
Date: Sun, 26 Nov 2023 17:26:04 -0300
Subject: [PATCH 03/14] feat: add others users page

---
 apps/users/models.py         |  2 ++
 apps/users/views.py          |  9 ++++++++-
 templates/base.html          |  6 +++---
 templates/users/profile.html | 23 +++++++++++++----------
 4 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/apps/users/models.py b/apps/users/models.py
index 542ad76..2de4491 100644
--- a/apps/users/models.py
+++ b/apps/users/models.py
@@ -19,6 +19,8 @@ class User(AbstractBaseUser, PermissionsMixin, TimestampedModel):
 
     email = EmailField(db_index=True, max_length=256, unique=True)
     username = CharField(db_index=True, max_length=128, unique=True)
+    score = 0
+    contest = 0
 
     # When a user no longer wishes to use our platform, they may try to
     # delete there account. That's a problem for us because the data we
diff --git a/apps/users/views.py b/apps/users/views.py
index abadc59..fa23b21 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -33,4 +33,11 @@ class ProfileView(View):
 
     def get(self, request: HttpRequest, user_username: str) -> HttpResponse:
         user = get_object_or_404(User, username=user_username)
-        return render(request, self.template_name, {"user": user})
+
+        is_own_profile = user == request.user
+
+        return render(
+            request,
+            self.template_name,
+            {"user": user, "is_own_profile": is_own_profile},
+        )
diff --git a/templates/base.html b/templates/base.html
index 506bc82..ebbd635 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -71,7 +71,7 @@
               </a>
             </li>
           </ul>
-          {% if user.is_authenticated %}
+          {% if request.user.is_authenticated %}
             <div class="dropdown">
               <a
                 class="dropdown-toggle nav-link text-white"
@@ -80,10 +80,10 @@
                 data-bs-toggle="dropdown"
                 aria-expanded="false"
               >
-                {{ user.username }}
+                {{ request.user.username }}
               </a>
               <ul class="dropdown-menu">
-                {% if user.is_staff %}
+                {% if request.user.is_staff %}
                   <li>
                     <a href="{% url 'admin:index' %}" class="dropdown-item">
                       Admin
diff --git a/templates/users/profile.html b/templates/users/profile.html
index 8d407d2..5f0a8b0 100644
--- a/templates/users/profile.html
+++ b/templates/users/profile.html
@@ -1,12 +1,15 @@
-{% extends "base.html" %}
+    {% extends "base.html" %}
 
-{% block title %}User{% endblock title %}
+    {% block title %}User{% endblock title %}
 
-{% block content %}
-    <div class="user-profile">
-        <h2>{{user.username}}</h2>
-        <p>Email: {{ user.email }}</p>
-        <p>Score: </p>
-        <p>Contests: </p>
-    </div>
-{% endblock content %}
+    {% block content %}
+        <div class="user-profile">
+            <h2>{{ user.username }}</h2>
+
+            {% if is_own_profile %}
+                <p>Email: {{ user.email }}</p>
+            {% endif %}
+                <p>Score: {{ user.score }}</p>
+                <p>Contests: {{ user.contest }}</p>
+        </div>
+    {% endblock content %}

From 5d4672095e89372f36a787af48051246fa6e9b76 Mon Sep 17 00:00:00 2001
From: LuizaMaluf <luizamaluf03@gmail.com>
Date: Thu, 23 Nov 2023 21:02:39 -0300
Subject: [PATCH 04/14] feat(submission_admin_page): admin page

---
 apps/submissions/admin.py | 40 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 apps/submissions/admin.py

diff --git a/apps/submissions/admin.py b/apps/submissions/admin.py
new file mode 100644
index 0000000..c0a4ca5
--- /dev/null
+++ b/apps/submissions/admin.py
@@ -0,0 +1,40 @@
+from typing import TYPE_CHECKING
+
+from django.contrib.admin import ModelAdmin, register
+from django.forms import CharField, ModelForm, Textarea
+from django.utils.translation import gettext_lazy as _
+
+from apps.submissions.models import Submission
+
+if TYPE_CHECKING:
+    SubmissionAdminBase = ModelAdmin[Submission]
+    SubmissionModelFormBase = ModelForm[Submission]
+else:
+    SubmissionAdminBase = ModelAdmin
+    SubmissionModelFormBase = ModelForm
+
+
+class SubmissionModelForm(SubmissionModelFormBase):
+    submission_data = CharField(
+        widget=Textarea(attrs={"rows": 10, "cols": 80})
+    )
+
+    class Meta:
+        model = Submission
+        fields = "__all__"
+
+
+@register(Submission)
+class SubmissionAdmin(SubmissionAdminBase):
+    form = SubmissionModelForm
+
+    list_display = ("author", "task", "status", "created_at")
+    list_filter = ("status", "task")
+    search_fields = ("author__username", "task__title")
+
+    fieldsets = [
+        (
+            _("Submission Details"),
+            {"fields": ("author", "task", "code", "status", "created_at")},
+        )
+    ]

From e8e152a546458ac59db4c1be591fbdf57ea64d0a Mon Sep 17 00:00:00 2001
From: LuizaMaluf <luizamaluf03@gmail.com>
Date: Thu, 23 Nov 2023 21:47:53 -0300
Subject: [PATCH 05/14] feat(submission_admin_page): tests

---
 apps/submissions/admin.py |  6 +++---
 apps/submissions/tests.py | 35 +++++++++++++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 3 deletions(-)

diff --git a/apps/submissions/admin.py b/apps/submissions/admin.py
index c0a4ca5..d8fb940 100644
--- a/apps/submissions/admin.py
+++ b/apps/submissions/admin.py
@@ -28,13 +28,13 @@ class Meta:
 class SubmissionAdmin(SubmissionAdminBase):
     form = SubmissionModelForm
 
-    list_display = ("author", "task", "status", "created_at")
-    list_filter = ("status", "task")
+    list_display = ("author", "task", "created_at")
+    list_filter = ("task",)
     search_fields = ("author__username", "task__title")
 
     fieldsets = [
         (
             _("Submission Details"),
-            {"fields": ("author", "task", "code", "status", "created_at")},
+            {"fields": ("author", "task", "code", "created_at")},
         )
     ]
diff --git a/apps/submissions/tests.py b/apps/submissions/tests.py
index c17c6ec..0eb3bb5 100644
--- a/apps/submissions/tests.py
+++ b/apps/submissions/tests.py
@@ -1,10 +1,12 @@
 from datetime import timedelta
 
+from django.contrib.admin.sites import AdminSite
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.utils import timezone
 
 from apps.contests.models import Contest
+from apps.submissions.admin import SubmissionAdmin
 from apps.submissions.models import Submission
 from apps.tasks.models import Task
 from apps.users.models import User
@@ -71,3 +73,36 @@ def test_submission_code_min_length_validator(self) -> None:
             submission.full_clean()
 
         self.assertEqual(context.exception.messages, expected)
+
+
+class SubmissionAdminTest(TestCase):
+    def setUp(self) -> None:
+        self.site = AdminSite()
+        self.submission_admin = SubmissionAdmin(Submission, self.site)
+
+    def test_list_display(self) -> None:
+        expected_list_display = ("author", "task", "created_at")
+        self.assertEqual(
+            self.submission_admin.list_display, expected_list_display
+        )
+
+    def test_list_filter(self) -> None:
+        expected_list_filter = ("task",)
+        self.assertEqual(
+            self.submission_admin.list_filter, expected_list_filter
+        )
+
+    def test_search_field(self) -> None:
+        expected_search_fields = ("author__username", "task__title")
+        self.assertEqual(
+            self.submission_admin.search_fields, expected_search_fields
+        )
+
+    def test_fieldsets(self) -> None:
+        expected_fieldsets = [
+            (
+                ("Submission Details"),
+                {"fields": ("author", "task", "code", "created_at")},
+            )
+        ]
+        self.assertEqual(self.submission_admin.fieldsets, expected_fieldsets)

From 581de807270d96e0233ea1fcdab7e24e8171d91d Mon Sep 17 00:00:00 2001
From: LuizaMaluf <luizamaluf03@gmail.com>
Date: Fri, 24 Nov 2023 14:42:44 -0300
Subject: [PATCH 06/14] feat(submission_admin_page): fixing submission admin

---
 apps/submissions/admin.py | 2 +-
 apps/submissions/tests.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/submissions/admin.py b/apps/submissions/admin.py
index d8fb940..ab08bf5 100644
--- a/apps/submissions/admin.py
+++ b/apps/submissions/admin.py
@@ -35,6 +35,6 @@ class SubmissionAdmin(SubmissionAdminBase):
     fieldsets = [
         (
             _("Submission Details"),
-            {"fields": ("author", "task", "code", "created_at")},
+            {"fields": ("author", "task", "code")},
         )
     ]
diff --git a/apps/submissions/tests.py b/apps/submissions/tests.py
index 0eb3bb5..6359131 100644
--- a/apps/submissions/tests.py
+++ b/apps/submissions/tests.py
@@ -102,7 +102,7 @@ def test_fieldsets(self) -> None:
         expected_fieldsets = [
             (
                 ("Submission Details"),
-                {"fields": ("author", "task", "code", "created_at")},
+                {"fields": ("author", "task", "code")},
             )
         ]
         self.assertEqual(self.submission_admin.fieldsets, expected_fieldsets)

From b7d95fc40b8a966a420dbff2cd4e688fc55db8e9 Mon Sep 17 00:00:00 2001
From: LuizaMaluf <luizamaluf03@gmail.com>
Date: Fri, 24 Nov 2023 14:44:14 -0300
Subject: [PATCH 07/14] feat(submission_admin_page): fixing submission admin

---
 apps/submissions/admin.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/submissions/admin.py b/apps/submissions/admin.py
index ab08bf5..c5f1e55 100644
--- a/apps/submissions/admin.py
+++ b/apps/submissions/admin.py
@@ -28,7 +28,7 @@ class Meta:
 class SubmissionAdmin(SubmissionAdminBase):
     form = SubmissionModelForm
 
-    list_display = ("author", "task", "created_at")
+    list_display = ("author", "task")
     list_filter = ("task",)
     search_fields = ("author__username", "task__title")
 

From 7a7ac1578d0e2417acd6b464a23903509048b87d Mon Sep 17 00:00:00 2001
From: LuizaMaluf <luizamaluf03@gmail.com>
Date: Fri, 24 Nov 2023 14:46:02 -0300
Subject: [PATCH 08/14] feat(submission_admin_page): fixing tests

---
 apps/submissions/tests.py | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/apps/submissions/tests.py b/apps/submissions/tests.py
index 6359131..1757544 100644
--- a/apps/submissions/tests.py
+++ b/apps/submissions/tests.py
@@ -81,22 +81,16 @@ def setUp(self) -> None:
         self.submission_admin = SubmissionAdmin(Submission, self.site)
 
     def test_list_display(self) -> None:
-        expected_list_display = ("author", "task", "created_at")
-        self.assertEqual(
-            self.submission_admin.list_display, expected_list_display
-        )
+        expected = ("author", "task")
+        self.assertEqual(self.submission_admin.list_display, expected)
 
     def test_list_filter(self) -> None:
-        expected_list_filter = ("task",)
-        self.assertEqual(
-            self.submission_admin.list_filter, expected_list_filter
-        )
+        expected = ("task",)
+        self.assertEqual(self.submission_admin.list_filter, expected)
 
     def test_search_field(self) -> None:
-        expected_search_fields = ("author__username", "task__title")
-        self.assertEqual(
-            self.submission_admin.search_fields, expected_search_fields
-        )
+        expected = ("author__username", "task__title")
+        self.assertEqual(self.submission_admin.search_fields, expected)
 
     def test_fieldsets(self) -> None:
         expected_fieldsets = [

From addfd4951d89c8dfede7442be738cc527f057503 Mon Sep 17 00:00:00 2001
From: kyomi <me@kyomi.dev>
Date: Sun, 26 Nov 2023 17:05:22 -0300
Subject: [PATCH 09/14] fix(apps/submissions): fix submission admin page form

---
 apps/submissions/admin.py | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/apps/submissions/admin.py b/apps/submissions/admin.py
index c5f1e55..19d5b95 100644
--- a/apps/submissions/admin.py
+++ b/apps/submissions/admin.py
@@ -15,9 +15,7 @@
 
 
 class SubmissionModelForm(SubmissionModelFormBase):
-    submission_data = CharField(
-        widget=Textarea(attrs={"rows": 10, "cols": 80})
-    )
+    code = CharField(widget=Textarea(attrs={"rows": 20, "cols": 80}))
 
     class Meta:
         model = Submission
@@ -28,13 +26,7 @@ class Meta:
 class SubmissionAdmin(SubmissionAdminBase):
     form = SubmissionModelForm
 
-    list_display = ("author", "task")
-    list_filter = ("task",)
-    search_fields = ("author__username", "task__title")
+    list_display = ("__str__", "author", "task")
+    list_filter = ("author", "task", "created_at")
 
-    fieldsets = [
-        (
-            _("Submission Details"),
-            {"fields": ("author", "task", "code")},
-        )
-    ]
+    fieldsets = [(_("Details"), {"fields": ("author", "task", "code")})]

From 366ee1b1cf2d48b74d99af36837670b49174bd79 Mon Sep 17 00:00:00 2001
From: kyomi <me@kyomi.dev>
Date: Sun, 26 Nov 2023 17:09:20 -0300
Subject: [PATCH 10/14] test(apps/submissions): change tests to reflect last
 changes

---
 apps/submissions/tests.py | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/apps/submissions/tests.py b/apps/submissions/tests.py
index 1757544..4f680f2 100644
--- a/apps/submissions/tests.py
+++ b/apps/submissions/tests.py
@@ -4,6 +4,7 @@
 from django.core.exceptions import ValidationError
 from django.test import TestCase
 from django.utils import timezone
+from django.utils.translation import gettext as _
 
 from apps.contests.models import Contest
 from apps.submissions.admin import SubmissionAdmin
@@ -81,22 +82,13 @@ def setUp(self) -> None:
         self.submission_admin = SubmissionAdmin(Submission, self.site)
 
     def test_list_display(self) -> None:
-        expected = ("author", "task")
+        expected = ("__str__", "author", "task")
         self.assertEqual(self.submission_admin.list_display, expected)
 
     def test_list_filter(self) -> None:
-        expected = ("task",)
+        expected = ("author", "task", "created_at")
         self.assertEqual(self.submission_admin.list_filter, expected)
 
-    def test_search_field(self) -> None:
-        expected = ("author__username", "task__title")
-        self.assertEqual(self.submission_admin.search_fields, expected)
-
     def test_fieldsets(self) -> None:
-        expected_fieldsets = [
-            (
-                ("Submission Details"),
-                {"fields": ("author", "task", "code")},
-            )
-        ]
-        self.assertEqual(self.submission_admin.fieldsets, expected_fieldsets)
+        expected = [(_("Details"), {"fields": ("author", "task", "code")})]
+        self.assertEqual(self.submission_admin.fieldsets, expected)

From 2c80f6d446fa0db6d6b5f20d720781caf9be1835 Mon Sep 17 00:00:00 2001
From: kyomi <me@kyomi.dev>
Date: Sun, 26 Nov 2023 23:33:05 -0300
Subject: [PATCH 11/14] feat(apps/users): improve profile page

---
 apps/users/urls.py           |  4 +---
 apps/users/views.py          | 13 +++----------
 templates/users/profile.html | 37 +++++++++++++++++++++++-------------
 3 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/apps/users/urls.py b/apps/users/urls.py
index 38f99fb..1fc5368 100644
--- a/apps/users/urls.py
+++ b/apps/users/urls.py
@@ -6,7 +6,5 @@
 
 urlpatterns = [
     path("register/", RegisterView.as_view(), name="register"),
-    path(
-        "profile/<str:user_username>/", ProfileView.as_view(), name="profile"
-    ),
+    path("profile/<str:username>/", ProfileView.as_view(), name="profile"),
 ]
diff --git a/apps/users/views.py b/apps/users/views.py
index fa23b21..81410be 100644
--- a/apps/users/views.py
+++ b/apps/users/views.py
@@ -31,13 +31,6 @@ def post(self, request: HttpRequest) -> HttpResponse:
 class ProfileView(View):
     template_name = "users/profile.html"
 
-    def get(self, request: HttpRequest, user_username: str) -> HttpResponse:
-        user = get_object_or_404(User, username=user_username)
-
-        is_own_profile = user == request.user
-
-        return render(
-            request,
-            self.template_name,
-            {"user": user, "is_own_profile": is_own_profile},
-        )
+    def get(self, request: HttpRequest, *, username: str) -> HttpResponse:
+        user = get_object_or_404(User, username=username)
+        return render(request, self.template_name, {"user": user})
diff --git a/templates/users/profile.html b/templates/users/profile.html
index 5f0a8b0..461dec9 100644
--- a/templates/users/profile.html
+++ b/templates/users/profile.html
@@ -1,15 +1,26 @@
-    {% extends "base.html" %}
+{% extends "base.html" %}
 
-    {% block title %}User{% endblock title %}
+{% block title %}{{ user.username }}{% endblock title %}
 
-    {% block content %}
-        <div class="user-profile">
-            <h2>{{ user.username }}</h2>
-
-            {% if is_own_profile %}
-                <p>Email: {{ user.email }}</p>
-            {% endif %}
-                <p>Score: {{ user.score }}</p>
-                <p>Contests: {{ user.contest }}</p>
-        </div>
-    {% endblock content %}
+{% block content %}
+  <div class="card">
+    <div
+      class="card-header"
+      style="display: flex; align-items: center; justify-content: space-between;"
+    >
+      <h2>{{ user.username }}</h2>
+      {% if user.is_staff %}
+        <span class="badge bg-primary float-end mt-1">
+          Staff
+        </span>
+      {% endif %}
+    </div>
+    <div class="card-body">
+      {% if request.user.is_authenticated and request.user == user %}
+        <p>E-mail: {{ user.email }}</p>
+      {% endif %}
+      <p>Score: 0</p>
+      <p>Contests: {{ user.contests|length }}</p>
+    </div>
+  </div>
+{% endblock content %}

From 48da37ce9c7df4aaa986a38a68b62ddd1f8dc077 Mon Sep 17 00:00:00 2001
From: kyomi <me@kyomi.dev>
Date: Sun, 26 Nov 2023 23:34:44 -0300
Subject: [PATCH 12/14] fix(apps/users): remove useless fields from users model

---
 apps/users/models.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/apps/users/models.py b/apps/users/models.py
index 2de4491..542ad76 100644
--- a/apps/users/models.py
+++ b/apps/users/models.py
@@ -19,8 +19,6 @@ class User(AbstractBaseUser, PermissionsMixin, TimestampedModel):
 
     email = EmailField(db_index=True, max_length=256, unique=True)
     username = CharField(db_index=True, max_length=128, unique=True)
-    score = 0
-    contest = 0
 
     # When a user no longer wishes to use our platform, they may try to
     # delete there account. That's a problem for us because the data we

From 8e063bad1d51e5593741183b894e43f318431ead Mon Sep 17 00:00:00 2001
From: kyomi <me@kyomi.dev>
Date: Mon, 27 Nov 2023 14:34:57 -0300
Subject: [PATCH 13/14] fix(apps/tasks): do not allow users to access contest's
 tasks that have not been available yet

---
 apps/tasks/views.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/tasks/views.py b/apps/tasks/views.py
index 2296b9b..9278226 100644
--- a/apps/tasks/views.py
+++ b/apps/tasks/views.py
@@ -32,6 +32,17 @@ def get_context_data(self, **kwargs: Any) -> Dict[str, Any]:
     def get_success_url(self) -> str:
         return reverse("tasks:detail", args=[self.object.id])
 
+    def get(
+        self, request: HttpRequest, *args: Any, **kwargs: Any
+    ) -> HttpResponse:
+        self.object = self.get_object()
+
+        if not self.object.is_accessible:
+            return redirect("home")
+
+        context = self.get_context_data(object=self.object)
+        return self.render_to_response(context)
+
     def post(self, request: HttpRequest, *, pk: int) -> HttpResponse:
         # Unauthenticated users should not be able to submit
         # a submission to a task, so we redirect them to the

From c79c4fba3560ee9efa68d99c0a379b61daa5385c Mon Sep 17 00:00:00 2001
From: kyomi <me@kyomi.dev>
Date: Mon, 27 Nov 2023 15:05:43 -0300
Subject: [PATCH 14/14] test(apps/tasks): add tests related to the task access

test(apps/tasks): add test to access task that is not accessible

test(apps/tasks): add test to access task that is accessible
---
 apps/tasks/tests.py | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/apps/tasks/tests.py b/apps/tasks/tests.py
index ba19a42..b19c659 100644
--- a/apps/tasks/tests.py
+++ b/apps/tasks/tests.py
@@ -179,3 +179,14 @@ def test_send_submission_is_redirecting(self) -> None:
     def test_send_submission_without_authentication(self) -> None:
         response = self.client.post(self.url, data={"code": self.code})
         self.assertEqual(response.status_code, 302)
+
+    def test_access_task_that_is_accessible(self) -> None:
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 200)
+
+    def test_access_task_that_is_not_accessible(self) -> None:
+        self.task.contest.cancelled = True
+        self.task.contest.save()
+
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 302)