add type-hints vacancy

vacancy/filters.py

@@ -3,7 +3,7 @@
 from vacancy.models import Vacancy
 
 
-def project_id_filter(queryset, name, value):
+def project_id_filter(queryset, name, value) -> queryset:
     return queryset.filter(
         **{
             "project_id": value[0],
@@ -27,7 +27,7 @@ class VacancyFilter(filters.FilterSet):
 
     def __init__(self, *args, **kwargs):
         """if is_active filter is not passed, default to True"""
-        super().__init__(*args, **kwargs)
+        super().init(*args, **kwargs)
         if self.data.get("is_active") is None:
             self.data = dict(self.data)
             self.data["is_active"] = True
@@ -37,4 +37,4 @@ def __init__(self, *args, **kwargs):
 
     class Meta:
         model = Vacancy
-        fields = ("project_id", "is_active")
+        fields = ("project_id", "is_active")

vacancy/models.py

@@ -2,6 +2,7 @@
 
 from projects.models import Project
 from vacancy.managers import VacancyManager, VacancyResponseManager
+from django_stubs_ext.db.models import TypedModelMeta
 
 
 class Vacancy(models.Model):
@@ -39,10 +40,10 @@ class Vacancy(models.Model):
 
     objects = VacancyManager()
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"Vacancy<{self.id}> - {self.role}"
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Вакансия"
         verbose_name_plural = "Вакансии"
         ordering = ["-datetime_created"]
@@ -88,10 +89,10 @@ class VacancyResponse(models.Model):
 
     objects = VacancyResponseManager()
 
-    def __str__(self):
+    def __str__(self) -> str:
         return f"VacancyResponse<{self.id}> - {self.user} - {self.vacancy}"
 
-    class Meta:
+    class Meta(TypedModelMeta):
         verbose_name = "Отклик на вакансию"
         verbose_name_plural = "Отклик на вакансии"
-        ordering = ["-datetime_created"]
+        ordering = ["-datetime_created"]

vacancy/serializers.py

@@ -12,7 +12,7 @@ class RequiredSkillsSerializerMixin(serializers.Serializer):
     required_skills = CustomListField(child=serializers.CharField())
 
 
-class ProjectForVacancySerializer(serializers.ModelSerializer):
+class ProjectForVacancySerializer(serializers.ModelSerializer[Project]):
     class Meta:
         model = Project
         fields = [
@@ -23,7 +23,7 @@ class Meta:
         ]
 
 
-class VacancyDetailSerializer(serializers.ModelSerializer, RequiredSkillsSerializerMixin):
+class VacancyDetailSerializer(serializers.ModelSerializer, RequiredSkillsSerializerMixin[Vacancy]):
     project = ProjectForVacancySerializer(many=False, read_only=True)
 
     class Meta:
@@ -41,7 +41,7 @@ class Meta:
         read_only_fields = ["project"]
 
 
-class VacancyListSerializer(serializers.ModelSerializer, RequiredSkillsSerializerMixin):
+class VacancyListSerializer(serializers.ModelSerializer, RequiredSkillsSerializerMixin[Vacancy]):
     class Meta:
         model = Vacancy
         fields = [
@@ -57,7 +57,7 @@ class Meta:
 
 
 class ProjectVacancyListSerializer(
-    serializers.ModelSerializer, RequiredSkillsSerializerMixin
+    serializers.ModelSerializer, RequiredSkillsSerializerMixin[Project]
 ):
     class Meta:
         model = Vacancy
@@ -72,7 +72,7 @@ class Meta:
 
 
 class ProjectVacancyCreateListSerializer(
-    serializers.ModelSerializer, RequiredSkillsSerializerMixin
+    serializers.ModelSerializer, RequiredSkillsSerializerMixin[Project]
 ):
     class Meta:
         model = Vacancy
@@ -85,8 +85,18 @@ class Meta:
             "is_active",
         ]
 
+    def create(self, validated_data):
+        if validated_data["project"].draft:
+            validated_data["is_active"] = False
+        else:
+            validated_data["is_active"] = True
+
+        instance = super().create(validated_data)
+
+        return instance
 
-class VacancyResponseListSerializer(serializers.ModelSerializer):
+
+class VacancyResponseListSerializer(serializers.ModelSerializer[VacancyResponse]):
     is_approved = serializers.BooleanField(read_only=True)
     user = UserDetailSerializer(read_only=True)
     user_id = serializers.IntegerField(write_only=True)
@@ -127,23 +137,7 @@ def create(self, validated_data):
         return vacancy_response
 
 
-class VacancyResponseDetailSerializer(serializers.ModelSerializer):
+class VacancyResponseDetailSerializer(serializers.ModelSerializer[VacancyResponse]):
     user = UserDetailSerializer(many=False, read_only=True)
     vacancy = VacancyListSerializer(many=False, read_only=True)
-    is_approved = serializers.BooleanField(read_only=True)
-
-    class Meta:
-        model = VacancyResponse
-        fields = [
-            "id",
-            "user",
-            "vacancy",
-            "why_me",
-            "is_approved",
-            "datetime_created",
-            "datetime_updated",
-        ]
-
-
-class VacancyResponseAcceptSerializer(VacancyResponseDetailSerializer):
-    is_approved = serializers.BooleanField(required=True, read_only=False)
+    is_approve

vacancy/views.py

@@ -12,17 +12,17 @@
     IsVacancyProjectLeader,
 )
 from vacancy.serializers import (
+    ProjectVacancyListSerializer,
     VacancyDetailSerializer,
     VacancyResponseAcceptSerializer,
     VacancyResponseDetailSerializer,
     VacancyResponseListSerializer,
-    ProjectVacancyCreateListSerializer,
 )
 
 
 class VacancyList(generics.ListCreateAPIView):
     queryset = Vacancy.objects.get_vacancy_for_list_view()
-    serializer_class = ProjectVacancyCreateListSerializer
+    serializer_class = ProjectVacancyListSerializer
     permission_classes = [permissions.IsAuthenticatedOrReadOnly]
     filter_backends = (filters.DjangoFilterBackend,)
     filterset_class = VacancyFilter