+пару полей в эндпоинт уведомлений, -комменты

Reagent992 · Jan 27, 2024 · 84e9142 · 84e9142
1 parent e352ad2
commit 84e9142
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 14 deletions.
diff --git a/api/v1/serializers/api/notifications_serializer.py b/api/v1/serializers/api/notifications_serializer.py
@@ -9,13 +9,19 @@ class NotificationSerializer(serializers.ModelSerializer):
 
     recipient = CustomUserSerializer(read_only=True, many=False)
     actor = CustomUserSerializer(read_only=True, many=False)
+    target_object_id = serializers.IntegerField(read_only=True)
+    target_content_type = serializers.CharField(
+        source="target.__class__.__name__", read_only=True
+    )
 
     class Meta:
         model = Notification
         fields = (
             "id",
             "verb",
             "unread",
+            "target_object_id",
+            "target_content_type",
             "timestamp",
             "recipient",
             "actor",

diff --git a/core/signals.py b/core/signals.py
@@ -2,7 +2,6 @@
 from django.dispatch import receiver
 from notifications.signals import notify
 
-from comments.models import Comment
 from ipr.models import IPR
 from tasks.models import Task
 
@@ -11,6 +10,7 @@
 def created_ipr_notification(sender, instance: IPR, created, **kwargs):
     """Создание уведомления о новом ИПР."""
     if created:
+        # TODO: Улучшить текст
         text = "Вам назначен новый ИПР"
         notify.send(
             sender=instance.creator,
@@ -19,6 +19,7 @@ def created_ipr_notification(sender, instance: IPR, created, **kwargs):
             target=instance,
         )
     else:
+        # TODO: Улучшить текст
         text = "Изменение в ИПР."
         notify.send(
             sender=instance.creator,
@@ -48,16 +49,3 @@ def created_task_notification(sender, instance: Task, created, **kwargs):
             verb=text,
             target=instance,
         )
-
-
-@receiver(post_save, sender=Comment)
-def created_comment_notification(sender, instance: Comment, created, **kwargs):
-    """Создание уведомления о новом комментарии."""
-    if created:
-        text = "Новый комментарий"
-        notify.send(
-            sender=instance.author,
-            recipient=instance.ipr.executor,
-            verb=text,
-            target=instance,
-        )