2016-12-21 16:15:18 +00:00
|
|
|
from urllib import parse
|
2016-09-20 17:24:28 +01:00
|
|
|
from datetime import datetime
|
|
|
|
|
|
|
|
|
|
from flask import current_app
|
|
|
|
|
from notifications_utils.recipients import (
|
2017-10-16 17:29:45 +01:00
|
|
|
validate_and_format_phone_number,
|
|
|
|
|
validate_and_format_email_address
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
2016-12-09 15:56:25 +00:00
|
|
|
from notifications_utils.template import HTMLEmailTemplate, PlainTextEmailTemplate, SMSMessageTemplate
|
2017-11-28 13:49:14 +00:00
|
|
|
from requests.exceptions import HTTPError
|
2016-09-20 17:24:28 +01:00
|
|
|
|
|
|
|
|
from app import clients, statsd_client, create_uuid
|
2017-10-06 17:08:06 +01:00
|
|
|
from app.dao.notifications_dao import (
|
2017-11-29 14:38:38 +00:00
|
|
|
dao_update_notification
|
|
|
|
|
)
|
2017-01-20 16:14:29 +00:00
|
|
|
from app.dao.provider_details_dao import (
|
|
|
|
|
get_provider_details_by_notification_type,
|
|
|
|
|
dao_toggle_sms_provider
|
|
|
|
|
)
|
2016-09-20 17:24:28 +01:00
|
|
|
from app.celery.research_mode_tasks import send_sms_response, send_email_response
|
|
|
|
|
from app.dao.templates_dao import dao_get_template_by_id
|
2018-03-16 17:18:44 +00:00
|
|
|
from app.exceptions import NotificationTechnicalFailureException
|
2017-09-14 16:26:46 +01:00
|
|
|
from app.models import (
|
|
|
|
|
SMS_TYPE,
|
|
|
|
|
KEY_TYPE_TEST,
|
2018-08-28 14:25:16 +01:00
|
|
|
BRANDING_BOTH,
|
2017-09-19 13:18:59 +01:00
|
|
|
BRANDING_ORG_BANNER,
|
2017-09-14 16:26:46 +01:00
|
|
|
EMAIL_TYPE,
|
2017-10-16 15:33:21 +01:00
|
|
|
NOTIFICATION_CREATED,
|
2017-09-14 16:26:46 +01:00
|
|
|
NOTIFICATION_TECHNICAL_FAILURE,
|
|
|
|
|
NOTIFICATION_SENT,
|
2018-08-24 13:51:11 +01:00
|
|
|
NOTIFICATION_SENDING
|
2017-09-14 16:26:46 +01:00
|
|
|
)
|
2017-05-09 18:17:55 +01:00
|
|
|
|
2016-09-20 17:24:28 +01:00
|
|
|
|
2016-09-21 13:27:32 +01:00
|
|
|
def send_sms_to_provider(notification):
|
2017-01-31 13:53:13 +00:00
|
|
|
service = notification.service
|
2017-06-28 12:14:36 +01:00
|
|
|
|
2017-02-06 16:20:44 +00:00
|
|
|
if not service.active:
|
|
|
|
|
technical_failure(notification=notification)
|
2017-01-31 13:53:13 +00:00
|
|
|
return
|
|
|
|
|
|
2016-09-20 17:24:28 +01:00
|
|
|
if notification.status == 'created':
|
2017-04-27 10:18:28 +01:00
|
|
|
provider = provider_to_use(SMS_TYPE, notification.id, notification.international)
|
As Notify matures we probably need less logging, especially to report happy path events.
This PR is a proposal to reduce the average messages we see for a single notification from about 7 messages to 2.
Messaging would change to something like this:
February 2nd 2018, 15:39:05.885 Full delivery response from Firetext for notification: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
{'status': ['0'], 'reference': ['8eda51d5-cd82-4569-bfc9-d5570cdf2126'], 'time': ['2018-02-02 15:39:01'], 'code': ['000']}
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:57.727 SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to provider firetext at 2018-02-02 15:38:56.716814
February 2nd 2018, 15:38:56.727 Starting sending SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 to provider at 2018-02-02 15:38:56.408181
February 2nd 2018, 15:38:56.727 Firetext request for 8eda51d5-cd82-4569-bfc9-d5570cdf2126 finished in 0.30376038211397827
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to the priority-tasks queue for delivery
To somthing like this:
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
2018-02-02 15:55:25 +00:00
|
|
|
current_app.logger.debug(
|
2017-01-31 13:53:13 +00:00
|
|
|
"Starting sending SMS {} to provider at {}".format(notification.id, datetime.utcnow())
|
|
|
|
|
)
|
2016-09-20 17:24:28 +01:00
|
|
|
template_model = dao_get_template_by_id(notification.template_id, notification.template_version)
|
2017-11-03 10:31:28 +00:00
|
|
|
|
2016-12-09 15:56:25 +00:00
|
|
|
template = SMSMessageTemplate(
|
2016-09-20 17:24:28 +01:00
|
|
|
template_model.__dict__,
|
2016-12-09 15:56:25 +00:00
|
|
|
values=notification.personalisation,
|
|
|
|
|
prefix=service.name,
|
2017-11-16 13:24:33 +00:00
|
|
|
show_prefix=service.prefix_sms,
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
2017-01-24 14:24:58 +00:00
|
|
|
|
2016-09-20 17:24:28 +01:00
|
|
|
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
|
2019-05-08 15:45:19 +01:00
|
|
|
send_sms_response(provider.get_name(), str(notification.id), notification.to)
|
2019-05-08 10:54:01 +01:00
|
|
|
update_notification_to_sending(notification, provider)
|
2019-05-08 15:45:19 +01:00
|
|
|
|
2016-09-20 17:24:28 +01:00
|
|
|
else:
|
2017-01-20 16:14:29 +00:00
|
|
|
try:
|
|
|
|
|
provider.send_sms(
|
2017-04-27 16:57:04 +01:00
|
|
|
to=validate_and_format_phone_number(notification.to, international=notification.international),
|
2017-01-20 16:14:29 +00:00
|
|
|
content=str(template),
|
|
|
|
|
reference=str(notification.id),
|
2017-11-27 15:24:16 +00:00
|
|
|
sender=notification.reply_to_text
|
2017-01-20 16:14:29 +00:00
|
|
|
)
|
|
|
|
|
except Exception as e:
|
2019-05-08 10:54:01 +01:00
|
|
|
notification.billable_units = template.fragment_count
|
|
|
|
|
notification.sent_by = provider.get_name()
|
|
|
|
|
dao_update_notification(notification)
|
2017-01-23 13:36:04 +00:00
|
|
|
dao_toggle_sms_provider(provider.name)
|
2017-01-20 16:14:29 +00:00
|
|
|
raise e
|
|
|
|
|
else:
|
|
|
|
|
notification.billable_units = template.fragment_count
|
2019-05-08 15:45:19 +01:00
|
|
|
update_notification_to_sending(notification, provider)
|
2016-09-20 17:24:28 +01:00
|
|
|
|
As Notify matures we probably need less logging, especially to report happy path events.
This PR is a proposal to reduce the average messages we see for a single notification from about 7 messages to 2.
Messaging would change to something like this:
February 2nd 2018, 15:39:05.885 Full delivery response from Firetext for notification: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
{'status': ['0'], 'reference': ['8eda51d5-cd82-4569-bfc9-d5570cdf2126'], 'time': ['2018-02-02 15:39:01'], 'code': ['000']}
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:57.727 SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to provider firetext at 2018-02-02 15:38:56.716814
February 2nd 2018, 15:38:56.727 Starting sending SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 to provider at 2018-02-02 15:38:56.408181
February 2nd 2018, 15:38:56.727 Firetext request for 8eda51d5-cd82-4569-bfc9-d5570cdf2126 finished in 0.30376038211397827
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to the priority-tasks queue for delivery
To somthing like this:
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
2018-02-02 15:55:25 +00:00
|
|
|
current_app.logger.debug(
|
2016-12-20 13:24:08 +00:00
|
|
|
"SMS {} sent to provider {} at {}".format(notification.id, provider.get_name(), notification.sent_at)
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
|
|
|
|
delta_milliseconds = (datetime.utcnow() - notification.created_at).total_seconds() * 1000
|
|
|
|
|
statsd_client.timing("sms.total-time", delta_milliseconds)
|
|
|
|
|
|
|
|
|
|
|
2016-09-22 09:16:58 +01:00
|
|
|
def send_email_to_provider(notification):
|
2017-01-31 13:53:13 +00:00
|
|
|
service = notification.service
|
2017-02-06 16:20:44 +00:00
|
|
|
if not service.active:
|
|
|
|
|
technical_failure(notification=notification)
|
2017-01-31 13:53:13 +00:00
|
|
|
return
|
2016-09-20 17:24:28 +01:00
|
|
|
if notification.status == 'created':
|
2017-01-31 13:53:13 +00:00
|
|
|
provider = provider_to_use(EMAIL_TYPE, notification.id)
|
2019-05-08 15:55:45 +01:00
|
|
|
|
2016-09-20 17:24:28 +01:00
|
|
|
template_dict = dao_get_template_by_id(notification.template_id, notification.template_version).__dict__
|
|
|
|
|
|
2016-12-09 15:56:25 +00:00
|
|
|
html_email = HTMLEmailTemplate(
|
2016-09-20 17:24:28 +01:00
|
|
|
template_dict,
|
|
|
|
|
values=notification.personalisation,
|
2016-12-09 15:56:25 +00:00
|
|
|
**get_html_email_options(service)
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
|
|
|
|
|
2016-12-09 15:56:25 +00:00
|
|
|
plain_text_email = PlainTextEmailTemplate(
|
2016-09-20 17:24:28 +01:00
|
|
|
template_dict,
|
2016-12-09 15:56:25 +00:00
|
|
|
values=notification.personalisation
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
|
|
|
|
|
|
|
|
|
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
|
2019-05-08 15:55:45 +01:00
|
|
|
notification.reference = str(create_uuid())
|
2019-05-08 10:54:01 +01:00
|
|
|
update_notification_to_sending(notification, provider)
|
2019-05-08 15:55:45 +01:00
|
|
|
send_email_response(notification.reference, notification.to)
|
2016-09-20 17:24:28 +01:00
|
|
|
else:
|
|
|
|
|
from_address = '"{}" <{}@{}>'.format(service.name, service.email_from,
|
|
|
|
|
current_app.config['NOTIFY_EMAIL_DOMAIN'])
|
2017-09-20 10:45:35 +01:00
|
|
|
|
2017-11-27 15:24:16 +00:00
|
|
|
email_reply_to = notification.reply_to_text
|
2017-10-06 16:58:32 +01:00
|
|
|
|
2016-09-20 17:24:28 +01:00
|
|
|
reference = provider.send_email(
|
|
|
|
|
from_address,
|
2017-10-16 17:29:45 +01:00
|
|
|
validate_and_format_email_address(notification.to),
|
2016-12-09 15:56:25 +00:00
|
|
|
plain_text_email.subject,
|
|
|
|
|
body=str(plain_text_email),
|
|
|
|
|
html_body=str(html_email),
|
2017-10-16 17:29:45 +01:00
|
|
|
reply_to_address=validate_and_format_email_address(email_reply_to) if email_reply_to else None,
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
2017-01-24 14:24:58 +00:00
|
|
|
notification.reference = reference
|
2019-05-08 10:54:01 +01:00
|
|
|
update_notification_to_sending(notification, provider)
|
2016-09-20 17:24:28 +01:00
|
|
|
|
As Notify matures we probably need less logging, especially to report happy path events.
This PR is a proposal to reduce the average messages we see for a single notification from about 7 messages to 2.
Messaging would change to something like this:
February 2nd 2018, 15:39:05.885 Full delivery response from Firetext for notification: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
{'status': ['0'], 'reference': ['8eda51d5-cd82-4569-bfc9-d5570cdf2126'], 'time': ['2018-02-02 15:39:01'], 'code': ['000']}
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:57.727 SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to provider firetext at 2018-02-02 15:38:56.716814
February 2nd 2018, 15:38:56.727 Starting sending SMS 8eda51d5-cd82-4569-bfc9-d5570cdf2126 to provider at 2018-02-02 15:38:56.408181
February 2nd 2018, 15:38:56.727 Firetext request for 8eda51d5-cd82-4569-bfc9-d5570cdf2126 finished in 0.30376038211397827
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 sent to the priority-tasks queue for delivery
To somthing like this:
February 2nd 2018, 15:39:05.885 Firetext callback return status of 0 for reference: 8eda51d5-cd82-4569-bfc9-d5570cdf2126
February 2nd 2018, 15:38:49.449 sms 8eda51d5-cd82-4569-bfc9-d5570cdf2126 created at 2018-02-02 15:38:48.439113
2018-02-02 15:55:25 +00:00
|
|
|
current_app.logger.debug(
|
2016-09-22 09:16:58 +01:00
|
|
|
"Email {} sent to provider at {}".format(notification.id, notification.sent_at)
|
2016-09-20 17:24:28 +01:00
|
|
|
)
|
|
|
|
|
delta_milliseconds = (datetime.utcnow() - notification.created_at).total_seconds() * 1000
|
|
|
|
|
statsd_client.timing("email.total-time", delta_milliseconds)
|
|
|
|
|
|
|
|
|
|
|
2019-05-08 15:45:19 +01:00
|
|
|
def update_notification_to_sending(notification, provider):
|
2017-01-24 14:24:58 +00:00
|
|
|
notification.sent_at = datetime.utcnow()
|
|
|
|
|
notification.sent_by = provider.get_name()
|
2019-05-08 15:45:19 +01:00
|
|
|
notification.status = NOTIFICATION_SENT if notification.international else NOTIFICATION_SENDING
|
2017-01-24 14:24:58 +00:00
|
|
|
dao_update_notification(notification)
|
|
|
|
|
|
|
|
|
|
|
2017-04-27 10:18:28 +01:00
|
|
|
def provider_to_use(notification_type, notification_id, international=False):
|
2017-04-27 12:14:22 +01:00
|
|
|
active_providers_in_order = [
|
|
|
|
|
p for p in get_provider_details_by_notification_type(notification_type, international) if p.active
|
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
if not active_providers_in_order:
|
2016-09-20 17:24:28 +01:00
|
|
|
current_app.logger.error(
|
|
|
|
|
"{} {} failed as no active providers".format(notification_type, notification_id)
|
|
|
|
|
)
|
|
|
|
|
raise Exception("No active {} providers".format(notification_type))
|
|
|
|
|
|
2017-04-27 12:14:22 +01:00
|
|
|
return clients.get_client_by_name_and_type(active_providers_in_order[0].identifier, notification_type)
|
2016-09-20 17:24:28 +01:00
|
|
|
|
|
|
|
|
|
2017-07-21 16:06:12 +01:00
|
|
|
def get_logo_url(base_url, logo_file):
|
2016-12-21 16:15:18 +00:00
|
|
|
base_url = parse.urlparse(base_url)
|
|
|
|
|
netloc = base_url.netloc
|
|
|
|
|
|
2017-07-21 16:06:12 +01:00
|
|
|
if base_url.netloc.startswith('localhost'):
|
|
|
|
|
netloc = 'notify.tools'
|
|
|
|
|
elif base_url.netloc.startswith('www'):
|
|
|
|
|
# strip "www."
|
|
|
|
|
netloc = base_url.netloc[4:]
|
2016-12-21 16:15:18 +00:00
|
|
|
|
|
|
|
|
logo_url = parse.ParseResult(
|
|
|
|
|
scheme=base_url.scheme,
|
2017-07-21 16:37:26 +01:00
|
|
|
netloc='static-logos.' + netloc,
|
2017-07-21 16:06:12 +01:00
|
|
|
path=logo_file,
|
2016-12-21 16:15:18 +00:00
|
|
|
params=base_url.params,
|
|
|
|
|
query=base_url.query,
|
|
|
|
|
fragment=base_url.fragment
|
|
|
|
|
)
|
|
|
|
|
return parse.urlunparse(logo_url)
|
|
|
|
|
|
|
|
|
|
|
2016-12-09 15:56:25 +00:00
|
|
|
def get_html_email_options(service):
|
2018-08-28 14:25:16 +01:00
|
|
|
|
2018-08-30 16:22:59 +01:00
|
|
|
if service.email_branding is None:
|
2018-08-28 14:25:16 +01:00
|
|
|
return {
|
|
|
|
|
'govuk_banner': True,
|
|
|
|
|
'brand_banner': False,
|
2016-09-20 17:24:28 +01:00
|
|
|
}
|
|
|
|
|
|
2018-08-28 14:25:16 +01:00
|
|
|
logo_url = get_logo_url(
|
|
|
|
|
current_app.config['ADMIN_BASE_URL'],
|
|
|
|
|
service.email_branding.logo
|
|
|
|
|
) if service.email_branding.logo else None
|
|
|
|
|
|
|
|
|
|
return {
|
|
|
|
|
'govuk_banner': service.email_branding.brand_type == BRANDING_BOTH,
|
|
|
|
|
'brand_banner': service.email_branding.brand_type == BRANDING_ORG_BANNER,
|
|
|
|
|
'brand_colour': service.email_branding.colour,
|
|
|
|
|
'brand_logo': logo_url,
|
|
|
|
|
'brand_name': service.email_branding.text,
|
|
|
|
|
}
|
2017-02-03 14:27:04 +00:00
|
|
|
|
|
|
|
|
|
2017-02-06 16:20:44 +00:00
|
|
|
def technical_failure(notification):
|
|
|
|
|
notification.status = NOTIFICATION_TECHNICAL_FAILURE
|
|
|
|
|
dao_update_notification(notification)
|
2018-03-16 17:18:44 +00:00
|
|
|
raise NotificationTechnicalFailureException(
|
2017-02-06 16:20:44 +00:00
|
|
|
"Send {} for notification id {} to provider is not allowed: service {} is inactive".format(
|
|
|
|
|
notification.notification_type,
|
|
|
|
|
notification.id,
|
|
|
|
|
notification.service_id))
|