chore(backend): improvements

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

@@ -34,6 +34,7 @@ class UserSchema(ModelSchema):
         model = User
         fields = ["id", "avatar", "email", "username", "created_at"]
 
+
 class StatSchema(Schema):
     total_attempts: int
     solved_tasks: int

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

@@ -1,11 +1,10 @@
 from datetime import datetime
 from http import HTTPStatus as status
 
-from django.db.models import Count, Q
-from apps.user.models import User
 from django.contrib.auth.hashers import check_password, make_password
+from django.db.models import Count, Q
 from django.shortcuts import get_object_or_404
-from ninja import Router, File
+from ninja import Router
 from ninja.errors import AuthenticationError
 
 from api.v1.auth import BearerAuth
@@ -118,20 +117,21 @@ def get_my_stat(request):
         total_attempts=len(user_submissions), solved_tasks=success_attempts_cnt
     )
 
+
 @router.get(
     "leaderboard",
     auth=None,
     response={
         status.OK: list[UserSchema],
-    }
+    },
 )
 def get_leaderboard(request):
     leaderboard = User.objects.annotate(
         checked_count=Count(
-            'competitiontasksubmission',
+            "competitiontasksubmission",
-            filter=Q(competitiontasksubmission__status='checked')
+            filter=Q(competitiontasksubmission__status="checked"),
         )
-    ).order_by('-checked_count')
+    ).order_by("-checked_count")
 
     top_10 = leaderboard[:10]
     return status.OK, top_10

services/backend/apps/achievement/admin.py

@@ -14,4 +14,5 @@ class AchievementAdmin(admin.ModelAdmin):
         "description",
     )
 
+
 admin.site.register(UserAchievement)

services/backend/apps/achievement/migrations/0003_alter_userachievement_options_and_more.py

@@ -0,0 +1,34 @@
+# Generated by Django 5.2 on 2025-04-07 21:25
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('achievement', '0002_initial'),
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='userachievement',
+            options={'verbose_name': 'выданная ачивка', 'verbose_name_plural': 'выданные ачивки'},
+        ),
+        migrations.AlterField(
+            model_name='userachievement',
+            name='achievement',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='achievement.achievement', verbose_name='ачивка'),
+        ),
+        migrations.AlterField(
+            model_name='userachievement',
+            name='received_at',
+            field=models.DateTimeField(auto_now_add=True, verbose_name='дата получения'),
+        ),
+        migrations.AlterField(
+            model_name='userachievement',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user', verbose_name='пользователь'),
+        ),
+    ]

services/backend/apps/achievement/models.py

@@ -27,10 +27,16 @@ class Achievement(BaseModel):
 
 
 class UserAchievement(BaseModel):
-    achievement = models.ForeignKey(Achievement, verbose_name="ачивка", on_delete=models.CASCADE)
+    achievement = models.ForeignKey(
-    user = models.ForeignKey("user.User", verbose_name="пользователь", on_delete=models.CASCADE)
+        Achievement, verbose_name="ачивка", on_delete=models.CASCADE
+    )
+    user = models.ForeignKey(
+        "user.User", verbose_name="пользователь", on_delete=models.CASCADE
+    )
 
-    received_at = models.DateTimeField(verbose_name="дата получения", auto_now_add=True)
+    received_at = models.DateTimeField(
+        verbose_name="дата получения", auto_now_add=True
+    )
 
     class Meta:
         verbose_name = "выданная ачивка"

services/backend/apps/competition/admin.py

@@ -1,15 +1,14 @@
 from django.contrib import admin
-from django.urls import path, reverse
+from django.db.models import Q, Sum
-from django.http import HttpResponse
-from django.template.response import TemplateResponse
-from django.db.models import Count, Q, Sum
 from django.shortcuts import get_object_or_404
+from django.template.response import TemplateResponse
+from django.urls import path, reverse
 from django.utils.html import format_html
 
