Merge pull request #523 from PROCOLLAB-github/feature/project-mospolytech-data

Feature/project mospolytech data

Author: Toksi86

invites/admin.py

@@ -5,4 +5,11 @@
 
 @admin.register(Invite)
 class InviteAdmin(admin.ModelAdmin):
-    fields = ["project", "user", "motivational_letter", "role", "is_accepted"]
+    fields = [
+        "project",
+        "user",
+        "motivational_letter",
+        "role",
+        "specialization",
+        "is_accepted",
+    ]

invites/migrations/0002_invite_specialization.py

@@ -0,0 +1,24 @@
+# Generated by Django 4.2.11 on 2025-07-08 11:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("invites", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="invite",
+            name="specialization",
+            field=models.CharField(
+                blank=True,
+                default=None,
+                max_length=100,
+                null=True,
+                verbose_name="Специализация",
+            ),
+        ),
+    ]

invites/models.py

@@ -1,9 +1,9 @@
 from django.db import models
+from django_stubs_ext.db.models import TypedModelMeta
 
 from invites.managers import InviteManager
 from projects.models import Project
 from users.models import CustomUser
-from django_stubs_ext.db.models import TypedModelMeta
 
 
 class Invite(models.Model):
@@ -27,6 +27,13 @@ class Invite(models.Model):
         max_length=4096, blank=True, null=True, default=None
     )
     role = models.CharField(max_length=128, blank=True, null=True)
+    specialization = models.CharField(
+        max_length=100,
+        blank=True,
+        null=True,
+        default=None,
+        verbose_name="Специализация",
+    )
     is_accepted = models.BooleanField(blank=False, null=True, default=None)
 
     datetime_created = models.DateTimeField(
@@ -39,7 +46,9 @@ class Invite(models.Model):
     objects = InviteManager()
 
     def __str__(self) -> str:
-        return f'Invite from project "{self.project.name}" to {self.user.get_full_name()}'
+        return (
+            f'Invite from project "{self.project.name}" to {self.user.get_full_name()}'
+        )
 
     class Meta(TypedModelMeta):
         verbose_name = "Приглашение"

invites/serializers.py

@@ -21,6 +21,9 @@ class Meta:
 class InviteDetailSerializer(serializers.ModelSerializer[Invite]):
     user = UserDetailSerializer(many=False, read_only=True)
     project = ProjectListSerializer(many=False, read_only=True)
+    specialization = serializers.CharField(
+        required=False, allow_null=True, allow_blank=True
+    )
 
     class Meta:
         model = Invite
@@ -30,6 +33,7 @@ class Meta:
             "user",
             "motivational_letter",
             "role",
+            "specialization",
             "is_accepted",
             "datetime_created",
             "datetime_updated",

invites/views.py

@@ -4,7 +4,7 @@
 
 from invites.filters import InviteFilter
 from invites.models import Invite
-from invites.serializers import InviteListSerializer, InviteDetailSerializer
+from invites.serializers import InviteDetailSerializer, InviteListSerializer
 from projects.models import Collaborator
 
 
@@ -49,7 +49,10 @@ def post(self, request, *args, **kwargs):
             return Response(status=status.HTTP_403_FORBIDDEN)
         # add user to project collaborators
         Collaborator.objects.create(
-            user=invite.user, project=invite.project, role=invite.role
+            user=invite.user,
+            project=invite.project,
+            role=invite.role,
+            specialization=invite.specialization,
         )
         invite.is_accepted = True
         invite.save()

projects/migrations/0026_collaborator_specialization.py

@@ -0,0 +1,25 @@
+# Generated by Django 4.2.11 on 2025-07-08 11:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("projects", "0025_remove_project_specialty"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="collaborator",
+            name="specialization",
+            field=models.CharField(
+                blank=True,
+                default=None,
+                help_text="Направления работы участника в рамках проекта",
+                max_length=100,
+                null=True,
+                verbose_name="Специализация",
+            ),
+        ),
+    ]

projects/models.py

@@ -264,6 +264,7 @@ class Collaborator(models.Model):
         user: A ForeignKey referencing the user who is collaborating in the project.
         project: A ForeignKey referencing the project the user is collaborating in.
         role: A CharField meaning the role the user is fulfilling in the project.
+        specialization: A CharField indicating the user's specialization within the project.
         datetime_created: A DateTimeField indicating date of creation.
         datetime_updated: A DateTimeField indicating date of update.
     """
@@ -276,6 +277,14 @@ class Collaborator(models.Model):
     )
     project = models.ForeignKey(Project, models.CASCADE, verbose_name="Проект")
     role = models.CharField("Роль", max_length=1024, blank=True, null=True)
+    specialization = models.CharField(
+        "Специализация",
+        max_length=100,
+        blank=True,
+        null=True,
+        default=None,
+        help_text="Направления работы участника в рамках проекта",
+    )
 
     datetime_created = models.DateTimeField(
         verbose_name="Дата создания", null=False, auto_now_add=True