darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-02-05 02:41:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1443 from GSA/notify-api-1442

Browse Source 
fix broken go live email notification
This commit is contained in:
Carlo Costino
2024-12-02 16:50:06 -05:00
committed by GitHub
parent 7a90722f31 a5b83f5eff
commit fe033b0d7b
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/celery/provider_tasks.py
View File

@@ -170,7 +170,7 @@ def deliver_sms(self, notification_id):
@notify_celery.task( @notify_celery.task(
bind=True, name="deliver_email", max_retries=48, default_retry_delay=300 bind=True, name="deliver_email", max_retries=48, default_retry_delay=30
) )
def deliver_email(self, notification_id): def deliver_email(self, notification_id):
try: try:
@@ -182,8 +182,12 @@ def deliver_email(self, notification_id):
if not notification: if not notification:
raise NoResultFound() raise NoResultFound()
personalisation = redis_store.get(f"email-personalisation-{notification_id}") personalisation = redis_store.get(f"email-personalisation-{notification_id}")
recipient = redis_store.get(f"email-recipient-{notification_id}")
if personalisation:
notification.personalisation = json.loads(personalisation) notification.personalisation = json.loads(personalisation)
if recipient:
notification.recipient = json.loads(recipient)
send_to_providers.send_email_to_provider(notification) send_to_providers.send_email_to_provider(notification)
except EmailClientNonRetryableException: except EmailClientNonRetryableException:
current_app.logger.exception(f"Email notification {notification_id} failed") current_app.logger.exception(f"Email notification {notification_id} failed")

12
app/service/sender.py
View File

@@ -1,5 +1,8 @@
import json
from flask import current_app from flask import current_app
from app import redis_store
from app.config import QueueNames from app.config import QueueNames
from app.dao.services_dao import ( from app.dao.services_dao import (
dao_fetch_active_users_for_service, dao_fetch_active_users_for_service,
@@ -40,6 +43,15 @@ def send_notification_to_service_users(
key_type=KeyType.NORMAL, key_type=KeyType.NORMAL,
reply_to_text=notify_service.get_default_reply_to_email_address(), reply_to_text=notify_service.get_default_reply_to_email_address(),
) )
redis_store.set(
f"email-personalisation-{notification.id}",
json.dumps(personalisation),
ex=24 * 60 * 60,
)
redis_store.set(
f"email-recipient-{notification.id}", notification.to, ex=24 * 60 * 60
)
send_notification_to_queue(notification, queue=QueueNames.NOTIFY) send_notification_to_queue(notification, queue=QueueNames.NOTIFY)

4
tests/app/service/test_sender.py
View File

@@ -58,6 +58,7 @@ def test_send_notification_to_service_users_includes_user_fields_in_personalisat
): ):
persist_mock = mocker.patch("app.service.sender.persist_notification") persist_mock = mocker.patch("app.service.sender.persist_notification")
mocker.patch("app.service.sender.send_notification_to_queue") mocker.patch("app.service.sender.send_notification_to_queue")
mocker.patch("app.service.sender.redis_store")
user = sample_service.users[0] user = sample_service.users[0]
@@ -82,13 +83,16 @@ def test_send_notification_to_service_users_sends_to_active_users_only(
notify_service, mocker notify_service, mocker
): ):
mocker.patch("app.service.sender.send_notification_to_queue") mocker.patch("app.service.sender.send_notification_to_queue")
mocker.patch("app.service.sender.redis_store", autospec=True)
first_active_user = create_user(email="foo@bar.com", state="active") first_active_user = create_user(email="foo@bar.com", state="active")
second_active_user = create_user(email="foo1@bar.com", state="active") second_active_user = create_user(email="foo1@bar.com", state="active")
pending_user = create_user(email="foo2@bar.com", state="pending") pending_user = create_user(email="foo2@bar.com", state="pending")
service = create_service(user=first_active_user) service = create_service(user=first_active_user)
dao_add_user_to_service(service, second_active_user) dao_add_user_to_service(service, second_active_user)
dao_add_user_to_service(service, pending_user) dao_add_user_to_service(service, pending_user)
template = create_template(service, template_type=TemplateType.EMAIL) template = create_template(service, template_type=TemplateType.EMAIL)
send_notification_to_service_users(service_id=service.id, template_id=template.id) send_notification_to_service_users(service_id=service.id, template_id=template.id)