Merge pull request #610 from PROCOLLAB-github/feature/program-courses

Добавлены answer_title для заданий и module_order в lesson detail API

Author: Toksi86

courses/admin_config/content.py

@@ -195,7 +195,15 @@ class CourseTaskAdmin(UserFileUploadAdminMixin, admin.ModelAdmin):
     fieldsets = (
         (
             None,
-            {"fields": ("lesson", "title", "status", "task_kind", "order")},
+            {
+                "fields": (
+                    "lesson",
+                    "title",
+                    "status",
+                    "task_kind",
+                    "order",
+                )
+            },
         ),
         (
             "Типы задания",
@@ -213,6 +221,7 @@ class CourseTaskAdmin(UserFileUploadAdminMixin, admin.ModelAdmin):
             {
                 "fields": (
                     "body_text",
+                    "answer_title",
                     "video_url",
                     "image_file",
                     "image_upload",

courses/api/serializers/common.py

@@ -27,6 +27,7 @@ class LessonTaskSerializer(serializers.Serializer):
     id = serializers.IntegerField()
     order = serializers.IntegerField(min_value=1)
     title = serializers.CharField()
+    answer_title = serializers.CharField(allow_blank=True)
     status = serializers.ChoiceField(choices=CourseTaskContentStatus.choices)
     task_kind = serializers.ChoiceField(choices=CourseTaskKind.choices)
     check_type = serializers.ChoiceField(

courses/api/serializers/lesson.py

@@ -8,6 +8,7 @@
 class LessonDetailSerializer(serializers.Serializer):
     id = serializers.IntegerField()
     module_id = serializers.IntegerField()
+    module_order = serializers.IntegerField(min_value=1)
     course_id = serializers.IntegerField()
     title = serializers.CharField()
     progress_status = serializers.ChoiceField(choices=ProgressStatus.choices)

courses/migrations/0007_coursetask_answer_title.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.11 on 2026-03-13 08:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('courses', '0006_usercourseprogress_userlessonprogress_and_more'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='coursetask',
+            name='answer_title',
+            field=models.CharField(blank=True, default='', max_length=255, verbose_name='Заголовок блока ответа'),
+        ),
+    ]

courses/models/content.py

@@ -162,6 +162,12 @@ class CourseTask(models.Model):
         default="",
         verbose_name="Текст",
     )
+    answer_title = models.CharField(
+        max_length=255,
+        blank=True,
+        default="",
+        verbose_name="Заголовок блока ответа",
+    )
     status = models.CharField(
         max_length=16,
         choices=CourseTaskContentStatus.choices,

courses/queries/lesson_detail.py

@@ -81,6 +81,7 @@ def build_lesson_detail_payload(user, pk: int) -> dict:
                 "id": task.id,
                 "order": task.order,
                 "title": task.title,
+                "answer_title": task.answer_title,
                 "status": task.status,
                 "task_kind": task.task_kind,
                 "check_type": task.check_type,
@@ -100,6 +101,7 @@ def build_lesson_detail_payload(user, pk: int) -> dict:
     return {
         "id": lesson.id,
         "module_id": lesson.module_id,
+        "module_order": lesson.module.order,
         "course_id": lesson.module.course_id,
         "title": lesson.title,
         "progress_status": snapshot.status,

courses/tests/test_api_extended.py

@@ -184,6 +184,10 @@ def test_files_and_text_and_files_flow_validates_payload_and_completes_course(se
             title="Explain risks",
             order=2,
         )
+        files_task.answer_title = "Загрузите файл с расчётами"
+        files_task.save(update_fields=["answer_title"])
+        text_and_files_task.answer_title = "Добавьте комментарий и приложите материалы"
+        text_and_files_task.save(update_fields=["answer_title"])
 
         invalid_file_response = self.client.post(
             f"/courses/tasks/{files_task.id}/answer/",
@@ -208,12 +212,22 @@ def test_files_and_text_and_files_flow_validates_payload_and_completes_course(se
             },
             format="json",
         )
+        lesson_detail = self.client.get(f"/courses/lessons/{lesson.id}/").json()
         course_detail = self.client.get(f"/courses/{course.id}/").json()
 
         self.assertEqual(invalid_file_response.status_code, 400)
         self.assertEqual(files_response.status_code, 200)
         self.assertTrue(files_response.json()["can_continue"])
         self.assertEqual(invalid_text_and_files_response.status_code, 400)
         self.assertEqual(valid_text_and_files_response.status_code, 200)
+        self.assertEqual(lesson_detail["module_order"], 1)
+        self.assertEqual(
+            lesson_detail["tasks"][0]["answer_title"],
+            "Загрузите файл с расчётами",
+        )
+        self.assertEqual(
+            lesson_detail["tasks"][1]["answer_title"],
+            "Добавьте комментарий и приложите материалы",
+        )
         self.assertEqual(course_detail["progress_status"], "completed")
         self.assertEqual(course_detail["percent"], 100)