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

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

@@ -16,6 +16,7 @@ class TaskOutSchema(ModelSchema):
             "description",
             "type",
             "in_competition_position",
+            "points",
         ]
 
 

services/backend/apps/competition/models.py

@@ -26,10 +26,10 @@ class Competition(BaseModel):
         upload_to=image_url_upload_to,
     )
     end_date = models.DateTimeField(
-        verbose_name="дедлайн участия", null=True, blank=True
+        verbose_name="окончание соревнования", null=True, blank=True
     )
     start_date = models.DateTimeField(
-        verbose_name="дедлайн участия", null=True, blank=True
+        verbose_name="начало соревнования", null=True, blank=True
     )
     type = models.CharField(
         max_length=11,

services/backend/apps/competition/tests.py

@@ -154,8 +154,12 @@ class CompetitionsEndpointTests(TestCase):
             self.get_url("is_participating=true"), **self.valid_headers
         )
 
-        for item in response.json():
+        for i in range(len(response.json())):
-            self.assertEqual(item["type"], "competitive")
+            item = response.json()[i]
+            if (i + 1) % 2 == 0:
+                self.assertEqual(item["type"], "edu")
+            else:
+                self.assertEqual(item["type"], "competitive")
 
     def test_participation_type_values(self):
         response = self.client.get(

services/backend/apps/review/migrations/0001_initial.py

@@ -1,6 +1,5 @@
-# Generated by Django 5.1.6 on 2025-03-02 00:16
+# Generated by Django 5.1.6 on 2025-03-02 05:41
 
-import django.db.models.deletion
 import uuid
 from django.db import migrations, models
 
@@ -10,10 +9,20 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('task', '0001_initial'),
     ]
 
     operations = [
+        migrations.CreateModel(
+            name='Review',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('evaluation', models.JSONField(blank=True, default=list, null=True)),
+                ('state', models.CharField(choices=[('not_checked', 'Not Checked'), ('checking', 'Checking'), ('checked', 'Checked')], default='not_checked', max_length=11)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='Reviewer',
             fields=[
@@ -26,17 +35,4 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
-        migrations.CreateModel(
-            name='Review',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
-                ('evaluation', models.JSONField(blank=True, default=list, null=True)),
-                ('state', models.CharField(choices=[('not_checked', 'Not Checked'), ('checking', 'Checking'), ('checked', 'Checked')], default='not_checked', max_length=11)),
-                ('submission', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='task.competitiontasksubmission')),
-                ('reviewer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.reviewer')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
     ]

services/backend/apps/review/migrations/0002_initial.py

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.6 on 2025-03-02 05:41
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('review', '0001_initial'),
+        ('task', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='review',
+            name='submission',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='reviews', to='task.competitiontasksubmission'),
+        ),
+        migrations.AddField(
+            model_name='review',
+            name='reviewer',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='review.reviewer'),
+        ),
+    ]

services/backend/apps/task/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-03-02 00:16
+# Generated by Django 5.1.6 on 2025-03-02 05:41
 
 import apps.task.models
 import django.db.models.deletion
@@ -12,7 +12,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('competition', '0001_initial'),
+        ('competition', '0002_alter_state_state'),
         ('user', '0001_initial'),
     ]