darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2026-08-20 14:29:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into notify-300b

Browse Source
This commit is contained in:
stvnrlly
2023-08-31 10:28:44 -04:00
parent 48ce584773 85de5bfc63
commit bf33ed7173
706 changed files with 40498 additions and 30898 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
app/service/send_notification.py
View File

@@ -12,7 +12,6 @@ from app.notifications.process_notifications import (
send_notification_to_queue,
)
from app.notifications.validators import (
check_service_over_daily_message_limit,
check_service_over_total_message_limit,
validate_and_format_recipient,
validate_template,
@@ -23,9 +22,10 @@ from app.v2.errors import BadRequestError
def validate_created_by(service, created_by_id):
user = get_user_by_id(created_by_id)
if service not in user.services:
message = 'Can’t create notification - {} is not part of the "{}" service'.format(
user.name,
service.name
message = (
'Can’t create notification - {} is not part of the "{}" service'.format(
user.name, service.name
)
)
raise BadRequestError(message=message)
@@ -38,20 +38,17 @@ def create_one_off_reference(template_type):
def send_one_off_notification(service_id, post_data):
service = dao_fetch_service_by_id(service_id)
template = dao_get_template_by_id_and_service_id(
template_id=post_data['template_id'],
service_id=service_id
template_id=post_data["template_id"], service_id=service_id
)
personalisation = post_data.get('personalisation', None)
personalisation = post_data.get("personalisation", None)
validate_template(template.id, personalisation, service, template.template_type)
check_service_over_daily_message_limit(KEY_TYPE_NORMAL, service)
check_service_over_total_message_limit(KEY_TYPE_NORMAL, service)
validate_and_format_recipient(
send_to=post_data['to'],
send_to=post_data["to"],
key_type=KEY_TYPE_NORMAL,
service=service,
notification_type=template.template_type,
@@ -59,39 +56,38 @@ def send_one_off_notification(service_id, post_data):
)
client_reference = None
validate_created_by(service, post_data['created_by'])
validate_created_by(service, post_data["created_by"])
sender_id = post_data.get('sender_id', None)
sender_id = post_data.get("sender_id", None)
reply_to = get_reply_to_text(
notification_type=template.template_type,
sender_id=sender_id,
service=service,
template=template
template=template,
)
notification = persist_notification(
template_id=template.id,
template_version=template.version,
recipient=post_data['to'],
recipient=post_data["to"],
service=service,
personalisation=personalisation,
notification_type=template.template_type,
api_key_id=None,
key_type=KEY_TYPE_NORMAL,
created_by_id=post_data['created_by'],
created_by_id=post_data["created_by"],
reply_to_text=reply_to,
reference=create_one_off_reference(template.template_type),
client_reference=client_reference
client_reference=client_reference,
)
queue_name = QueueNames.PRIORITY if template.process_type == PRIORITY else None
send_notification_to_queue(
notification=notification,
research_mode=service.research_mode,
queue=queue_name,
)
return {'id': str(notification.id)}
return {"id": str(notification.id)}
def get_reply_to_text(notification_type, sender_id, service, template):
@@ -99,11 +95,13 @@ def get_reply_to_text(notification_type, sender_id, service, template):
if sender_id:
try:
if notification_type == EMAIL_TYPE:
message = 'Reply to email address not found'
message = "Reply to email address not found"
reply_to = dao_get_reply_to_by_id(service.id, sender_id).email_address
elif notification_type == SMS_TYPE:
message = 'SMS sender not found'
reply_to = dao_get_service_sms_senders_by_id(service.id, sender_id).get_reply_to_text()
message = "SMS sender not found"
reply_to = dao_get_service_sms_senders_by_id(
service.id, sender_id
).get_reply_to_text()
except NoResultFound:
raise BadRequestError(message=message)
else: