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

fix broken go live email notification

Browse Source
This commit is contained in:
Kenneth Kehl
2024-11-27 11:12:21 -08:00
parent a1155dff7e
commit a5b83f5eff
2 changed files with 1 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/service/sender.py
View File

@@ -14,7 +14,6 @@ from app.notifications.process_notifications import (
persist_notification,
send_notification_to_queue,
)
from app.utils import hilite
def send_notification_to_service_users(
@@ -25,12 +24,10 @@ def send_notification_to_service_users(
template = dao_get_template_by_id(template_id)
service = dao_fetch_service_by_id(service_id)
active_users = dao_fetch_active_users_for_service(service.id)
print(hilite(f"ACTIVE USERS ARE {active_users}"))
notify_service = dao_fetch_service_by_id(current_app.config["NOTIFY_SERVICE_ID"])
for user in active_users:
personalisation = _add_user_fields(user, personalisation, include_user_fields)
print(hilite(f"PERSONALISATION IS {personalisation}"))
notification = persist_notification(
template_id=template.id,
template_version=template.version,
@@ -46,17 +43,14 @@ def send_notification_to_service_users(
key_type=KeyType.NORMAL,
reply_to_text=notify_service.get_default_reply_to_email_address(),
)
print(hilite(f"NOTIFICATION IS {notification.serialize_for_csv()}"))
redis_store.set(
f"email-personalisation-{notification.id}",
json.dumps(personalisation),
ex=24 * 60 * 60,
)
print(hilite("GOT PAST FIRST SET"))
redis_store.set(
f"email-recipient-{notification.id}", notification.to, ex=24 * 60 * 60
)
print(hilite("GOT PAST SECOND SET"))
send_notification_to_queue(notification, queue=QueueNames.NOTIFY)

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

@@ -3,14 +3,10 @@ from flask import current_app
from sqlalchemy import func, select
from app import db
from app.dao.services_dao import (
dao_add_user_to_service,
dao_fetch_active_users_for_service,
)
from app.dao.services_dao import dao_add_user_to_service
from app.enums import NotificationType, TemplateType
from app.models import Notification
from app.service.sender import send_notification_to_service_users
from app.utils import hilite
from tests.app.db import create_service, create_template, create_user
@@ -93,15 +89,10 @@ def test_send_notification_to_service_users_sends_to_active_users_only(
second_active_user = create_user(email="foo1@bar.com", state="active")
pending_user = create_user(email="foo2@bar.com", state="pending")
service = create_service(user=first_active_user)
print(hilite(f"CREATED THE SERVICE {service} with user {first_active_user}"))
dao_add_user_to_service(service, second_active_user)
print(hilite(f"ADDED user {second_active_user}"))
dao_add_user_to_service(service, pending_user)
print(hilite(f"ADDED PENDING USER {pending_user}"))
active_users = dao_fetch_active_users_for_service(service.id)
print(hilite(f"ACTIVE USERS IN THE TEST {active_users}"))
template = create_template(service, template_type=TemplateType.EMAIL)
send_notification_to_service_users(service_id=service.id, template_id=template.id)