Merge branch 'master' of gitlab.prodcontest.ru:team-15/project

services/backend/api/v1/review/schemas.py

@@ -26,7 +26,6 @@ class CriteriaOut(Schema):
     name: str
     slug: str
     max_value: int
-    min_value: int
 
 
 class SubmissionOut(ModelSchema):

services/backend/api/v1/user/schemas.py

@@ -23,3 +23,8 @@ class UserSchema(ModelSchema):
     class Meta:
         model = User
         fields = ["id", "email", "username", "created_at", "achievements"]
+
+
+class StatSchema(Schema):
+    total_attempts: int
+    solved_tasks: int

services/backend/api/v1/user/views.py

@@ -11,15 +11,17 @@ from api.v1.schemas import (
     BadRequestError,
     ConflictError,
     ForbiddenError,
-    NotFoundError,
+    NotFoundError, UnauthorizedError,
 )
 from api.v1.user.schemas import (
     LoginSchema,
     RegisterSchema,
     TokenSchema,
     UserSchema,
+    StatSchema
 )
 from apps.user.models import User
+from apps.task.models import CompetitionTaskSubmission, ReviewStatusChoices
 
 router = Router(tags=["user"])
 
@@ -85,3 +87,31 @@ def get_me(request):
 def get_user(request, user_id: str):
     user = get_object_or_404(User, id=user_id)
     return status.OK, user
+
+
+@router.get(
+    "/me/stat",
+    response={
+        status.OK: StatSchema,
+        status.UNAUTHORIZED: UnauthorizedError
+    },
+)
+def get_my_stat(request):
+    user_submissions = CompetitionTaskSubmission.objects.filter(
+        user=request.auth
+    )
+    checked_attempts = user_submissions.filter(status=CompetitionTaskSubmission.StatusChoices.CHECKED).all()
+    success_attempts_cnt = 0
+
+    for attempt in checked_attempts:
+        is_correct = attempt.result.get("correct", None)
+        if is_correct is None:
+            is_correct = attempt.result.get("total_points", 0) > 0
+
+        if is_correct:
+            success_attempts_cnt += 1
+
+    return StatSchema(
+        total_attempts=len(user_submissions),
+        solved_tasks=success_attempts_cnt
+    )

services/backend/apps/competition/tests.py

@@ -35,7 +35,7 @@ class CompetitionEndpointTests(TestCase):
         self.valid_headers = {"HTTP_AUTHORIZATION": f"Bearer {token}"}
 
     def get_url(self, competition_id):
-        return f"/api/v1/competition/{competition_id}"
+        return f"/api/v1/competitions/{competition_id}"
 
     def test_get_competition_success(self):
         response = self.client.get(

services/backend/apps/core/management/commands/generate_data.py

@@ -9,7 +9,7 @@ from django.utils import timezone
 
 from apps.competition.models import Competition, State
 from apps.review.models import Reviewer
-from apps.task.models import CompetitionTask, CompetitionTaskSubmission
+from apps.task.models import CompetitionTask, CompetitionTaskSubmission, CompetitionTaskCriteria
 from apps.user.models import User, UserRole
 
 
@@ -91,6 +91,8 @@ class Command(BaseCommand):
         tasks = []
         task_types = [
             CompetitionTask.CompetitionTaskType.INPUT.value,
+            CompetitionTask.CompetitionTaskType.REVIEW.value,
+            CompetitionTask.CompetitionTaskType.INPUT.value
         ]
         for comp in competitions:
             # Create 3 tasks per competition
@@ -108,6 +110,15 @@ class Command(BaseCommand):
                     submission_reviewers_count=random.randint(2, 10),
                     max_attempts=random.randint(1, 10),
                 )
+                if task_type == CompetitionTask.CompetitionTaskType.REVIEW.value:
+                    for j in range(5):
+                        CompetitionTaskCriteria.objects.create(
+                            task=task,
+                            name=f"Criteria_{j}",
+                            slug=f"criteria_{j}",
+                            description=f"Criteria description {j}",
+                            max_value=random.randint(1, 10),
+                        )
                 tasks.append(task)
                 self.stdout.write(f"Created task: {title} (type: {task_type})")
         self.add_reviewers_to_task(tasks)

services/backend/apps/task/admin.py

@@ -31,7 +31,7 @@ class CompetitionTaskSubmissionAdmin(admin.ModelAdmin):
         "user__username",
         "user__email",
     )
-    filter = ("plagiarism_checked",)
+    list_filter = ("plagiarism_checked", "status",)
     ordering = ["-timestamp"]
 
     def has_add_permission(self, request, obj=None):

services/backend/apps/task/models.py

@@ -94,9 +94,9 @@ class CompetitionTaskAttachment(BaseModel):
 
 class CompetitionTaskSubmission(BaseModel):
     class StatusChoices(models.TextChoices):
-        SENT = "sent"
-        CHECKING = "checking"
-        CHECKED = "checked"
+        SENT = "sent", "Отправлено на проверку"
+        CHECKING = "checking", "Проверка"
+        CHECKED = "checked", "Проверено"
 
     def submission_content_upload_to(instance, filename) -> str:
         return f"submissions/{instance.id}/content/{filename}"