Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(notification): mettre à jour le sent_at pour éviter les notifications duplicates #707

Merged
merged 2 commits into from
Jul 3, 2024
Merged

fix(notification): mettre à jour le sent_at pour éviter les notifications duplicates #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29fe7ad
fix(notification): mis à jour le champ sent_at
calummackervoy Jul 3, 2024
8fb4a39
fix(notification): mettre à jour le champ sent_at et tester
calummackervoy Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 8 additions & 5 deletions lacommunaute/notification/tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from django.conf import settings
from django.template.defaultfilters import pluralize
from django.urls import reverse
from django.utils import timezone

from config.settings.base import DEFAULT_FROM_EMAIL, NEW_MESSAGES_EMAIL_MAX_PREVIEW, SIB_NEW_MESSAGES_TEMPLATE
from lacommunaute.forum.models import Forum
Expand All @@ -14,12 +15,12 @@
def send_messages_notifications(delay: NotificationDelay):
"""Notifications are scheduled in the application and then processed later by this task"""

notifications = Notification.objects.filter(delay=delay, sent_at__isnull=True, post__isnull=False).select_related(
"post", "post__topic", "post__poster"
)

def get_grouped_notifications():
return (
Notification.objects.filter(delay=delay, sent_at__isnull=True, post__isnull=False)
.select_related("post", "post__topic", "post__poster")
.group_by_recipient()
)
return notifications.group_by_recipient()

grouped_notifications = get_grouped_notifications()
for recipient in grouped_notifications.keys():
Expand All @@ -40,6 +41,8 @@ def get_grouped_notifications():
template_id=SIB_NEW_MESSAGES_TEMPLATE,
)

notifications.update(sent_at=timezone.now())


def add_user_to_list_when_register():
new_users = collect_new_users_for_onboarding()
Expand Down
8 changes: 7 additions & 1 deletion lacommunaute/notification/tests/tests_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ def test_send_messages_notifications_asap(self):
email_sent_track.datas, self.get_expected_email_payload(Notification.objects.filter(id=notification.id))
)

self.assertIsNone(Notification.objects.filter(sent_at__isnull=True).first())
self.assertEqual(Notification.objects.all().values("sent_at").distinct().count(), 1)

@respx.mock
def test_send_messages_notifications_day(self):
topic = TopicFactory(with_post=True)
Expand All @@ -97,6 +100,9 @@ def test_send_messages_notifications_day(self):
email_sent_track.datas, self.get_expected_email_payload(Notification.objects.filter(id=notification.id))
)

self.assertIsNone(Notification.objects.filter(sent_at__isnull=True).first())
self.assertEqual(Notification.objects.all().values("sent_at").distinct().count(), 1)

@respx.mock
def test_send_messages_notifications_max_messages_preview(self):
topic = TopicFactory(with_post=True)
Expand All @@ -121,7 +127,7 @@ def test_send_messages_notifications_max_messages_preview(self):

@respx.mock
def test_send_messages_notifications_num_queries(self):
expected_queries = 1
expected_queries = 2

NotificationFactory(delay=NotificationDelay.ASAP)

Expand Down
Loading