Merge pull request #188 from PROCOLLAB-github/feature/trajectories

Исправлены поля в SkillDetailsSerializer, StudentSerializer, тесты

Author: Toksi86

apps/courses/serializers.py

@@ -106,29 +106,29 @@ class Meta:
 
 
 class SkillDetailsSerializer(serializers.ModelSerializer):
-    skill_name = serializers.CharField(source="name")
-    file = serializers.SerializerMethodField()
+    name = serializers.CharField()
+    file_link = serializers.SerializerMethodField()
     skill_preview = serializers.SerializerMethodField()
     skill_point_logo = serializers.SerializerMethodField()
-    level = serializers.SerializerMethodField()
+    quantity_of_levels = serializers.SerializerMethodField()
 
     class Meta:
         model = Skill
         fields = (
-            "skill_name",
-            "file",
+            "name",
+            "file_link",
             "skill_preview",
             "skill_point_logo",
             "description",
-            "level",
+            "quantity_of_levels",
             "free_access",
         )
 
-    def get_level(self, obj) -> int:
+    def get_quantity_of_levels(self, obj) -> int:
         # Просьба захардкодить на 1 уровень везде.
         return 1
 
-    def get_file(self, obj) -> str | None:
+    def get_file_link(self, obj) -> str | None:
         return obj.file.link if obj.file else None
 
     def get_skill_preview(self, obj) -> str | None:

apps/tests/courses_tests/constants.py

@@ -121,24 +121,24 @@
 
 # Response по /courses/skill-details/1:
 SKILL_DETAILS_RESPONSE_NEW_SUB = {
-    "skill_name": "Навык 1",
-    "file": "http://some.com/",
+    "name": "Навык 1",
+    "file_link": "http://some.com/",
     "skill_preview": "http://some.com/",
     "skill_point_logo": "http://some.com/",
     "description": "Описание",
     "free_access": False,
-    "level": 1
+    "quantity_of_levels": 1
 }
 
 # Response по /courses/skill-details/1:
 SKILL_DETAILS_RESPONSE_FREE = {
-    "skill_name": "Навык 1",
-    "file": "http://some.com/",
+    "name": "Навык 1",
+    "file_link": "http://some.com/",
     "skill_preview": "http://some.com/",
     "skill_point_logo": "http://some.com/",
     "description": "Описание",
     "free_access": True,
-    "level": 1
+    "quantity_of_levels": 1
 }
 
 

apps/trajectories/serializers.py

@@ -182,10 +182,12 @@ def get_end_date(self, obj):
 
 
 class StudentSerializer(serializers.Serializer):
+    id = serializers.IntegerField()
     first_name = serializers.CharField(max_length=100)
     last_name = serializers.CharField(max_length=100)
     age = serializers.SerializerMethodField()
     avatar = serializers.SerializerMethodField()
+    specialization = serializers.CharField()
 
     def get_age(self, obj):
         if obj.age:
@@ -206,10 +208,19 @@ class MentorStudentSerializer(serializers.ModelSerializer):
     remaining_days = serializers.SerializerMethodField()
     trajectory = TrajectoryStudentSerializer()
     user_trajectory_id = serializers.IntegerField(source="id")
+    mentor_id = serializers.IntegerField(source="mentor.id", allow_null=True)
 
     class Meta:
         model = UserTrajectory
-        fields = ["student", "initial_meeting", "final_meeting", "remaining_days", "trajectory", "user_trajectory_id"]
+        fields = [
+            "student",
+            "initial_meeting",
+            "final_meeting",
+            "remaining_days",
+            "trajectory",
+            "user_trajectory_id",
+            "mentor_id",
+        ]
 
     def get_initial_meeting(self, obj):
         return obj.meetings.filter(initial_meeting=True).exists()