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

Merge branch 'add-reply-to-notifications' of github.com:alphagov/notifications-api into add-reply-to-notifications

Browse Source
This commit is contained in:
Rebecca Law
2017-11-23 16:57:17 +00:00
parent df2d3a95ae 75d99ea397
commit e0d0b2f4fd
5 changed files with 63 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/v2/notifications/post_notifications.py
View File

@@ -63,15 +63,12 @@ def post_notification(notification_type):
check_service_has_permission(notification_type, authenticated_service.permissions)
scheduled_for = form.get("scheduled_for", None)
service_email_reply_to_id = form.get("email_reply_to_id", None)
service_sms_sender_id = form.get("sms_sender_id", None)
check_service_can_schedule_notification(authenticated_service.permissions, scheduled_for)
check_rate_limiting(authenticated_service, api_user)
check_service_email_reply_to_id(str(authenticated_service.id), service_email_reply_to_id, notification_type)
sms_sender = check_service_sms_sender_id(str(authenticated_service.id), service_sms_sender_id, notification_type)
reply_to = get_reply_to_text(notification_type, form)
template, template_with_content = validate_template(
form['template_id'],
@@ -93,13 +90,13 @@ def post_notification(notification_type):
api_key=api_user,
template=template,
service=authenticated_service,
reply_to_text=sms_sender,
reply_to_text=reply_to
)
if notification_type == SMS_TYPE:
create_resp_partial = functools.partial(
create_post_sms_response_from_notification,
from_number=sms_sender or authenticated_service.get_default_sms_sender()
from_number=reply_to
)
elif notification_type == EMAIL_TYPE:
create_resp_partial = functools.partial(
@@ -196,3 +193,23 @@ def process_letter_notification(*, letter_data, api_key, template):
)
return notification
def get_reply_to_text(notification_type, form):
service_email_reply_to_id = form.get("email_reply_to_id", None)
service_sms_sender_id = form.get("sms_sender_id", None)
reply_to = None
if notification_type == EMAIL_TYPE:
reply_to = check_service_email_reply_to_id(
str(authenticated_service.id), service_email_reply_to_id, notification_type
) or authenticated_service.get_default_reply_to_email_address()
elif notification_type == SMS_TYPE:
reply_to = check_service_sms_sender_id(
str(authenticated_service.id), service_sms_sender_id, notification_type
) or authenticated_service.get_default_sms_sender()
elif notification_type == LETTER_TYPE:
reply_to = authenticated_service.get_default_letter_contact()
return reply_to