mirror of
https://github.com/GSA/notifications-api.git
synced 2026-02-04 10:21:14 -05:00
fix broken go live email notification
This commit is contained in:
@@ -14,7 +14,6 @@ from app.notifications.process_notifications import (
|
|||||||
persist_notification,
|
persist_notification,
|
||||||
send_notification_to_queue,
|
send_notification_to_queue,
|
||||||
)
|
)
|
||||||
from app.utils import hilite
|
|
||||||
|
|
||||||
|
|
||||||
def send_notification_to_service_users(
|
def send_notification_to_service_users(
|
||||||
@@ -25,12 +24,10 @@ def send_notification_to_service_users(
|
|||||||
template = dao_get_template_by_id(template_id)
|
template = dao_get_template_by_id(template_id)
|
||||||
service = dao_fetch_service_by_id(service_id)
|
service = dao_fetch_service_by_id(service_id)
|
||||||
active_users = dao_fetch_active_users_for_service(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"])
|
notify_service = dao_fetch_service_by_id(current_app.config["NOTIFY_SERVICE_ID"])
|
||||||
|
|
||||||
for user in active_users:
|
for user in active_users:
|
||||||
personalisation = _add_user_fields(user, personalisation, include_user_fields)
|
personalisation = _add_user_fields(user, personalisation, include_user_fields)
|
||||||
print(hilite(f"PERSONALISATION IS {personalisation}"))
|
|
||||||
notification = persist_notification(
|
notification = persist_notification(
|
||||||
template_id=template.id,
|
template_id=template.id,
|
||||||
template_version=template.version,
|
template_version=template.version,
|
||||||
@@ -46,17 +43,14 @@ 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(),
|
||||||
)
|
)
|
||||||
print(hilite(f"NOTIFICATION IS {notification.serialize_for_csv()}"))
|
|
||||||
redis_store.set(
|
redis_store.set(
|
||||||
f"email-personalisation-{notification.id}",
|
f"email-personalisation-{notification.id}",
|
||||||
json.dumps(personalisation),
|
json.dumps(personalisation),
|
||||||
ex=24 * 60 * 60,
|
ex=24 * 60 * 60,
|
||||||
)
|
)
|
||||||
print(hilite("GOT PAST FIRST SET"))
|
|
||||||
redis_store.set(
|
redis_store.set(
|
||||||
f"email-recipient-{notification.id}", notification.to, ex=24 * 60 * 60
|
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)
|
send_notification_to_queue(notification, queue=QueueNames.NOTIFY)
|
||||||
|
|
||||||
|
|||||||
@@ -3,14 +3,10 @@ from flask import current_app
|
|||||||
from sqlalchemy import func, select
|
from sqlalchemy import func, select
|
||||||
|
|
||||||
from app import db
|
from app import db
|
||||||
from app.dao.services_dao import (
|
from app.dao.services_dao import dao_add_user_to_service
|
||||||
dao_add_user_to_service,
|
|
||||||
dao_fetch_active_users_for_service,
|
|
||||||
)
|
|
||||||
from app.enums import NotificationType, TemplateType
|
from app.enums import NotificationType, TemplateType
|
||||||
from app.models import Notification
|
from app.models import Notification
|
||||||
from app.service.sender import send_notification_to_service_users
|
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
|
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")
|
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)
|
||||||
print(hilite(f"CREATED THE SERVICE {service} with user {first_active_user}"))
|
|
||||||
dao_add_user_to_service(service, second_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)
|
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)
|
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)
|
||||||
|
|||||||
Reference in New Issue
Block a user