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

Feature/project mospolytech data

Author: Toksi86

vacancy/admin.py

@@ -15,6 +15,7 @@ class VacancySkillToObjectInline(SkillToObjectInline):
 class VacancyAdmin(admin.ModelAdmin):
     list_display = [
         "role",
+        "specialization",
         "description",
         "project",
         "is_active",
@@ -24,7 +25,7 @@ class VacancyAdmin(admin.ModelAdmin):
     inlines = [
         VacancySkillToObjectInline,
     ]
-    readonly_fields = ('datetime_closed',)
+    readonly_fields = ("datetime_closed",)
     list_display_links = ["role"]
 
     change_list_template = "vacancies/vacancies_change_list.html"

vacancy/filters.py

@@ -47,50 +47,52 @@ def __init__(self, *args, **kwargs):
             self.data = dict(self.data)
             self.data["is_active"] = True
 
-    def filter_by_experience(self, queryset: QuerySet[Vacancy], name, value: list[str]) -> QuerySet[Vacancy]:
-        return (
-            queryset
-            .filter(Q(required_experience__in=value) | Q(required_experience=None))
-            .order_by(F("required_experience").asc(nulls_last=True))
+    def filter_by_experience(
+        self, queryset: QuerySet[Vacancy], name, value: list[str]
+    ) -> QuerySet[Vacancy]:
+        return queryset.filter(
+            Q(required_experience__in=value) | Q(required_experience=None)
+        ).order_by(F("required_experience").asc(nulls_last=True))
+
+    def filter_by_schedule(
+        self, queryset: QuerySet[Vacancy], name, value: list[str]
+    ) -> QuerySet[Vacancy]:
+        return queryset.filter(
+            Q(work_schedule__in=value) | Q(work_schedule=None)
+        ).order_by(F("work_schedule").asc(nulls_last=True))
+
+    def filter_by_format(
+        self, queryset: QuerySet[Vacancy], name, value: list[str]
+    ) -> QuerySet[Vacancy]:
+        return queryset.filter(Q(work_format__in=value) | Q(work_format=None)).order_by(
+            F("work_format").asc(nulls_last=True)
         )
 
-    def filter_by_schedule(self, queryset: QuerySet[Vacancy], name, value: list[str]) -> QuerySet[Vacancy]:
-        return (
-            queryset
-            .filter(Q(work_schedule__in=value) | Q(work_schedule=None))
-            .order_by(F("work_schedule").asc(nulls_last=True))
-        )
-
-    def filter_by_format(self, queryset: QuerySet[Vacancy], name, value: list[str]) -> QuerySet[Vacancy]:
-        return (
-            queryset
-            .filter(Q(work_format__in=value) | Q(work_format=None))
-            .order_by(F("work_format").asc(nulls_last=True))
-        )
-
-    def filter_by_salary_min(self, queryset: QuerySet[Vacancy], name, value: list[str]) -> QuerySet[Vacancy]:
+    def filter_by_salary_min(
+        self, queryset: QuerySet[Vacancy], name, value: list[str]
+    ) -> QuerySet[Vacancy]:
         try:
             min_salary = int(value[0])
-            return (
-                queryset
-                .filter(Q(salary__gte=min_salary) | Q(salary=None))
-                .order_by(F("salary").asc(nulls_last=True))
+            return queryset.filter(Q(salary__gte=min_salary) | Q(salary=None)).order_by(
+                F("salary").asc(nulls_last=True)
             )
         except ValueError:
             return queryset
 
-    def filter_by_salary_max(self, queryset: QuerySet[Vacancy], name, value: list[str]) -> QuerySet[Vacancy]:
+    def filter_by_salary_max(
+        self, queryset: QuerySet[Vacancy], name, value: list[str]
+    ) -> QuerySet[Vacancy]:
         try:
             max_salary = int(value[0])
-            return (
-                queryset
-                .filter(Q(salary__lte=max_salary) | Q(salary=None))
-                .order_by(F("salary").asc(nulls_last=True))
+            return queryset.filter(Q(salary__lte=max_salary) | Q(salary=None)).order_by(
+                F("salary").asc(nulls_last=True)
             )
         except ValueError:
             return queryset
 
-    def filter_by_role(self, queryset: QuerySet[Vacancy], name, value: list[str]) -> QuerySet[Vacancy]:
+    def filter_by_role(
+        self, queryset: QuerySet[Vacancy], name, value: list[str]
+    ) -> QuerySet[Vacancy]:
         if not value:
             return queryset
         return queryset.filter(role__icontains=value[0])

vacancy/migrations/0009_vacancy_specialization.py

@@ -0,0 +1,20 @@
+# Generated by Django 4.2.11 on 2025-07-10 06:51
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("vacancy", "0008_vacancy_salary_alter_vacancy_required_experience_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="vacancy",
+            name="specialization",
+            field=models.CharField(
+                blank=True, max_length=128, null=True, verbose_name="Специализация"
+            ),
+        ),
+    ]

vacancy/models.py

@@ -1,13 +1,13 @@
 from django.contrib.contenttypes.fields import GenericRelation
-from django.db import models
 from django.core.validators import MinValueValidator
+from django.db import models
 from django.utils import timezone
+from django_stubs_ext.db.models import TypedModelMeta
 
 from files.models import UserFile
 from projects.models import Project
-from vacancy.constants import WorkExperience, WorkSchedule, WorkFormat
+from vacancy.constants import WorkExperience, WorkFormat, WorkSchedule
 from vacancy.managers import VacancyManager, VacancyResponseManager
-from django_stubs_ext.db.models import TypedModelMeta
 
 
 class Vacancy(models.Model):
@@ -28,6 +28,9 @@ class Vacancy(models.Model):
     """
 
     role = models.CharField(max_length=256, null=False)
+    specialization = models.CharField(
+        max_length=128, null=True, blank=True, verbose_name="Специализация"
+    )
     required_skills = GenericRelation(
         "core.SkillToObject",
         related_query_name="vacancies",

vacancy/serializers.py

@@ -10,7 +10,7 @@
 from projects.models import Project
 from projects.validators import validate_project
 from users.serializers import UserDetailSerializer
-from vacancy.constants import WorkExperience, WorkSchedule, WorkFormat
+from vacancy.constants import WorkExperience, WorkFormat, WorkSchedule
 from vacancy.models import Vacancy, VacancyResponse
 
 User = get_user_model()
@@ -51,8 +51,12 @@ def validate_work_format(self, value):
 
     def to_representation(self, instance):
         representation = super().to_representation(instance)
-        representation["required_experience"] = WorkExperience.to_display(instance.required_experience)
-        representation["work_schedule"] = WorkSchedule.to_display(instance.work_schedule)
+        representation["required_experience"] = WorkExperience.to_display(
+            instance.required_experience
+        )
+        representation["work_schedule"] = WorkSchedule.to_display(
+            instance.work_schedule
+        )
         representation["work_format"] = WorkFormat.to_display(instance.work_format)
         return representation
 
@@ -112,6 +116,7 @@ class Meta:
         fields = [
             "id",
             "role",
+            "specialization",
             "required_skills",
             "required_skills_ids",
             "description",
@@ -139,6 +144,7 @@ class Meta:
         fields = [
             "id",
             "role",
+            "specialization",
             "required_skills",
             "description",
             "is_active",
@@ -192,7 +198,6 @@ class ProjectVacancyCreateListSerializer(
     AbstractVacancyEnumFields,
     RequiredSkillsWriteSerializerMixin[Vacancy],
 ):
-
     def create(self, validated_data):
         project = validated_data["project"]
         if project.leader != self.context["request"].user:
@@ -233,6 +238,7 @@ class Meta:
         fields = [
             "id",
             "role",
+            "specialization",
             "required_skills",
             "required_skills_ids",
             "description",

vacancy/tasks.py

@@ -1,16 +1,16 @@
 import datetime
 
-from mailing.typing import EmailDataToPrepare, ContextDataDict, MailDataDict
-from mailing.utils import send_mass_mail, prepare_mail_data
+from mailing.typing import ContextDataDict, EmailDataToPrepare, MailDataDict
+from mailing.utils import prepare_mail_data, send_mass_mail
 from procollab.celery import app
 from vacancy.mapping import (
     CeleryEmailParams,
+    EmailParamsType,
+    MessageTypeEnum,
     create_text_for_email,
-    message_type_to_button_text,
     get_link,
-    MessageTypeEnum,
+    message_type_to_button_text,
     message_type_to_title,
-    EmailParamsType,
 )
 from vacancy.models import Vacancy
 

vacancy/views.py

@@ -70,7 +70,9 @@ def put(self, request, *args, **kwargs):
         return self.update(request, *args, **kwargs)
 
 
-class VacancyResponseList(mixins.ListModelMixin, mixins.CreateModelMixin, GenericAPIView):
+class VacancyResponseList(
+    mixins.ListModelMixin, mixins.CreateModelMixin, GenericAPIView
+):
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
     serializer_class = VacancyResponseListSerializer
 
@@ -145,7 +147,9 @@ def post(self, request, pk):
         role_add_as: str = vacancy.role
 
         # check if this person already has a collaborator role in this project
-        if Collaborator.objects.filter(project=project_add_in, user=user_to_add).exists():
+        if Collaborator.objects.filter(
+            project=project_add_in, user=user_to_add
+        ).exists():
             return Response(
                 "You already work for this project, you can't accept a vacancy here",
                 status=status.HTTP_400_BAD_REQUEST,