Added vacancy filters + new salary field

Author: pavuchara

vacancy/constants.py

@@ -6,28 +6,48 @@ class ChoicesMixin:
     @classmethod
     def choices(cls):
         """Return a list of tuples (value, display_name) for choices."""
-        return [(item.value, item.value) for item in cls]
+        return [(item.name.lower(), item.value) for item in cls]
+
+    @classmethod
+    def from_display(cls, display_value):
+        """Convert display value to Enum name."""
+        for item in cls:
+            if item.value == display_value:
+                return item.name.lower()
+            elif display_value is None:
+                return None
+        raise ValueError(f"Invalid display value: {display_value}")
+
+    @classmethod
+    def to_display(cls, name_value):
+        """Convert Enum name to display value."""
+        for item in cls:
+            if item.name.lower() == name_value:
+                return item.value
+            elif name_value is None:
+                return None
+        raise ValueError(f"Invalid name value: {name_value}")
 
 
 class WorkExperience(ChoicesMixin, Enum):
 
-    NO_EXPERIENCE: str = "Без опыта"
-    UP_TO_A_YEAR: str = "До 1 года"
-    FROM_ONE_TO_THREE_YEARS: str = "От 1 года до 3 лет"
-    FROM_THREE_YEARS: str = "От 3 лет и более"
+    NO_EXPERIENCE: str = "без опыта"
+    UP_TO_A_YEAR: str = "до 1 года"
+    FROM_ONE_TO_THREE_YEARS: str = "от 1 года до 3 лет"
+    FROM_THREE_YEARS: str = "от 3 лет и более"
 
 
 class WorkSchedule(ChoicesMixin, Enum):
 
-    FULL_TIME: str = "Полный рабочий день"
-    SHIFT_WORK: str = "Сменный график"
-    FLEXIBLE_SCHEDULE: str = "Гибкий график"
-    PART_TIME: str = "Частичная занятость"
-    INTERNSHIP: str = "Стажировка"
+    FULL_TIME: str = "полный рабочий день"
+    SHIFT_WORK: str = "сменный график"
+    FLEXIBLE_SCHEDULE: str = "гибкий график"
+    PART_TIME: str = "частичная занятость"
+    INTERNSHIP: str = "стажировка"
 
 
 class WorkFormat(ChoicesMixin, Enum):
 
-    REMOTE: str = "Удаленная работа"
-    OFFICE: str = "Работа в офисе"
-    HYBRID: str = "Смешанная"
+    REMOTE: str = "удаленная работа"
+    OFFICE: str = "работа в офисе"
+    HYBRID: str = "смешанный формат"

vacancy/filters.py

@@ -1,7 +1,13 @@
+from django.db.models import QuerySet, Q, F
+
 from django_filters import rest_framework as filters
 
 from vacancy.models import Vacancy
-from django.db.models import QuerySet
+from vacancy.constants import (
+    WorkExperience,
+    WorkSchedule,
+    WorkFormat,
+)
 
 
 def project_id_filter(queryset, name, value) -> QuerySet:
@@ -18,12 +24,20 @@ class VacancyFilter(filters.FilterSet):
     Adds filtering to DRF list retrieve views
 
     Parameters to filter by:
-        project_id (int), is_active (default to True if not set otherwise) (boolean)
+        project_id (int),
+        is_active (boolean) (default to True if not set otherwise),
+        required_experience (multiple choise)
+        work_schedule (multiple choise)
+        work_format (multiple choise)
+        salary_min (int)
+        salary_max (int)
 
     Examples:
         ?project_id=1 equals to .filter(project_id=1)
         (no params passed) equals to .filter(is_active=True)
         ?is_active=false equals to .filter(is_active=False)