-from apps.user.models import User
 from apps.competition.models import Competition, State
 from apps.task.admin import CompetitionTaskInline
-from apps.task.models import CompetitionTaskSubmission, CompetitionTask
+from apps.task.models import CompetitionTask
+from apps.user.models import User
 
 
 @admin.register(Competition)
@@ -34,33 +33,46 @@ class CompetitionAdmin(admin.ModelAdmin):
     def get_urls(self):
         urls = super().get_urls()
         custom_urls = [
-            path('leaderboard/', self.admin_site.admin_view(self.leaderboard_view), name='competition_leaderboard'),
+            path(
-            path('<uuid:competition_id>/leaderboard/', self.admin_site.admin_view(self.competition_leaderboard_view), 
+                "leaderboard/",
-                 name='competition_specific_leaderboard'),
+                self.admin_site.admin_view(self.leaderboard_view),
+                name="competition_leaderboard",
+            ),
+            path(
+                "<uuid:competition_id>/leaderboard/",
+                self.admin_site.admin_view(self.competition_leaderboard_view),
+                name="competition_specific_leaderboard",
+            ),
         ]
         return custom_urls + urls
 
     def view_leaderboard(self, obj):
-        url = reverse('admin:competition_specific_leaderboard', args=[obj.id])
+        url = reverse("admin:competition_specific_leaderboard", args=[obj.id])
         return format_html('<a href="{}">перейти</a>', url)
-    
+
     view_leaderboard.short_description = "Лидерборд"
     view_leaderboard.allow_tags = True
 
     def competition_leaderboard_view(self, request, competition_id):
         competition = get_object_or_404(Competition, id=competition_id)
