refactored signals code

Author: sh1nkey

feed/constants.py

@@ -0,0 +1,4 @@
+from projects.models import Project
+from vacancy.models import Vacancy
+
+SIGNALS_MODELS = Vacancy | Project

feed/services.py

@@ -0,0 +1,18 @@
+from django.contrib.contenttypes.models import ContentType
+
+from feed.constants import SIGNALS_MODELS
+from news.models import News
+
+
+def delete_news_for_model(instance: SIGNALS_MODELS):
+    content_type = ContentType.objects.get_for_model(instance)
+    obj = News.objects.filter(content_type=content_type, object_id=instance.id).first()
+    if obj:
+        obj.delete()
+
+
+def create_news_for_model(instance: SIGNALS_MODELS):
+    content_type = ContentType.objects.get_for_model(instance)
+    news_instance, created = News.objects.get_or_create(
+        content_type=content_type, object_id=instance.id
+    )

feed/signals.py

@@ -1,26 +1,33 @@
-from django.contrib.contenttypes.models import ContentType
-from django.db.models.signals import post_save
+from django.db.models.signals import post_save, post_delete
 from django.dispatch import receiver
 
-from news.models import News
+from feed.services import create_news_for_model, delete_news_for_model
 from projects.models import Project
 
 from vacancy.models import Vacancy
 
 
 @receiver(post_save, sender=Vacancy)
 def create_news_on_save(sender, instance, created, **kwargs):
-    if created:
-        content_type = ContentType.objects.get_for_model(Vacancy)
-        news_instance, created = News.objects.get_or_create(
-            content_type=content_type, object_id=instance.id
-        )
+    if instance.is_active:
+        create_news_for_model(instance)
+    else:
+        delete_news_for_model(instance)
+
+
+@receiver(post_delete, sender=Vacancy)
+def delete_news_vacancy(sender, instance, **kwargs):
+    delete_news_for_model(instance)
 
 
 @receiver(post_save, sender=Project)
 def create_news_on_created_project(sender, instance, created, **kwargs):
     if not instance.draft:
-        content_type = ContentType.objects.get_for_model(Project)
-        news_instance, created = News.objects.get_or_create(
-            content_type=content_type, object_id=instance.id
-        )
+        create_news_for_model(instance)
+    else:
+        delete_news_for_model(instance)
+
+
+@receiver(post_delete, sender=Project)
+def delete_news_project(sender, instance, **kwargs):
+    delete_news_for_model(instance)

feed/views.py

@@ -80,4 +80,5 @@ def create(self, request):
                     object_id=vacancy.id,
                     datetime_created=vacancy.datetime_created,
                 )
+
         return Response({"status": "success"}, status=201)