feat: added review module

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

@@ -1,7 +1,8 @@
-# Generated by Django 5.1.6 on 2025-03-01 10:26
+# Generated by Django 5.1.6 on 2025-03-01 20:35
 
 import apps.task.models
 import django.db.models.deletion
+import tinymce.models
 import uuid
 from django.db import migrations, models
 
@@ -12,7 +13,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('competition', '0001_initial'),
-        ('user', '0001_initial'),
+        ('user', '0002_alter_user_email_alter_user_password_and_more'),
     ]
 
     operations = [
@@ -20,21 +21,35 @@ class Migration(migrations.Migration):
             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(blank=True, null=True, upload_to=apps.task.models.CompetitionTask.answer_file_upload_to)),
-                ('points', models.IntegerField(blank=True, null=True)),
-                ('answer_file_path', models.TextField(blank=True, null=True)),
-                ('criteries', models.JSONField(blank=True, null=True)),
+                ('title', models.CharField(max_length=50, verbose_name='заголовок')),
+                ('description', tinymce.models.HTMLField(max_length=300, verbose_name='описание')),
+                ('max_attempts', models.PositiveSmallIntegerField(blank=True, null=True)),
+                ('type', models.CharField(choices=[('input', 'Ввод правильного ответа'), ('checker', 'Вывод кода'), ('review', 'Ручная')], max_length=8, verbose_name='тип проверки')),
+                ('correct_answer_file', models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTask.answer_file_upload_to, verbose_name='файл с правильным ответом')),
+                ('points', models.IntegerField(blank=True, null=True, verbose_name='баллы за задание')),
+                ('answer_file_path', models.TextField(blank=True, default='stdout', null=True, verbose_name='куда сохранять решения')),
+                ('criteries', models.JSONField(blank=True, null=True, verbose_name='критерии')),
                 ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')),
             ],
+            options={
+                'verbose_name_plural': 'задания',
+            },
+        ),
+        migrations.CreateModel(
+            name='CompetitionTaskAttachment',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('file', models.FileField(upload_to=apps.task.models.CompetitionTaskAttachment.file_upload_at)),
+                ('bind_at', models.FilePathField()),
+                ('public', models.BooleanField(default=False)),
+                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask')),
+            ],
             options={
                 'abstract': False,
             },
         ),
         migrations.CreateModel(
-            name='CompetetionTaskSumbission',
+            name='CompetitionTaskSubmission',
             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)),
@@ -42,9 +57,10 @@ class Migration(migrations.Migration):
                 ('stdout', models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTaskSubmission.submission_stdout_upload_to)),
                 ('result', models.JSONField(blank=True, default=None, null=True)),
                 ('earned_points', models.IntegerField()),
