Merge branch 'master' into research-mode-implementation

This commit is contained in:
Martyn Inglis
2016-06-02 09:28:35 +01:00
5 changed files with 93 additions and 47 deletions

View File

@@ -37,7 +37,7 @@ from app.dao.notifications_dao import (
dao_update_notification,
delete_notifications_created_more_than_a_week_ago,
dao_get_notification_statistics_for_service_and_day,
update_notification_reference_by_id
update_notification_after_sent_to_provider
)
from app.dao.jobs_dao import (
@@ -268,6 +268,12 @@ def send_sms(service_id, notification_id, encrypted_notification, created_at):
reference=str(notification_id)
)
update_notification_after_sent_to_provider(
notification_id,
'sms',
provider.get_name()
)
except SmsClientException as e:
current_app.logger.error(
"SMS notification {} failed".format(notification_id)
@@ -343,7 +349,12 @@ def send_email(service_id, notification_id, from_address, encrypted_notification
reply_to_addresses=reply_to_addresses,
)
update_notification_reference_by_id(notification_id, reference)
update_notification_after_sent_to_provider(
notification_id,
'email',
provider.get_name(),
reference=reference
)
except EmailClientException as e:
current_app.logger.exception(e)