Merge remote-tracking branch 'origin/master'

# Conflicts:
#	services/backend/apps/task/models.py

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 06:13
 
 import apps.task.models
 import django.db.models.deletion
@@ -25,11 +25,10 @@ class Migration(migrations.Migration):
                 ('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='тип проверки')),
+                ('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='критерии')),
+                ('answer_file_path', models.TextField(blank=True, default='stdout', help_text='Путь до файла в котором ожидается результат. Пример: stdout или ./output.txt', null=True, verbose_name='куда сделать вывод программы участнику')),
                 ('competition', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='competition.competition')),
             ],
             options={
@@ -50,6 +49,20 @@ class Migration(migrations.Migration):
                 'abstract': False,
             },
         ),
+        migrations.CreateModel(
+            name='CompetitionTaskCriteria',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.TextField()),
+                ('slug', models.SlugField()),
+                ('description', models.TextField()),
+                ('max_value', models.PositiveSmallIntegerField()),
+                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='criteries', to='task.competitiontask')),
+            ],
+            options={
+                'abstract': False,
+            },
+        ),
         migrations.CreateModel(
             name='CompetitionTaskSubmission',
             fields=[
@@ -59,7 +72,8 @@ 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(blank=True, null=True)),
-                ('reviewed_at', models.DateTimeField(blank=True, null=True)),
+                ('checked_at', models.DateTimeField(blank=True, null=True)),
+                ('plagiarism_checked', models.BooleanField(default=False)),
                 ('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')),

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

@@ -0,0 +1,40 @@
+# Generated by Django 5.1.6 on 2025-03-02 08:50
+
+import apps.task.models
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('task', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='competitiontask',
+            name='attachments',
+            field=models.ManyToManyField(blank=True, related_name='tasks_attachments', to='task.competitiontaskattachment'),
+        ),
+        migrations.AlterField(
+            model_name='competitiontaskattachment',
+            name='bind_at',
+            field=models.FilePathField(verbose_name='путь сохранения'),
+        ),
+        migrations.AlterField(
+            model_name='competitiontaskattachment',
+            name='file',
+            field=models.FileField(upload_to=apps.task.models.CompetitionTaskAttachment.file_upload_at, verbose_name='файл'),
+        ),
+        migrations.AlterField(
+            model_name='competitiontaskattachment',
+            name='public',
+            field=models.BooleanField(default=False, verbose_name='публичный'),
+        ),
+        migrations.AlterField(
+            model_name='competitiontaskattachment',
+            name='task',
+            field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='task.competitiontask', verbose_name='задание'),
+        ),
+    ]