Merge pull request #326 from PROCOLLAB-github/feed_vacancies_hotfix

added signals for not displaying vacancies of draft project

Author: sh1nkey

projects/signals.py

@@ -2,7 +2,9 @@
 from django.dispatch import receiver
 
 from chats.models import ProjectChat
+from feed.services import delete_news_for_model, create_news_for_model
 from projects.models import Collaborator, Project
+from vacancy.models import Vacancy
 
 
 @receiver(post_save, sender=Project)
@@ -18,3 +20,21 @@ def create_project(sender, instance, created, **kwargs):
         Collaborator.objects.create(
             user=instance.leader, project=instance, role="Основатель"
         )
+
+
+@receiver(post_save, sender=Project)
+def update_vacancy(sender, instance, created, **kwargs):
+    vacancies = Vacancy.objects.filter(project=instance)
+    old_values = vacancies.values_list("is_active", flat=True)
+    vacancies.update(is_active=False if instance.draft else True)
+    new_values = vacancies.values_list("is_active", flat=True)
+
+    vacancies_list = list(vacancies)
+
+    for i in range(len(new_values)):
+        old = old_values[i]
+        new = new_values[i]
+        if old != new and new is False:
+            delete_news_for_model(vacancies_list[i])
+        elif old != new and new is True:
+            create_news_for_model(vacancies_list[i])

vacancy/serializers.py

@@ -1,7 +1,6 @@
 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, CustomListField
 from vacancy.models import Vacancy, VacancyResponse
@@ -86,6 +85,16 @@ 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):
     is_approved = serializers.BooleanField(read_only=True)

vacancy/tests.py

@@ -21,18 +21,20 @@ def setUp(self):
         self.vacancy_list_view = VacancyList.as_view()
         self.vacancy_detail_view = VacancyDetail.as_view()
         self.user_project_owner = self.user_create()
+
+        self.created_project = Project.objects.create(
+            name="Test",
+            description="Test",
+            industry=Industry.objects.create(name="Test"),
+            step=1,
+            leader=self.user_project_owner,
+        )
         self.vacancy_create_data = {
             "role": "Test",
             "required_skills": ["Test"],
             "description": "Test",
             "is_active": True,
-            "project": Project.objects.create(
-                name="Test",
-                description="Test",
-                industry=Industry.objects.create(name="Test"),
-                step=1,
-                leader=self.user_project_owner,
-            ).id,
+            "project": self.created_project.id,
         }
 
     def test_vacancy_creation(self):
@@ -44,7 +46,7 @@ def test_vacancy_creation(self):
         self.assertEqual(response.data["role"], "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["is_active"], not self.created_project.draft)
         self.assertEqual(response.data["project"], self.vacancy_create_data["project"])
 
     def user_create(self):