Skip to content

Commit

Permalink
Merge pull request #275 from PROCOLLAB-github/fix_required_skills
Browse files Browse the repository at this point in the history
fix required skills
  • Loading branch information
sh1nkey authored Feb 14, 2024
2 parents 8222ffe + b585865 commit 6fcb003
Showing 1 changed file with 16 additions and 12 deletions.
28 changes: 16 additions & 12 deletions vacancy/serializers.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@

from django.contrib.auth import get_user_model
from rest_framework import serializers

from core.fields import CustomListField
from projects.models import Project
from users.serializers import UserDetailSerializer
from vacancy.models import Vacancy, VacancyResponse

User = get_user_model()


class RequiredSkillsSerializerMixin(serializers.Serializer):
required_skills = serializers.SerializerMethodField()

def get_required_skills(self, obj):
skills_string = obj.required_skills
skills = [skill.strip() for skill in skills_string.split(",") if skill.strip()]
return skills


class ProjectForVacancySerializer(serializers.ModelSerializer):
class Meta:
model = Project
Expand All @@ -20,9 +29,8 @@ class Meta:
]


class VacancyDetailSerializer(serializers.ModelSerializer):
class VacancyDetailSerializer(serializers.ModelSerializer, RequiredSkillsSerializerMixin):
project = ProjectForVacancySerializer(many=False, read_only=True)
required_skills = serializers.ListSerializer(child=serializers.CharField())

class Meta:
model = Vacancy
Expand All @@ -36,14 +44,10 @@ class Meta:
"datetime_created",
"datetime_updated",
]
read_only_fields = [
"project",
]
read_only_fields = ["project"]


class VacancyListSerializer(serializers.ModelSerializer):
required_skills = CustomListField(child=serializers.CharField())

class VacancyListSerializer(serializers.ModelSerializer, RequiredSkillsSerializerMixin):
class Meta:
model = Vacancy
fields = [
Expand All @@ -58,9 +62,9 @@ class Meta:
]


class ProjectVacancyListSerializer(serializers.ModelSerializer):
required_skills = CustomListField(child=serializers.CharField())

class ProjectVacancyListSerializer(
serializers.ModelSerializer, RequiredSkillsSerializerMixin
):
class Meta:
model = Vacancy
fields = [
Expand Down

0 comments on commit 6fcb003

Please sign in to comment.