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

Update utils to 12.0.0

Browse Source 
Includes:

- [x] https://github.com/alphagov/notifications-utils/pull/94 (breaking
      changes which are responsible for all the changes to the API in
      this PR)

The test for `get_sms_fragment_count` has been removed because this
method is already tested in utils here:

ac20f7e99e/tests/test_base_template.py (L140-L159)
This commit is contained in:
Chris Hill-Scott
2016-12-09 15:56:25 +00:00
parent 4f9b295a5b
commit 59af44d7ab
14 changed files with 70 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
app/delivery/send_to_providers.py
View File

@@ -1,12 +1,10 @@
from datetime import datetime
from flask import current_app
from notifications_utils.field import Field
from notifications_utils.recipients import (
validate_and_format_phone_number
)
from notifications_utils.template import Template
from notifications_utils.renderers import HTMLEmail, PlainTextEmail, SMSMessage
from notifications_utils.template import HTMLEmailTemplate, PlainTextEmailTemplate, SMSMessageTemplate
from app import clients, statsd_client, create_uuid
from app.dao.notifications_dao import dao_update_notification
@@ -23,10 +21,11 @@ def send_sms_to_provider(notification):
provider = provider_to_use(SMS_TYPE, notification.id)
if notification.status == 'created':
template_model = dao_get_template_by_id(notification.template_id, notification.template_version)
template = Template(
template = SMSMessageTemplate(
template_model.__dict__,
values={} if not notification.personalisation else notification.personalisation,
renderer=SMSMessage(prefix=service.name, sender=service.sms_sender)
values=notification.personalisation,
prefix=service.name,
sender=service.sms_sender
)
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
send_sms_response.apply_async(
@@ -36,11 +35,11 @@ def send_sms_to_provider(notification):
else:
provider.send_sms(
to=validate_and_format_phone_number(notification.to),
content=template.rendered,
content=str(template),
reference=str(notification.id),
sender=service.sms_sender
)
notification.billable_units = template.sms_fragment_count
notification.billable_units = template.fragment_count
notification.sent_at = datetime.utcnow()
notification.sent_by = provider.get_name()
@@ -60,16 +59,15 @@ def send_email_to_provider(notification):
if notification.status == 'created':
template_dict = dao_get_template_by_id(notification.template_id, notification.template_version).__dict__
html_email = Template(
html_email = HTMLEmailTemplate(
template_dict,
values=notification.personalisation,
renderer=get_html_email_renderer(service)
**get_html_email_options(service)
)
plain_text_email = Template(
plain_text_email = PlainTextEmailTemplate(
template_dict,
values=notification.personalisation,
renderer=PlainTextEmail()
values=notification.personalisation
)
if service.research_mode or notification.key_type == KEY_TYPE_TEST:
@@ -84,9 +82,9 @@ def send_email_to_provider(notification):
reference = provider.send_email(
from_address,
notification.to,
str(Field(plain_text_email.subject, notification.personalisation)),
body=plain_text_email.rendered,
html_body=html_email.rendered,
plain_text_email.subject,
body=str(plain_text_email),
html_body=str(html_email),
reply_to_address=service.reply_to_email_address,
)
@@ -117,7 +115,7 @@ def provider_to_use(notification_type, notification_id):
return clients.get_client_by_name_and_type(active_providers_in_order[0].identifier, notification_type)
def get_html_email_renderer(service):
def get_html_email_options(service):
govuk_banner = service.branding != BRANDING_ORG
if service.organisation:
logo = '{}{}{}'.format(
@@ -133,4 +131,4 @@ def get_html_email_renderer(service):
else:
branding = {}
return HTMLEmail(govuk_banner=govuk_banner, **branding)
return dict(govuk_banner=govuk_banner, **branding)