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

Добавлены индивидуальные навыки в рамках модуля Траектория

Author: Toksi86

apps/courses/serializers.py

@@ -82,7 +82,7 @@ class Meta:
 
 
 class SkillNameAndLogoSerializer(serializers.ModelSerializer):
-    file_link = serializers.URLField(source="file.link")
+    file_link = serializers.URLField(source="file.link", default=None)
 
     class Meta:
         model = Skill

apps/trajectories/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
-from .models import Meeting, Month, Trajectory, UserTrajectory
+from .models import (Meeting, Month, Trajectory, UserIndividualSkill,
+                     UserTrajectory)
 
 
 @admin.register(Trajectory)
@@ -12,8 +13,14 @@ class TrajectoryAdmin(admin.ModelAdmin):
         "start_date",
         "duration_months",
     )
-    list_filter = ("company", "start_date",)
-    search_fields = ("name", "company",)
+    list_filter = (
+        "company",
+        "start_date",
+    )
+    search_fields = (
+        "name",
+        "company",
+    )
     autocomplete_fields = ("mentors",)
 
     def get_mentors(self, obj):
@@ -49,8 +56,14 @@ class UserTrajectoryAdmin(admin.ModelAdmin):
         "is_active",
         "mentor",
     )
-    list_filter = ("is_active", "trajectory",)
-    search_fields = ("user__email", "trajectory__name",)
+    list_filter = (
+        "is_active",
+        "trajectory",
+    )
+    search_fields = (
+        "user__email",
+        "trajectory__name",
+    )
     autocomplete_fields = ("mentor",)
 
     def trajectory_name(self, obj):
@@ -68,10 +81,22 @@ class MeetingAdmin(admin.ModelAdmin):
         "final_meeting",
     )
     readonly_fields = ("user_trajectory",)
