taiga
/
taiga-back
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Making notifications work synchronously by default

remotes/origin/enhancement/email-actions
Alejandro Alonso 2014-10-28 18:26:30 +01:00
parent 864734c97e
commit 08b8d478e1
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
settings/common.py
View File

@ -332,7 +332,10 @@ TAGS_PREDEFINED_COLORS = ["#fce94f", "#edd400", "#c4a000", "#8ae234",
FEEDBACK_ENABLED = True FEEDBACK_ENABLED = True
FEEDBACK_EMAIL = "support@taiga.io" FEEDBACK_EMAIL = "support@taiga.io"
CHANGE_NOTIFICATIONS_MIN_INTERVAL = 30 #seconds # 0 notifications will work in a synchronous way
# >0 an external process will check the pending notifications and will send them
# collapsed during that interval
CHANGE_NOTIFICATIONS_MIN_INTERVAL = 0 #seconds
# NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE # NOTE: DON'T INSERT MORE SETTINGS AFTER THIS LINE
TEST_RUNNER="django.test.runner.DiscoverRunner" TEST_RUNNER="django.test.runner.DiscoverRunner"

3
taiga/projects/notifications/services.py
View File

@ -205,6 +205,9 @@ def send_notifications(obj, *, history):
for notify_user in notify_users: for notify_user in notify_users:
notification.notify_users.add(notify_user) notification.notify_users.add(notify_user)
# If we are the min interval is 0 it just work in a synchronous and spamming way
if settings.CHANGE_NOTIFICATIONS_MIN_INTERVAL == 0:
send_sync_notifications(notification.id)
@transaction.atomic @transaction.atomic
def send_sync_notifications(notification_id): def send_sync_notifications(notification_id):

10
tests/integration/test_notifications.py
View File

@ -17,6 +17,7 @@
import json import json
import pytest import pytest
import time
from unittest.mock import MagicMock, patch from unittest.mock import MagicMock, patch
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
@ -147,7 +148,7 @@ def test_users_to_notify():
assert len(users) == 2 assert len(users) == 2
assert users == {member1.user, issue.get_owner()} assert users == {member1.user, issue.get_owner()}
@set_settings(CHANGE_NOTIFICATIONS_MIN_INTERVAL=0) @set_settings(CHANGE_NOTIFICATIONS_MIN_INTERVAL=1)
def test_send_notifications_using_services_method(mail): def test_send_notifications_using_services_method(mail):
project = f.ProjectFactory.create() project = f.ProjectFactory.create()
member1 = f.MembershipFactory.create(project=project) member1 = f.MembershipFactory.create(project=project)
@ -219,11 +220,11 @@ def test_send_notifications_using_services_method(mail):
assert models.HistoryChangeNotification.objects.count() == 12 assert models.HistoryChangeNotification.objects.count() == 12
assert len(mail.outbox) == 0 assert len(mail.outbox) == 0
time.sleep(1)
services.process_sync_notifications() services.process_sync_notifications()
assert len(mail.outbox) == 12 assert len(mail.outbox) == 12
@set_settings(CHANGE_NOTIFICATIONS_MIN_INTERVAL=0) @set_settings(CHANGE_NOTIFICATIONS_MIN_INTERVAL=1)
def test_resource_notification_test(client, mail): def test_resource_notification_test(client, mail):
user1 = f.UserFactory.create() user1 = f.UserFactory.create()
user2 = f.UserFactory.create() user2 = f.UserFactory.create()
@ -242,9 +243,9 @@ def test_resource_notification_test(client, mail):
data = {"subject": "Fooooo", "version": issue.version} data = {"subject": "Fooooo", "version": issue.version}
response = client.patch(url, json.dumps(data), content_type="application/json") response = client.patch(url, json.dumps(data), content_type="application/json")
assert response.status_code == 200 assert response.status_code == 200
assert len(mail.outbox) == 0 assert len(mail.outbox) == 0
assert models.HistoryChangeNotification.objects.count() == 1 assert models.HistoryChangeNotification.objects.count() == 1
time.sleep(1)
services.process_sync_notifications() services.process_sync_notifications()
assert len(mail.outbox) == 1 assert len(mail.outbox) == 1
assert models.HistoryChangeNotification.objects.count() == 0 assert models.HistoryChangeNotification.objects.count() == 0
@ -254,6 +255,7 @@ def test_resource_notification_test(client, mail):
assert response.status_code == 204 assert response.status_code == 204
assert len(mail.outbox) == 1 assert len(mail.outbox) == 1
assert models.HistoryChangeNotification.objects.count() == 1 assert models.HistoryChangeNotification.objects.count() == 1
time.sleep(1)
services.process_sync_notifications() services.process_sync_notifications()
assert len(mail.outbox) == 2 assert len(mail.outbox) == 2
assert models.HistoryChangeNotification.objects.count() == 0 assert models.HistoryChangeNotification.objects.count() == 0