mirror of
https://github.com/GSA/notifications-api.git
synced 2025-12-17 10:42:25 -05:00
This commit modifies the code paths the admin app uses to send one off emails and text messages to also accept letters. This mostly worked already, the two changes were: - making sure that one-off letters are processed by the correct task, from the correct queue - one-off letters sent from a service in research mode don’t get put on a queue and go straight to `delivered` (because we don’t want to send them for real)
185 lines
6.6 KiB
Python
185 lines
6.6 KiB
Python
import uuid
|
|
from datetime import datetime
|
|
|
|
from flask import current_app
|
|
|
|
from notifications_utils.clients import redis
|
|
from notifications_utils.recipients import (
|
|
get_international_phone_info,
|
|
validate_and_format_phone_number,
|
|
format_email_address
|
|
)
|
|
|
|
from app import redis_store
|
|
from app.celery import provider_tasks
|
|
from app.celery.letters_pdf_tasks import create_letters_pdf
|
|
from app.config import QueueNames
|
|
|
|
from app.models import (
|
|
EMAIL_TYPE,
|
|
KEY_TYPE_TEST,
|
|
SMS_TYPE,
|
|
LETTER_TYPE,
|
|
NOTIFICATION_CREATED,
|
|
Notification,
|
|
ScheduledNotification
|
|
)
|
|
from app.dao.notifications_dao import (
|
|
dao_create_notification,
|
|
dao_delete_notifications_and_history_by_id,
|
|
dao_created_scheduled_notification
|
|
)
|
|
|
|
from app.v2.errors import BadRequestError
|
|
from app.utils import (
|
|
cache_key_for_service_template_counter,
|
|
cache_key_for_service_template_usage_per_day,
|
|
convert_bst_to_utc,
|
|
convert_utc_to_bst,
|
|
get_template_instance,
|
|
)
|
|
|
|
|
|
def create_content_for_notification(template, personalisation):
|
|
template_object = get_template_instance(template.__dict__, personalisation)
|
|
check_placeholders(template_object)
|
|
|
|
return template_object
|
|
|
|
|
|
def check_placeholders(template_object):
|
|
if template_object.missing_data:
|
|
message = 'Missing personalisation: {}'.format(", ".join(template_object.missing_data))
|
|
raise BadRequestError(fields=[{'template': message}], message=message)
|
|
|
|
|
|
def persist_notification(
|
|
*,
|
|
template_id,
|
|
template_version,
|
|
recipient,
|
|
service,
|
|
personalisation,
|
|
notification_type,
|
|
api_key_id,
|
|
key_type,
|
|
created_at=None,
|
|
job_id=None,
|
|
job_row_number=None,
|
|
reference=None,
|
|
client_reference=None,
|
|
notification_id=None,
|
|
simulated=False,
|
|
created_by_id=None,
|
|
status=NOTIFICATION_CREATED,
|
|
reply_to_text=None,
|
|
billable_units=None
|
|
):
|
|
notification_created_at = created_at or datetime.utcnow()
|
|
if not notification_id:
|
|
notification_id = uuid.uuid4()
|
|
notification = Notification(
|
|
id=notification_id,
|
|
template_id=template_id,
|
|
template_version=template_version,
|
|
to=recipient,
|
|
service_id=service.id,
|
|
service=service,
|
|
personalisation=personalisation,
|
|
notification_type=notification_type,
|
|
api_key_id=api_key_id,
|
|
key_type=key_type,
|
|
created_at=notification_created_at,
|
|
job_id=job_id,
|
|
job_row_number=job_row_number,
|
|
client_reference=client_reference,
|
|
reference=reference,
|
|
created_by_id=created_by_id,
|
|
status=status,
|
|
reply_to_text=reply_to_text,
|
|
billable_units=billable_units
|
|
)
|
|
|
|
if notification_type == SMS_TYPE:
|
|
formatted_recipient = validate_and_format_phone_number(recipient, international=True)
|
|
recipient_info = get_international_phone_info(formatted_recipient)
|
|
notification.normalised_to = formatted_recipient
|
|
notification.international = recipient_info.international
|
|
notification.phone_prefix = recipient_info.country_prefix
|
|
notification.rate_multiplier = recipient_info.billable_units
|
|
elif notification_type == EMAIL_TYPE:
|
|
notification.normalised_to = format_email_address(notification.to)
|
|
elif notification_type == LETTER_TYPE:
|
|
notification.postage = service.postage
|
|
|
|
# if simulated create a Notification model to return but do not persist the Notification to the dB
|
|
if not simulated:
|
|
dao_create_notification(notification)
|
|
if key_type != KEY_TYPE_TEST:
|
|
if redis_store.get(redis.daily_limit_cache_key(service.id)):
|
|
redis_store.incr(redis.daily_limit_cache_key(service.id))
|
|
if redis_store.get_all_from_hash(cache_key_for_service_template_counter(service.id)):
|
|
redis_store.increment_hash_value(cache_key_for_service_template_counter(service.id), template_id)
|
|
|
|
increment_template_usage_cache(service.id, template_id, notification_created_at)
|
|
|
|
current_app.logger.info(
|
|
"{} {} created at {}".format(notification_type, notification_id, notification_created_at)
|
|
)
|
|
return notification
|
|
|
|
|
|
def increment_template_usage_cache(service_id, template_id, created_at):
|
|
key = cache_key_for_service_template_usage_per_day(service_id, convert_utc_to_bst(created_at))
|
|
redis_store.increment_hash_value(key, template_id)
|
|
# set key to expire in eight days - we don't know if we've just created the key or not, so must assume that we
|
|
# have and reset the expiry. Eight days is longer than any notification is in the notifications table, so we'll
|
|
# always capture the full week's numbers
|
|
redis_store.expire(key, current_app.config['EXPIRE_CACHE_EIGHT_DAYS'])
|
|
|
|
|
|
def send_notification_to_queue(notification, research_mode, queue=None):
|
|
if research_mode or notification.key_type == KEY_TYPE_TEST:
|
|
queue = QueueNames.RESEARCH_MODE
|
|
|
|
if notification.notification_type == SMS_TYPE:
|
|
if not queue:
|
|
queue = QueueNames.SEND_SMS
|
|
deliver_task = provider_tasks.deliver_sms
|
|
if notification.notification_type == EMAIL_TYPE:
|
|
if not queue:
|
|
queue = QueueNames.SEND_EMAIL
|
|
deliver_task = provider_tasks.deliver_email
|
|
if notification.notification_type == LETTER_TYPE:
|
|
if not queue:
|
|
queue = QueueNames.CREATE_LETTERS_PDF
|
|
deliver_task = create_letters_pdf
|
|
|
|
try:
|
|
deliver_task.apply_async([str(notification.id)], queue=queue)
|
|
except Exception:
|
|
dao_delete_notifications_and_history_by_id(notification.id)
|
|
raise
|
|
|
|
current_app.logger.debug(
|
|
"{} {} sent to the {} queue for delivery".format(notification.notification_type,
|
|
notification.id,
|
|
queue))
|
|
|
|
|
|
def simulated_recipient(to_address, notification_type):
|
|
if notification_type == SMS_TYPE:
|
|
formatted_simulated_numbers = [
|
|
validate_and_format_phone_number(number) for number in current_app.config['SIMULATED_SMS_NUMBERS']
|
|
]
|
|
return to_address in formatted_simulated_numbers
|
|
else:
|
|
return to_address in current_app.config['SIMULATED_EMAIL_ADDRESSES']
|
|
|
|
|
|
def persist_scheduled_notification(notification_id, scheduled_for):
|
|
scheduled_datetime = convert_bst_to_utc(datetime.strptime(scheduled_for, "%Y-%m-%d %H:%M"))
|
|
scheduled_notification = ScheduledNotification(notification_id=notification_id,
|
|
scheduled_for=scheduled_datetime)
|
|
dao_created_scheduled_notification(scheduled_notification)
|