Merge branch 'feature/review'

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

@@ -1,5 +1,6 @@
-# Generated by Django 5.1.6 on 2025-02-28 21:27
+# Generated by Django 5.1.6 on 2025-03-01 08:47
 
+import django.db.models.deletion
 import uuid
 from django.db import migrations, models
 
@@ -9,6 +10,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
+        ('user', '0001_initial'),
     ]
 
     operations = [
@@ -23,10 +25,23 @@ class Migration(migrations.Migration):
                 ('start_date', models.DateTimeField(blank=True, null=True, verbose_name='Дедлайн участия')),
                 ('type', models.CharField(choices=[('solo', 'Solo')], max_length=10, verbose_name='Тип участия')),
                 ('participation_type', models.CharField(choices=[('edu', 'Edu'), ('competitive', 'Competitive')], max_length=11, verbose_name='Тип соревнования')),
+                ('participants', models.ManyToManyField(related_name='participants', to='user.user')),
             ],
             options={
                 'verbose_name': 'соревнование',
                 'verbose_name_plural': 'соревнования',
             },
         ),
+        migrations.CreateModel(
+            name='State',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('state', models.CharField(choices=[('not_started', 'Not Started'), ('started', 'Started'), ('finished', 'Finished')], max_length=11)),
+                ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
     ]

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

@@ -1,19 +0,0 @@
-# Generated by Django 5.1.6 on 2025-02-28 22:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('competition', '0001_initial'),
-        ('user', '0002_user_status'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='competition',
-            name='participants',
-            field=models.ManyToManyField(related_name='participants', to='user.user'),
-        ),
-    ]

services/backend/apps/competition/migrations/0003_state.py

@@ -1,28 +0,0 @@
-# Generated by Django 5.1.6 on 2025-02-28 23:26
-
-import django.db.models.deletion
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('competition', '0002_competition_participants'),
-        ('user', '0003_alter_user_status'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='State',
-            fields=[
-                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
-                ('state', models.CharField(choices=[('not_started', 'Not Started'), ('started', 'Started'), ('finished', 'Finished')], max_length=11)),
-                ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-    ]

services/backend/apps/review/apps.py

@@ -0,0 +1,6 @@
+from django.apps import AppConfig
+
+
+class CoreConfig(AppConfig):
+    name = "apps.review"
+    label = "review"

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

@@ -0,0 +1,27 @@
+# Generated by Django 5.1.6 on 2025-03-01 08:47
+
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Reviewer',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.CharField(max_length=100)),
+                ('surname', models.CharField(max_length=100)),
+                ('token', models.CharField(max_length=100)),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

services/backend/apps/review/models.py

@@ -0,0 +1,10 @@
+from django.db import models
+
+from apps.core.models import BaseModel
+
+
+class Reviewer(BaseModel):
+    name = models.CharField(max_length=100)
+    surname = models.CharField(max_length=100)
+
+    token = models.CharField(max_length=100)

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

@@ -0,0 +1,51 @@
+# Generated by Django 5.1.6 on 2025-03-01 09:42
+
+import apps.task.models
+import django.db.models.deletion
+import uuid
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('competition', '0001_initial'),
+        ('user', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='CompetitionTask',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('title', models.TextField(max_length=50, verbose_name='заголовок')),
+                ('description', models.TextField(max_length=300, verbose_name='описание')),
+                ('type', models.CharField(choices=[('input', 'Input'), ('checker', 'Checker'), ('review', 'Review')], max_length=8)),
+                ('correct_answer_file', models.FileField(upload_to=apps.task.models.CompetitionTask.answer_file_upload_to)),
+                ('answer_file_path', models.TextField()),
+                ('criteries', models.JSONField(blank=True, null=True)),
+                ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+        migrations.CreateModel(
+            name='CompetetionTaskSumbission',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('status', models.CharField(choices=[('sent', 'Sent'), ('checking', 'Checking'), ('checked', 'Checked')], default='sent', max_length=8)),
+                ('content', models.FileField(upload_to=apps.task.models.CompetetionTaskSumbission.submission_content_upload_to)),
+                ('stdout', models.FileField(upload_to=apps.task.models.CompetetionTaskSumbission.submission_stdout_upload_to)),
+                ('result', models.JSONField(default={})),
+                ('timestamp', models.DateTimeField(auto_now_add=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user')),
+                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
+    ]

services/backend/apps/task/models.py

@@ -1,3 +1,4 @@
+from random import choice
 from uuid import uuid4
 
 from django.db import models
@@ -7,7 +8,6 @@ from apps.competition.models import Competition
 from apps.core.models import BaseModel
 from apps.user.models import User
 
-
 class CompetitionTask(BaseModel):
     class CompetitionTaskType(models.TextChoices):
         INPUT = "input"

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

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.6 on 2025-02-28 20:46
+# Generated by Django 5.1.6 on 2025-03-01 08:47
 
 import uuid
 from django.db import migrations, models
@@ -19,6 +19,7 @@ class Migration(migrations.Migration):
                 ('email', models.EmailField(max_length=254, unique=True, verbose_name='Почта')),
                 ('username', models.SlugField(unique=True, verbose_name='Юзернейм')),
                 ('password', models.TextField(verbose_name='Пароль')),
+                ('status', models.CharField(choices=[('student', 'Student'), ('metodist', 'Metodist')], default='student', max_length=10)),
             ],
             options={
                 'verbose_name': 'пользователь',

services/backend/apps/user/migrations/0002_user_status.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.6 on 2025-02-28 22:40
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('user', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='user',
-            name='status',
-            field=models.CharField(choices=[('student', 'Student'), ('metodist', 'Metodist')], default='student', max_length=10),
-        ),
-    ]

services/backend/apps/user/migrations/0003_alter_user_status.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.6 on 2025-02-28 22:45
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('user', '0002_user_status'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='user',
-            name='status',
-            field=models.CharField(choices=[('student', 'Student'), ('metodist', 'Metodist')], default='student', max_length=10),
-        ),
-    ]