+        ?work_schedule=full_time&work_schedule=part_time equals to .filter(required_experience__in=value)
+        ?salary_min=100&salary_max=150 equals to .filter(salary__range=(100, 150))
     """
 
     def __init__(self, *args, **kwargs):
@@ -33,9 +47,76 @@ def __init__(self, *args, **kwargs):
             self.data = dict(self.data)
             self.data["is_active"] = True
 
-    is_active = filters.BooleanFilter(field_name="is_active")
+    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_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))
+            )
+        except ValueError:
+            return queryset
+
+    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))
+            )
+        except ValueError:
+            return queryset
+
     project_id = filters.Filter(method=project_id_filter)
+    is_active = filters.BooleanFilter(field_name="is_active")
+
+    required_experience = filters.MultipleChoiceFilter(
+        method="filter_by_experience",
+        choices=WorkExperience.choices(),
+    )
+    work_schedule = filters.MultipleChoiceFilter(
+        method="filter_by_schedule",
+        choices=WorkSchedule.choices(),
+    )
+    work_format = filters.MultipleChoiceFilter(
+        method="filter_by_format",
+        choices=WorkFormat.choices(),
+    )
+
+    salary_min = filters.Filter(method="filter_by_salary_min")
+    salary_max = filters.Filter(method="filter_by_salary_max")
 
     class Meta:
         model = Vacancy
-        fields = ("project_id", "is_active")
+        fields = (
+            "project_id",
+            "is_active",
+            "required_experience",
+            "work_schedule",
+            "work_format",
+            "salary_min",
+            "salary_max",
+        )

vacancy/migrations/0008_vacancy_salary_alter_vacancy_required_experience_and_more.py

@@ -0,0 +1,72 @@
+# Generated by Django 4.2.11 on 2024-12-04 10:56
+
+import django.core.validators
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("vacancy", "0007_vacancy_required_experience_vacancy_work_format_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="vacancy",
+            name="salary",
+            field=models.IntegerField(
+                blank=True,
+                null=True,
+                validators=[django.core.validators.MinValueValidator(0)],
+                verbose_name="Зарплата",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vacancy",
+            name="required_experience",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("no_experience", "без опыта"),
+                    ("up_to_a_year", "до 1 года"),
+                    ("from_one_to_three_years", "от 1 года до 3 лет"),
+                    ("from_three_years", "от 3 лет и более"),
+                ],
+                max_length=50,
+                null=True,
+                verbose_name="Требуемый опыт",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vacancy",
+            name="work_format",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("remote", "удаленная работа"),
+                    ("office", "работа в офисе"),
+                    ("hybrid", "смешанный формат"),
+                ],
+                max_length=50,
+                null=True,
+                verbose_name="Формат работы",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="vacancy",
+            name="work_schedule",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("full_time", "полный рабочий день"),
+                    ("shift_work", "сменный график"),
+                    ("flexible_schedule", "гибкий график"),
+                    ("part_time", "частичная занятость"),
+                    ("internship", "стажировка"),
+                ],
+                max_length=50,
+                null=True,
+                verbose_name="График работы",
+            ),
+        ),
+    ]

vacancy/models.py

@@ -1,5 +1,6 @@
 from django.contrib.contenttypes.fields import GenericRelation
 from django.db import models
+from django.core.validators import MinValueValidator
 from django.utils import timezone
 
 from files.models import UserFile
@@ -53,6 +54,12 @@ class Vacancy(models.Model):
         null=True,
         verbose_name="Формат работы",
     )
+    salary = models.IntegerField(
+        blank=True,
+        null=True,
+        validators=[MinValueValidator(0)],
+        verbose_name="Зарплата",
+    )
     project = models.ForeignKey(
         Project,
         on_delete=models.CASCADE,

vacancy/serializers.py

@@ -10,6 +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.models import Vacancy, VacancyResponse
 
 User = get_user_model()
@@ -25,6 +26,37 @@ class RequiredSkillsWriteSerializerMixin(RequiredSkillsSerializerMixin):
     )
 
 
+class AbstractVacancyEnumFields(serializers.Serializer):
+    required_experience = serializers.CharField(allow_null=True)
+    work_schedule = serializers.CharField(allow_null=True)
+    work_format = serializers.CharField(allow_null=True)
+
+    def validate_required_experience(self, value):
+        try:
+            return WorkExperience.from_display(value)
+        except ValueError as e:
+            raise serializers.ValidationError(str(e))
+
+    def validate_work_schedule(self, value):
+        try:
+            return WorkSchedule.from_display(value)
+        except ValueError as e:
+            raise serializers.ValidationError(str(e))
+
+    def validate_work_format(self, value):
+        try:
+            return WorkFormat.from_display(value)
+        except ValueError as e:
+            raise serializers.ValidationError(str(e))
+
+    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["work_format"] = WorkFormat.to_display(instance.work_format)
+        return representation
+
+
 class AbstractVacancyReadOnlyFields(serializers.Serializer):
     """Abstract read-only fields for Vacancy."""
 
@@ -70,6 +102,7 @@ class Meta:
 class VacancyDetailSerializer(
     serializers.ModelSerializer,
     AbstractVacancyReadOnlyFields,
+    AbstractVacancyEnumFields,
     RequiredSkillsWriteSerializerMixin[Vacancy],
 ):
     project = ProjectForVacancySerializer(many=False, read_only=True)
@@ -91,6 +124,7 @@ class Meta:
             "required_experience",
             "work_schedule",
             "work_format",
+            "salary",
         ]
         read_only_fields = ["project"]
 
@@ -155,6 +189,7 @@ def validate(self, data):
 class ProjectVacancyCreateListSerializer(
     serializers.ModelSerializer,
     AbstractVacancyReadOnlyFields,
+    AbstractVacancyEnumFields,
     RequiredSkillsWriteSerializerMixin[Vacancy],
 ):
 
@@ -208,6 +243,7 @@ class Meta:
             "required_experience",
             "work_schedule",
             "work_format",
+            "salary",
         ]