Merge branch 'dev'

Author: yakser

core/fields.py

@@ -0,0 +1,9 @@
+from rest_framework import serializers
+
+
+class CustomListField(serializers.ListField):
+    def to_representation(self, data):
+        return [value.strip() for value in data.split(",") if value.strip()]
+
+    def to_internal_value(self, data):
+        return ",".join(data)

projects/serializers.py

@@ -1,5 +1,6 @@
 from rest_framework import serializers
 
+from core.fields import CustomListField
 from industries.models import Industry
 from projects.models import Project, Achievement, Collaborator
 from projects.validators import validate_project
@@ -34,7 +35,7 @@ class CollaboratorSerializer(serializers.ModelSerializer):
     first_name = serializers.CharField(source="user.first_name")
     last_name = serializers.CharField(source="user.last_name")
     avatar = serializers.CharField(source="user.avatar")
-    key_skills = serializers.CharField(source="user.key_skills")
+    key_skills = CustomListField(child=serializers.CharField(), source="user.key_skills")
 
     class Meta:
         model = Collaborator
@@ -103,7 +104,6 @@ class Meta:
 
 
 class ProjectListSerializer(serializers.ModelSerializer):
-
     collaborators = serializers.SerializerMethodField(method_name="get_collaborators")
     collaborator_count = serializers.SerializerMethodField(
         method_name="get_collaborator_count"

users/admin.py

@@ -41,6 +41,7 @@ class CustomUserAdmin(admin.ModelAdmin):
                     "region",
                     "organization",
                     "speciality",
+                    "key_skills",
                 )
             },
         ),
@@ -67,12 +68,13 @@ class CustomUserAdmin(admin.ModelAdmin):
     )
 
     list_display = (
+        "id",
         "email",
         "last_name",
         "first_name",
-        "id",
     )
     list_display_links = (
+        "id",
         "email",
         "first_name",
         "last_name",

vacancy/serializers.py

@@ -1,6 +1,7 @@
 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
@@ -20,7 +21,8 @@ class Meta:
 
 
 class VacancyDetailSerializer(serializers.ModelSerializer):
-    project = ProjectForVacancySerializer(many=False)
+    project = ProjectForVacancySerializer(many=False, read_only=True)
+    required_skills = serializers.ListSerializer(child=serializers.CharField())
 
     class Meta:
         model = Vacancy
@@ -34,9 +36,14 @@ class Meta:
             "datetime_created",
             "datetime_updated",
         ]
+        read_only_fields = [
+            "project",
+        ]
 
 
 class VacancyListSerializer(serializers.ModelSerializer):
+    required_skills = CustomListField(child=serializers.CharField())
+
     class Meta:
         model = Vacancy
         fields = [
@@ -46,9 +53,14 @@ class Meta:
             "description",
             "is_active",
         ]
+        read_only_fields = [
+            "project",
+        ]
 
 
 class ProjectVacancyListSerializer(serializers.ModelSerializer):
+    required_skills = CustomListField(child=serializers.CharField())
+
     class Meta:
         model = Vacancy
         fields = [

vacancy/tests.py

@@ -22,7 +22,7 @@ def setUp(self):
         self.user_project_owner = self.user_create()
         self.vacancy_create_data = {
             "role": "Test",
-            "required_skills": "Test",
+            "required_skills": ["Test"],
             "description": "Test",
             "is_active": True,
             "project": Project.objects.create(
@@ -41,7 +41,7 @@ def test_vacancy_creation(self):
 
         self.assertEqual(response.status_code, 201)
         self.assertEqual(response.data["role"], "Test")
-        self.assertEqual(response.data["required_skills"], "Test")
+        self.assertEqual(response.data["required_skills"], ["Test"])
         self.assertEqual(response.data["description"], "Test")
         self.assertEqual(response.data["is_active"], True)
         self.assertEqual(response.data["project"], self.vacancy_create_data["project"])