-    list_filter = ("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 = "Пользователь"
+
+
+@admin.register(UserIndividualSkill)
+class UserIndividualSkillAdmin(admin.ModelAdmin):
+    exclude = ("user_trajectory",)
+    autocomplete_fields = ["user"]
+
+    def get_readonly_fields(self, request, obj=None):
+        return ["user_trajectory"] if obj else []

apps/trajectories/migrations/0003_alter_trajectory_background_color_and_more.py

@@ -0,0 +1,62 @@
+# Generated by Django 5.0.3 on 2025-03-13 09:59
+
+from django.db import migrations, models
+
+import trajectories.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("trajectories", "0002_alter_month_options_month_order"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="trajectory",
+            name="background_color",
+            field=models.CharField(
+                default="#FFFFFF",
+                max_length=7,
+                validators=[trajectories.validators.validate_hex_color],
+                verbose_name="Цвет заднего фона билета",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="trajectory",
+            name="button_color",
+            field=models.CharField(
+                default="#6c27ff",
+                max_length=7,
+                validators=[trajectories.validators.validate_hex_color],
+                verbose_name="Цвет кнопки 'Подробнее'",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="trajectory",
+            name="duration_months",
+            field=models.IntegerField(
+                validators=[trajectories.validators.validate_positive], verbose_name="Количество месяцев"
+            ),
+        ),
+        migrations.AlterField(
+            model_name="trajectory",
+            name="select_button_color",
+            field=models.CharField(
+                default="#6c27ff",
+                max_length=7,
+                validators=[trajectories.validators.validate_hex_color],
+                verbose_name="Цвет кнопки 'Выбрать'",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="trajectory",
+            name="text_color",
+            field=models.CharField(
+                default="#332e2d",
+                max_length=7,
+                validators=[trajectories.validators.validate_hex_color],
+                verbose_name="Цвет текста на билете",
+            ),
+        ),
+    ]

apps/trajectories/migrations/0004_userindividualskill.py

@@ -0,0 +1,49 @@
+# Generated by Django 5.0.3 on 2025-03-24 11:04
+
+import django.db.models.deletion
+import django.utils.timezone
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("courses", "0016_skill_free_access_task_free_access"),
+        ("trajectories", "0003_alter_trajectory_background_color_and_more"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="UserIndividualSkill",
+            fields=[
+                ("id", models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
+                ("start_date", models.DateTimeField(default=django.utils.timezone.now, verbose_name="Дата добавления")),
+                ("skills", models.ManyToManyField(to="courses.skill", verbose_name="Навыки")),
+                (
+                    "user",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="individual_skills",
+                        to=settings.AUTH_USER_MODEL,
+                        verbose_name="Пользователь",
+                    ),
+                ),
+                (
+                    "user_trajectory",
+                    models.ForeignKey(
+                        editable=False,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        related_name="individual_skills",
+                        to="trajectories.usertrajectory",
+                        verbose_name="Активная траектория",
+                    ),
+                ),
+            ],
+            options={
+                "verbose_name": "Индивидуальный навык",
+                "verbose_name_plural": "Индивидуальные навыки",
+            },
+        ),
+    ]

apps/trajectories/models.py

@@ -28,21 +28,37 @@ class Trajectory(models.Model):
         null=True,
         blank=True,
     )
-    mentors = models.ManyToManyField(CustomUser, related_name="mentored_trajectories", verbose_name="Наставники")
+    mentors = models.ManyToManyField(
+        CustomUser, related_name="mentored_trajectories", verbose_name="Наставники"
+    )
     start_date = models.DateField(default=timezone.now, verbose_name="Дата начала")
-    duration_months = models.IntegerField(verbose_name="Количество месяцев", validators=[validate_positive])
+    duration_months = models.IntegerField(
+        verbose_name="Количество месяцев", validators=[validate_positive]
+    )
     company = models.CharField(max_length=255, verbose_name="Компания")
     background_color = models.CharField(
-        max_length=7, default="#FFFFFF", verbose_name="Цвет заднего фона билета", validators=[validate_hex_color]
+        max_length=7,
+        default="#FFFFFF",
+        verbose_name="Цвет заднего фона билета",
+        validators=[validate_hex_color],
     )
     button_color = models.CharField(
-        max_length=7, default="#6c27ff", verbose_name="Цвет кнопки 'Подробнее'", validators=[validate_hex_color]
+        max_length=7,
+        default="#6c27ff",
+        verbose_name="Цвет кнопки 'Подробнее'",
+        validators=[validate_hex_color],
     )
     select_button_color = models.CharField(
-        max_length=7, default="#6c27ff", verbose_name="Цвет кнопки 'Выбрать'", validators=[validate_hex_color]
+        max_length=7,
+        default="#6c27ff",
+        verbose_name="Цвет кнопки 'Выбрать'",
+        validators=[validate_hex_color],
     )
     text_color = models.CharField(
-        max_length=7, default="#332e2d", verbose_name="Цвет текста на билете", validators=[validate_hex_color]
+        max_length=7,
+        default="#332e2d",
+        verbose_name="Цвет текста на билете",
+        validators=[validate_hex_color],
     )
 
     def __str__(self):
@@ -59,7 +75,9 @@ class Month(models.Model):
     Связана с траекторией и набором навыков.
     """
 
-    trajectory = models.ForeignKey(Trajectory, on_delete=models.CASCADE, related_name="months")
+    trajectory = models.ForeignKey(
+        Trajectory, on_delete=models.CASCADE, related_name="months"
+    )
     skills = models.ManyToManyField("courses.Skill", verbose_name="Навыки")
     order = models.PositiveIntegerField(verbose_name="Порядковый номер месяца")
 
@@ -90,7 +108,9 @@ def clean(self):
         """
         current_months_count = self.trajectory.months.count()
         if current_months_count >= self.trajectory.duration_months:
-            raise ValidationError(f"Нельзя добавить больше {self.trajectory.duration_months} месяцев в эту траекторию.")
+            raise ValidationError(
+                f"Нельзя добавить больше {self.trajectory.duration_months} месяцев в эту траекторию."
+            )
 
     def save(self, *args, **kwargs):
         self.clean()
@@ -108,12 +128,18 @@ class UserTrajectory(models.Model):
     Каждый пользователь может быть привязан только к одной активной траектории в любой момент времени.
     """
 
-    user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name="user_trajectories")
+    user = models.ForeignKey(
+        CustomUser, on_delete=models.CASCADE, related_name="user_trajectories"
+    )
     trajectory = models.ForeignKey(Trajectory, on_delete=models.CASCADE)
     start_date = models.DateField(default=timezone.now)
     is_active = models.BooleanField(default=True)
     mentor = models.ForeignKey(
-        CustomUser, on_delete=models.SET_NULL, null=True, blank=True, related_name="mentored_users"
+        CustomUser,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name="mentored_users",
     )
 
     def __str__(self):
@@ -141,13 +167,72 @@ class Meta:
         verbose_name_plural = "Пользовательские траектории"
 
 
+class UserIndividualSkill(models.Model):
+    """
+    Модель для хранения индивидуальных навыков пользователя в рамках активной траектории.
+    Поле user_trajectory заполняется автоматически.
+    """
+
+    user = models.ForeignKey(
+        CustomUser,
+        on_delete=models.CASCADE,
+        related_name="individual_skills",
+        verbose_name="Пользователь",
+    )
+    user_trajectory = models.ForeignKey(
+        UserTrajectory,
+        on_delete=models.CASCADE,
+        related_name="individual_skills",
+        verbose_name="Активная траектория",
+        editable=False,
+    )
+    skills = models.ManyToManyField("courses.Skill", verbose_name="Навыки")
+    start_date = models.DateTimeField(
+        default=timezone.now, verbose_name="Дата добавления"
+    )
+
+    class Meta:
+        verbose_name = "Индивидуальный навык"
+        verbose_name_plural = "Индивидуальные навыки"
+
+    def __str__(self):
+        return f"{self.user.email} (Траектория: {self.user_trajectory.trajectory.name})"
+
+    def clean(self):
+        active_trajectory = self.user.user_trajectories.filter(is_active=True).first()
+
+        if not active_trajectory:
+            raise ValidationError(
+                "Невозможно сохранить навык: у пользователя нет активной траектории."
+            )
+
+        if not self.user_trajectory_id:
+            self.user_trajectory = active_trajectory
+
+        if self.user_trajectory.user != self.user:
+            raise ValidationError("Траектория не принадлежит указанному пользователю.")
+
+        super().clean()
+
+    def save(self, *args, **kwargs):
+        """
+        Удаляем явный вызов clean(), так как он вызывается автоматически
+        через full_clean() при сохранении через формы/админку
+        """
+        super().save(*args, **kwargs)
+
+
 class Meeting(models.Model):
     """
     Модель для отражения статуса встреч пользователя с наставником в рамках траектории.
     """
 
-    user_trajectory = models.ForeignKey(UserTrajectory, on_delete=models.CASCADE, related_name="meetings")
-    initial_meeting = models.BooleanField(default=False, verbose_name="Начальная встреча")
+    user_trajectory = models.ForeignKey(
+        UserTrajectory, on_delete=models.CASCADE, related_name="meetings"
+    )
+    initial_meeting = models.BooleanField(
+        default=False, verbose_name="Начальная встреча"
+    )
     final_meeting = models.BooleanField(default=False, verbose_name="Финальная встреча")
 
     def __str__(self):