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

Merge pull request #816 from alphagov/refactor-send_to_providers

Browse Source 
Small refactor to reuse code.
This commit is contained in:
Rebecca Law
2017-02-07 17:27:51 +00:00
committed by GitHub
parent 85b441b445 c36d61c071
commit 08e39d4b93
2 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/delivery/send_to_providers.py
View File

@@ -21,11 +21,7 @@ from app.models import SMS_TYPE, KEY_TYPE_TEST, BRANDING_ORG, EMAIL_TYPE, NOTIFI
def send_sms_to_provider(notification):
service = notification.service
if not service.active:
notification.status = NOTIFICATION_TECHNICAL_FAILURE
dao_update_notification(notification)
current_app.logger.warn(
"Send sms for notification id {} to provider is not allowed: service {} is inactive".format(notification.id,
service.id))
technical_failure(notification=notification)
return
if notification.status == 'created':
@@ -70,12 +66,7 @@ def send_sms_to_provider(notification):
def send_email_to_provider(notification):
service = notification.service
if not service.active:
notification.status = NOTIFICATION_TECHNICAL_FAILURE
dao_update_notification(notification)
current_app.logger.warn(
"Send email for notification id {} to provider is not allowed: service {} is inactive".format(
notification.id,
service.id))
technical_failure(notification=notification)
return
if notification.status == 'created':
provider = provider_to_use(EMAIL_TYPE, notification.id)
@@ -199,3 +190,13 @@ def get_html_email_options(service):
branding = {}
return dict(govuk_banner=govuk_banner, **branding)
def technical_failure(notification):
notification.status = NOTIFICATION_TECHNICAL_FAILURE
dao_update_notification(notification)
current_app.logger.warn(
"Send {} for notification id {} to provider is not allowed: service {} is inactive".format(
notification.notification_type,
notification.id,
notification.service_id))