Добавлены поля is_done в сериализатор UserTrajectorySerializer при отображении skills

Author: Toksi86

apps/courses/serializers.py

@@ -19,7 +19,9 @@ class TaskSerializer(serializers.Serializer):
     skill_name = serializers.CharField(allow_null=True)
     skill_preview = serializers.CharField(allow_null=True)
     skill_point_logo = serializers.CharField(allow_null=True)
-    count = serializers.IntegerField(help_text="количество вопросов и информационных слайдов у задания")
+    count = serializers.IntegerField(
+        help_text="количество вопросов и информационных слайдов у задания"
+    )
     free_access = serializers.BooleanField(allow_null=True)
     step_data = StepSerializer(many=True)
 
@@ -99,7 +101,9 @@ class Meta:
         dataclass = PopupSerializerData
 
 
-IntegerListSerializer = serializers.ListSerializer(child=serializers.IntegerField(), allow_empty=False)
+IntegerListSerializer = serializers.ListSerializer(
+    child=serializers.IntegerField(), allow_empty=False
+)
 
 
 class SkillDetailsSerializer(serializers.ModelSerializer):

apps/trajectories/serializers.py

@@ -177,17 +177,30 @@ def get_skills_breakdown(self, obj):
     def get_available_skills(self, obj):
         breakdown = self.get_skills_breakdown(obj)
         return [
-            {**SkillDetailsSerializer(item["skill"]).data, "overdue": item["overdue"]}
+            {
+                **SkillDetailsSerializer(item["skill"]).data,
+                "overdue": item["overdue"],
+                "is_done": False,
+            }
             for item in breakdown["available_skills"]
         ]
 
     def get_unavailable_skills(self, obj):
         breakdown = self.get_skills_breakdown(obj)
-        return SkillDetailsSerializer(breakdown["unavailable_skills"], many=True).data
+        return [
+            {
+                **SkillDetailsSerializer(skill).data,
+                "is_done": False,
+            }
+            for skill in breakdown["unavailable_skills"]
+        ]
 
     def get_completed_skills(self, obj):
         breakdown = self.get_skills_breakdown(obj)
-        return SkillDetailsSerializer(breakdown["completed_skills"], many=True).data
+        return [
+            {**SkillDetailsSerializer(skill).data, "is_done": True}
+            for skill in breakdown["completed_skills"]
+        ]
 
     def get_end_date(self, obj):
         months_count = obj.trajectory.months.count()