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

Notification not created in send_sms or send_email when service is in restricted mode.

Browse Source
This commit is contained in:
Nicholas Staples
2016-05-31 14:55:06 +01:00
parent 8710c103f7
commit 79dfc360f2
2 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
app/celery/tasks.py
View File

@@ -219,13 +219,11 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
provider = provider_to_use('sms', notification_id)
restricted = False
if not service_allowed_to_send_to(notification['to'], service):
current_app.logger.info(
"SMS {} failed as restricted service".format(notification_id)
)
restricted = True
return
try:
@@ -244,7 +242,7 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
service_id=service_id,
job_id=notification.get('job', None),
job_row_number=notification.get('row_number', None),
status='failed' if restricted else 'sending',
status='sending',
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
sent_at=sent_at,
sent_by=provider.get_name(),
@@ -257,9 +255,6 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
)
dao_create_notification(notification_db_object, TEMPLATE_TYPE_SMS, provider.get_name())
if restricted:
return
try:
provider.send_sms(
to=validate_and_format_phone_number(notification['to']),
@@ -292,13 +287,11 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
provider = provider_to_use('email', notification_id)
restricted = False
if not service_allowed_to_send_to(notification['to'], service):
current_app.logger.info(
"Email {} failed as restricted service".format(notification_id)
)
restricted = True
return
try:
sent_at = datetime.utcnow()
@@ -310,7 +303,7 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
service_id=service_id,
job_id=notification.get('job', None),
job_row_number=notification.get('row_number', None),
status='failed' if restricted else 'sending',
status='sending',
created_at=datetime.strptime(created_at, DATETIME_FORMAT),
sent_at=sent_at,
sent_by=provider.get_name()
@@ -323,9 +316,6 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
datetime.strptime(created_at, DATETIME_FORMAT)
)
if restricted:
return
try:
template = Template(
dao_get_template_by_id(notification['template'], notification['template_version']).__dict__,