-        
+
-        competition_tasks = CompetitionTask.objects.filter(competition=competition)
+        competition_tasks = CompetitionTask.objects.filter(
-        
+            competition=competition
-        leaderboard = User.objects.annotate(
+        )
-            total_score=Sum(
+
-                'competitiontasksubmission__earned_points',
+        leaderboard = (
-                filter=Q(
+            User.objects.annotate(
-                    competitiontasksubmission__status='checked',
+                total_score=Sum(
-                    competitiontasksubmission__task__in=competition_tasks
+                    "competitiontasksubmission__earned_points",
+                    filter=Q(
+                        competitiontasksubmission__status="checked",
+                        competitiontasksubmission__task__in=competition_tasks,
+                    ),
                 )
             )
-        ).exclude(total_score__isnull=True).order_by('-total_score')[:20]
+            .exclude(total_score__isnull=True)
+            .order_by("-total_score")[:20]
+        )
 
         context = dict(
             self.admin_site.each_context(request),
@@ -68,22 +80,30 @@ class CompetitionAdmin(admin.ModelAdmin):
             leaderboard=leaderboard,
             competition=competition,
         )
-        return TemplateResponse(request, "admin/competition_leaderboard.html", context)
+        return TemplateResponse(
+            request, "admin/competition_leaderboard.html", context
+        )
 
     def leaderboard_view(self, request):
-        leaderboard = User.objects.annotate(
+        leaderboard = (
-            total_score=Sum(
+            User.objects.annotate(
-                'competitiontasksubmission__earned_points',
+                total_score=Sum(
-                filter=Q(competitiontasksubmission__status='checked')
+                    "competitiontasksubmission__earned_points",
+                    filter=Q(competitiontasksubmission__status="checked"),
+                )
             )
-        ).exclude(total_score__isnull=True).order_by('-total_score')[:20]
+            .exclude(total_score__isnull=True)
+            .order_by("-total_score")[:20]
+        )
 
         context = dict(
             self.admin_site.each_context(request),
             title="Лидерборд соревнования",
             leaderboard=leaderboard,
         )
-        return TemplateResponse(request, "admin/competition_leaderboard.html", context)
+        return TemplateResponse(
+            request, "admin/competition_leaderboard.html", context
+        )
 
 
 admin.site.register(State)

services/backend/apps/competition/apps.py

@@ -7,4 +7,4 @@ class CompetitionsConfig(AppConfig):
     verbose_name = "Соревнование"
 
     def ready(self):
-        import apps.competition.signals
+        pass

services/backend/apps/competition/migrations/0002_alter_state_options_alter_state_changed_at_and_more.py

@@ -0,0 +1,40 @@
+# Generated by Django 5.2 on 2025-04-07 21:25
+
+import datetime
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('competition', '0001_initial'),
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='state',
+            options={'verbose_name': 'участие', 'verbose_name_plural': 'участия'},
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='changed_at',
+            field=models.DateTimeField(default=datetime.datetime.now, verbose_name='изменено'),
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='competition',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition', verbose_name='соревнование'),
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='state',
+            field=models.CharField(choices=[('not_started', 'Not Started'), ('started', 'Started'), ('finished', 'Finished')], default='not_started', max_length=11, verbose_name='статус'),
+        ),
+        migrations.AlterField(
+            model_name='state',
+            name='user',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user', verbose_name='участник'),
+        ),
+    ]

services/backend/apps/competition/models.py

@@ -59,15 +59,21 @@ class State(BaseModel):
         STARTED = "started"
         FINISHED = "finished"
 
-    user = models.ForeignKey(User, verbose_name="участник", on_delete=models.CASCADE)
+    user = models.ForeignKey(
-    competition = models.ForeignKey(Competition, verbose_name="соревнование", on_delete=models.CASCADE)
+        User, verbose_name="участник", on_delete=models.CASCADE
+    )
+    competition = models.ForeignKey(
+        Competition, verbose_name="соревнование", on_delete=models.CASCADE
+    )
     state = models.CharField(
         choices=StateChoices.choices,
         verbose_name="статус",
         max_length=11,
         default=StateChoices.NOT_STARTED.value,
     )
-    changed_at = models.DateTimeField(verbose_name="изменено", default=datetime.now)
+    changed_at = models.DateTimeField(
+        verbose_name="изменено", default=datetime.now
+    )
 
     class Meta:
         verbose_name = "участие"

services/backend/apps/review/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from apps.review.models import Reviewer, Review
+from apps.review.models import Review, Reviewer
 
 
 @admin.register(Reviewer)

services/backend/apps/review/apps.py

@@ -7,4 +7,4 @@ class CoreConfig(AppConfig):
     verbose_name = "Проверка"
 
     def ready(self):
-        import apps.review.signals
+        pass

services/backend/apps/review/migrations/0003_alter_review_evaluation.py

@@ -0,0 +1,18 @@
+# Generated by Django 5.2 on 2025-04-07 21:25
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('review', '0002_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='review',
+            name='evaluation',
+            field=models.JSONField(blank=True, default=list, null=True, verbose_name='оценка'),
+        ),
+    ]

services/backend/apps/review/models.py

@@ -45,7 +45,7 @@ class Review(BaseModel):
     )
 
     def __str__(self):
-        return str(self.id)
+        return f"{str(self.reviewer)} -> {self.submission.task.title} ({self.submission.user.username})"
 
     class Meta:
         verbose_name = "проверка"

services/backend/apps/user/apps.py

@@ -7,4 +7,4 @@ class UsersConfig(AppConfig):
     verbose_name = "контестанты"
 
     def ready(self):
-        import apps.user.signals
+        pass

services/checker/config.py

@@ -8,5 +8,6 @@ BASE_DIR = Path(__file__).resolve().parent
 load_dotenv(BASE_DIR / ".env")
 
 DOCKER_IMAGE = os.getenv(
-    "DOCKER_IMAGE", default="registry.gitlab.com/megazordpobeda/datarush/custom-python:latest"
+    "DOCKER_IMAGE",
+    default="registry.gitlab.com/megazordpobeda/datarush/custom-python:latest",
 )