Merge pull request #192 from PROCOLLAB-github/dev

Реализован новый модуль "Траектории"

Author: Toksi86

apps/courses/serializers.py

@@ -84,6 +84,14 @@ class Meta:
         )
 
 
+class SkillNameAndLogoSerializer(serializers.ModelSerializer):
+    file_link = serializers.URLField(source="file.link")
+
+    class Meta:
+        model = Skill
+        fields = ("name", "file_link")
+
+
 class TaskResult(DataclassSerializer):
     class Meta:
         dataclass = TaskResultData
@@ -98,29 +106,30 @@ 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",
+            "id",
+            "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/procollab_skills/settings.py

@@ -72,6 +72,7 @@
     "questions",
     "subscription",
     "webinars",
+    "trajectories",
 ]
 
 MIDDLEWARE = [

apps/procollab_skills/urls.py

@@ -31,6 +31,7 @@
     path("progress/", include("progress.urls")),
     path("subscription/", include("subscription.urls")),
     path("webinars/", include("webinars.urls")),
+    path("trajectories/", include("trajectories.urls")),
 ]
 
 if settings.DEBUG:

apps/progress/views/profile.py

@@ -79,11 +79,7 @@ class UserChooseSkills(generics.UpdateAPIView):
 
     def update(self, request, *args, **kwargs):
         try:
-            skills = (
-                Skill.published
-                .for_user(self.request.user)
-                .filter(id__in=request.data)
-            )
+            skills = Skill.published.for_user(self.request.user).filter(id__in=request.data)
 
             IntermediateUserSkills.objects.bulk_create(
                 [IntermediateUserSkills(user_profile=self.user_profile, skill=skill) for skill in skills]
@@ -153,6 +149,7 @@ def get(self, request, *args, **kwargs) -> Response:
         serialized_data = self.serializer_class(user).data
 
         serialized_data["verification_date"] = self._get_date_verificated()
+        serialized_data["is_mentor"] = user.mentored_trajectories.exists()
 
         return Response(serialized_data, status=status.HTTP_200_OK)
 
@@ -161,37 +158,26 @@ class SyncUserProfile(generics.GenericAPIView):
     """
     API-эндпоинт для синхронизации данных пользователя между сервисами Skills и Procollab.
     """
+
     permission_classes = [permissions.IsAuthenticated]
 
     @extend_schema(
         summary="Синхронизация данных профиля skills с сервисом procollab",
         responses={
-                status.HTTP_200_OK: OpenApiResponse(
-                    description="Данные успешно синхронизированы",
-                    examples={
-                        "application/json": {
-                            "message": "Данные успешно синхронизированы"
-                        }
-                    }
-                ),
-                status.HTTP_400_BAD_REQUEST: OpenApiResponse(
-                    description="Ошибка при получении данных",
-                    examples={
-                        "application/json": {
-                            "error": "Ошибка получения данных от procollab"
-                        }
-                    }
-                ),
-                status.HTTP_401_UNAUTHORIZED: OpenApiResponse(
-                    description="Неавторизованный доступ",
-                    examples={
-                        "application/json": {
-                            "error": "Неавторизованный доступ"
-                        }
-                    }
-                )
-            },
-        tags=["Профиль"]
+            status.HTTP_200_OK: OpenApiResponse(
+                description="Данные успешно синхронизированы",
+                examples={"application/json": {"message": "Данные успешно синхронизированы"}},
+            ),
+            status.HTTP_400_BAD_REQUEST: OpenApiResponse(
+                description="Ошибка при получении данных",
+                examples={"application/json": {"error": "Ошибка получения данных от procollab"}},
+            ),
+            status.HTTP_401_UNAUTHORIZED: OpenApiResponse(
+                description="Неавторизованный доступ",
+                examples={"application/json": {"error": "Неавторизованный доступ"}},
+            ),
+        },
+        tags=["Профиль"],
     )
     def post(self, request: HttpRequest, *args, **kwargs) -> Response:
         """
@@ -217,10 +203,7 @@ def _fetch_procollab_data(self, email: str) -> dict:
             email (str): Email пользователя для поиска в Procollab
         """
         url_name = "dev" if settings.DEBUG else "api"
