fix: fixed admin bug and added 12rojgpouehgsrfojn

services/backend/apps/task/models.py

@@ -6,7 +6,7 @@ from tinymce.models import HTMLField
 
 from apps.competition.models import Competition
 from apps.core.models import BaseModel
-from apps.review.models import Review, ReviewStatusChoices
+from apps.review.models import Review, ReviewStatusChoices, Reviewer
 from apps.user.models import User
 
 
@@ -50,6 +50,9 @@ class CompetitionTask(BaseModel):
         default="stdout",
     )
 
+    # only when "review" type
+    reviewers = models.ManyToManyField(Reviewer, blank=True)
+
     def __str__(self):
         return self.title
 
@@ -93,10 +96,8 @@ class CompetitionTaskSubmission(BaseModel):
     def submission_stdout_upload_to(instance, filename) -> str:
         return f"/submissions/{instance.id}/stdout"
 
-    user = models.ForeignKey(User, on_delete=models.CASCADE,
-                             verbose_name="пользователь")
-    task = models.ForeignKey(CompetitionTask, on_delete=models.CASCADE,
-                             verbose_name="задание")
+    user = models.ForeignKey(User, on_delete=models.CASCADE)
+    task = models.ForeignKey(CompetitionTask, on_delete=models.CASCADE)
 
     status = models.CharField(
         choices=StatusChoices.choices,
@@ -106,38 +107,24 @@ class CompetitionTaskSubmission(BaseModel):
     )
 
     # code or text or file
-    content = models.FileField(upload_to=submission_content_upload_to,
-                               verbose_name="код/файл посылки")
+    content = models.FileField(upload_to=submission_content_upload_to)
 
     # only if task type is checker
     stdout = models.FileField(
-        upload_to=submission_stdout_upload_to, null=True, blank=True,
-        verbose_name="вывод чекера"
+        upload_to=submission_stdout_upload_to, null=True, blank=True
     )
 
     # depends on task type:
     # - input: {"correct": boolean}
     # - file: {"total_points": integer, "by_criteria": ["criteria_name": integer]}
     # - code: {"correct": boolean}
-    result = models.JSONField(default=None, null=True, blank=True,
-                              verbose_name="результат проверки")
+    result = models.JSONField(default=None, null=True, blank=True)
     # just more readable result representation, maybe will be calcuated somehow more complex depends on criteria
-    earned_points = models.IntegerField(null=True, blank=True,
-                                        verbose_name="получено баллов")
+    earned_points = models.IntegerField(null=True, blank=True)
 
-    checked_at = models.DateTimeField(null=True, blank=True,
-                                      verbose_name="дата и время проверки")
-    plagiarism_checked = models.BooleanField(default=False,
-                                             verbose_name="проверено на плагиат")
-    timestamp = models.DateTimeField(auto_now_add=True,
-                                     verbose_name="дата отправки")
-
-    def __str__(self):
-        return str(self.id)
-
-    class Meta:
-        verbose_name = "посылка"
-        verbose_name_plural = "посылки"
+    checked_at = models.DateTimeField(null=True, blank=True)
+    plagiarism_checked = models.BooleanField(default=False)
+    timestamp = models.DateTimeField(auto_now_add=True)
 
     def send_on_review(self):
         if not self.task.reviewers.exists():
@@ -158,7 +145,7 @@ class CompetitionTaskSubmission(BaseModel):
             .order_by("pending_count")
             .first()
         )
-        Review.objects.create(
+        review = Review.objects.create(
             reviewer=reviewer,
             submission=self,
         )