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

Добавлены task_count для уроков и avatar_url для модулей

Author: Toksi86

courses/serializers.py

@@ -102,6 +102,7 @@ class CourseLessonStructureSerializer(serializers.Serializer):
     module_id = serializers.IntegerField()
     title = serializers.CharField()
     order = serializers.IntegerField(min_value=1)
+    task_count = serializers.IntegerField(min_value=0)
     status = serializers.ChoiceField(choices=CourseLessonContentStatus.choices)
     is_available = serializers.BooleanField()
     progress_status = serializers.ChoiceField(choices=ProgressStatus.choices)
@@ -115,6 +116,7 @@ class CourseModuleStructureSerializer(serializers.Serializer):
     course_id = serializers.IntegerField()
     title = serializers.CharField()
     order = serializers.IntegerField(min_value=1)
+    avatar_url = serializers.URLField(allow_null=True)
     start_date = serializers.DateField()
     status = serializers.ChoiceField(choices=CourseModuleContentStatus.choices)
     is_available = serializers.BooleanField()

courses/services/querysets.py

@@ -1,10 +1,11 @@
-from django.db.models import Prefetch
+from django.db.models import Count, Prefetch, Q
 
 from courses.models import (
     Course,
     CourseContentStatus,
     CourseLesson,
     CourseLessonContentStatus,
+    CourseTaskContentStatus,
 )
 
 
@@ -17,5 +18,12 @@ def published_lessons_prefetch():
         "lessons",
         queryset=CourseLesson.objects.filter(
             status=CourseLessonContentStatus.PUBLISHED
-        ).order_by("order", "id"),
+        )
+        .annotate(
+            task_count=Count(
+                "tasks",
+                filter=Q(tasks__status=CourseTaskContentStatus.PUBLISHED),
+            )
+        )
+        .order_by("order", "id"),
     )

courses/views.py

@@ -156,6 +156,7 @@ def get(self, request, pk: int):
                     queryset=CourseModule.objects.filter(
                         status=CourseModuleContentStatus.PUBLISHED
                     )
+                    .select_related("avatar_file")
                     .order_by("order", "id")
                     .prefetch_related(published_lessons_prefetch()),
                 ),
@@ -222,6 +223,7 @@ def get(self, request, pk: int):
                         "module_id": module.id,
                         "title": lesson.title,
                         "order": lesson.order,
+                        "task_count": lesson.task_count,
                         "status": lesson.status,
                         "is_available": lesson_available,
                         "progress_status": lesson_status,
@@ -239,6 +241,7 @@ def get(self, request, pk: int):
                     "course_id": course.id,
                     "title": module.title,
                     "order": module.order,
+                    "avatar_url": module.avatar_file_id,
                     "start_date": module.start_date,
                     "status": module.status,
                     "is_available": module_available,