-        response = requests.get(
-            f"https://{url_name}.procollab.ru/auth/users/clone-data",
-            data={"email": email}
-        )
+        response = requests.get(f"https://{url_name}.procollab.ru/auth/users/clone-data", data={"email": email})
 
         if response.status_code != status.HTTP_200_OK:
             raise ValueError("Ошибка получения данных от procollab")
@@ -242,12 +225,12 @@ def _update_user_profile(self, user: CustomUser, data: dict) -> None:
             - Аватар профиля (если предоставлен)
         """
         user_fields = {
-            'first_name': data["first_name"],
-            'last_name': data["last_name"],
-            'patronymic': data["patronymic"],
-            'city': data["city"],
-            'age': data["birthday"],
-            'specialization': data["speciality"]
+            "first_name": data["first_name"],
+            "last_name": data["last_name"],
+            "patronymic": data["patronymic"],
+            "city": data["city"],
+            "age": data["birthday"],
+            "specialization": data["speciality"],
         }
         for field, value in user_fields.items():
             setattr(user, field, value)
@@ -261,7 +244,7 @@ def _update_user_profile(self, user: CustomUser, data: dict) -> None:
                     "user": user,
                     "name": "avatar",
                     "extension": avatar_url.split(".")[-1],
-                }
+                },
             )
             user_profile.file = file_instance
         user_profile.save()
@@ -270,7 +253,4 @@ def _handle_error(self, error: Exception) -> Response:
         """
         Обработчик ошибок для эндпоинта синхронизации.
         """
-        return Response(
-            {"error": str(error)},
-            status=status.HTTP_400_BAD_REQUEST
-        )
+        return Response({"error": str(error)}, status=status.HTTP_400_BAD_REQUEST)

apps/tests/courses_tests/constants.py

@@ -121,24 +121,26 @@
 
 # Response по /courses/skill-details/1:
 SKILL_DETAILS_RESPONSE_NEW_SUB = {
-    "skill_name": "Навык 1",
-    "file": "http://some.com/",
+    "id": 1,
+    "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/",
+    "id": 1,
+    "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/__init__.py

@@ -0,0 +1,71 @@
+from django.contrib import admin
+
+from .models import Meeting, Month, Trajectory, UserTrajectory
+
+
+@admin.register(Trajectory)
+class TrajectoryAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "name",
+        "company",
+        "start_date",
+        "duration_months",
+        "background_color",
+        "button_color",
+        "select_button_color",
+        "text_color",
+    )
+    list_filter = ["company", "start_date"]
+    search_fields = ["name", "company"]
+
+
+@admin.register(Month)
+class MonthAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "trajectory",
+        "skills_list",
+    )
+    search_fields = ["trajectory__name"]
+
+    def skills_list(self, obj):
+        return ", ".join(skill.name for skill in obj.skills.all())
+
+    skills_list.short_description = "Навыки"
+
+
+@admin.register(UserTrajectory)
+class UserTrajectoryAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "user",
+        "trajectory_name",
+        "start_date",
+        "is_active",
+        "mentor",
+    )
+    list_filter = ["is_active", "trajectory"]
+    search_fields = ["user__email", "trajectory__name"]
+
+    def trajectory_name(self, obj):
+        return obj.trajectory.name
+
+    trajectory_name.short_description = "Траектория"
+
+
+@admin.register(Meeting)
+class MeetingAdmin(admin.ModelAdmin):
+    list_display = (
+        "id",
+        "user_trajectory_user_email",
+        "initial_meeting",
+        "final_meeting",
+    )
+    list_filter = ["initial_meeting", "final_meeting"]
+    search_fields = ["user_trajectory__user__email"]
+
+    def user_trajectory_user_email(self, obj):
+        return obj.user_trajectory.user.email
+
+    user_trajectory_user_email.short_description = "Пользователь"

apps/trajectories/admin.py

@@ -0,0 +1,7 @@
+from django.apps import AppConfig
+
+
+class TrajectoriesConfig(AppConfig):
+    default_auto_field = "django.db.models.BigAutoField"
+    name = "trajectories"
+    verbose_name = "Траектории"