+                ('reviewed_at', models.DateTimeField(blank=True, null=True)),
                 ('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')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user')),
             ],
             options={
                 'abstract': False,

services/backend/apps/task/migrations/0002_alter_competitiontask_options_and_more.py

@@ -1,45 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-01 12:21
-
-import apps.task.models
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('competition', '0002_competition_tasks_alter_competition_participants_and_more'),
-        ('task', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AlterModelOptions(
-            name='competitiontask',
-            options={'verbose_name': 'задание', 'verbose_name_plural': 'задания'},
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='competition',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition', verbose_name='соревнование'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='correct_answer_file',
-            field=models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTask.answer_file_upload_to, verbose_name='правильный ответ'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='criteries',
-            field=models.JSONField(blank=True, null=True, verbose_name='критерии проверки'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='points',
-            field=models.IntegerField(blank=True, null=True, verbose_name='баллы за задание'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='type',
-            field=models.CharField(choices=[('input', 'Input'), ('checker', 'Checker'), ('review', 'Review')], max_length=8, verbose_name='тип задания'),
-        ),
-    ]

services/backend/apps/task/migrations/0002_competetiontasksumbission_reviewers.py

@@ -1,19 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-01 12:54
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('review', '0001_initial'),
-        ('task', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='competetiontasksumbission',
-            name='reviewers',
-            field=models.ManyToManyField(blank=True, related_name='reviewers', to='review.reviewer'),
-        ),
-    ]

services/backend/apps/task/migrations/0003_competitiontask_max_attemps_and_more.py

@@ -1,51 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-01 13:49
-
-import apps.task.models
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('competition', '0003_remove_competition_tasks'),
-        ('task', '0002_alter_competitiontask_options_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='competitiontask',
-            name='max_attemps',
-            field=models.PositiveSmallIntegerField(default=0),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='answer_file_path',
-            field=models.TextField(blank=True, default='stdout', null=True, verbose_name='куда сохранять решения'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='competition',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='correct_answer_file',
-            field=models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTask.answer_file_upload_to, verbose_name='файл с правильным ответом'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='criteries',
-            field=models.JSONField(blank=True, null=True, verbose_name='критерии'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='title',
-            field=models.CharField(max_length=50, verbose_name='заголовок'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='type',
-            field=models.CharField(choices=[('input', 'Ввод правильного ответа'), ('checker', 'Вывод кода'), ('review', 'Ручная')], max_length=8, verbose_name='тип проверки'),
-        ),
-    ]

services/backend/apps/task/migrations/0004_merge_20250301_1739.py

@@ -1,14 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-01 14:39
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('task', '0002_competetiontasksumbission_reviewers'),
-        ('task', '0003_competitiontask_max_attemps_and_more'),
-    ]
-
-    operations = [
-    ]

services/backend/apps/task/migrations/0005_alter_competitiontask_description_and_more.py

@@ -1,48 +0,0 @@
-# Generated by Django 5.1.6 on 2025-03-01 14:47
-
-import apps.task.models
-import django.db.models.deletion
-import tinymce.models
-import uuid
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('task', '0004_merge_20250301_1739'),
-        ('user', '0002_alter_user_email_alter_user_password_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='description',
-            field=tinymce.models.HTMLField(max_length=300, verbose_name='описание'),
-        ),
-        migrations.AlterField(
-            model_name='competitiontask',
-            name='max_attemps',
-            field=models.PositiveSmallIntegerField(),
-        ),
-        migrations.CreateModel(
-            name='CompetitionTaskSubmission',
-            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.CompetitionTaskSubmission.submission_content_upload_to)),
-                ('stdout', models.FileField(blank=True, null=True, upload_to=apps.task.models.CompetitionTaskSubmission.submission_stdout_upload_to)),
-                ('result', models.JSONField(blank=True, default=None, null=True)),
-                ('earned_points', models.IntegerField()),
-                ('timestamp', models.DateTimeField(auto_now_add=True)),
-                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask')),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='user.user')),
-            ],
-            options={
-                'abstract': False,
-            },
-        ),
-        migrations.DeleteModel(
-            name='CompetetionTaskSumbission',
-        ),
-    ]

services/backend/apps/task/models.py

@@ -21,7 +21,7 @@ class CompetitionTask(BaseModel):
     competition = models.ForeignKey(Competition, on_delete=models.CASCADE)
     title = models.CharField(verbose_name="заголовок", max_length=50)
     description = HTMLField(verbose_name="описание", max_length=300)
-    max_attemps = models.PositiveSmallIntegerField()
+    max_attempts = models.PositiveSmallIntegerField(null=True, blank=True)
     type = models.CharField(
         choices=CompetitionTaskType, max_length=8, verbose_name="тип проверки"
     )
@@ -110,4 +110,5 @@ class CompetitionTaskSubmission(BaseModel):
     # just more readable result representation, maybe will be calcuated somehow more complex depends on criteria
     earned_points = models.IntegerField()
 
+    reviewed_at = models.DateTimeField(null=True, blank=True)
     timestamp = models.DateTimeField(auto_now_add=True)