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

bump utils to 13.6.0 - downgrade non-gsm chars on sms send

Browse Source 
also refactor test_send_to_providers to use the shiny new db.py
create_*db obj* functions and clean up some of the fixture usage
This commit is contained in:
Leo Hemsted
2017-02-16 11:55:52 +00:00
parent ce1fac63ec
commit c30b4d00e7
3 changed files with 83 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
requirements.txt
View File

@@ -29,6 +29,6 @@ notifications-python-client>=3.1,<3.2
awscli>=1.11,<1.12 awscli>=1.11,<1.12
awscli-cwlogs>=1.4,<1.5 awscli-cwlogs>=1.4,<1.5
git+https://github.com/alphagov/notifications-utils.git@13.5.0#egg=notifications-utils==13.5.0 git+https://github.com/alphagov/notifications-utils.git@13.6.0#egg=notifications-utils==13.6.0
git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3

27
tests/app/db.py
View File

@@ -1,10 +1,11 @@
from datetime import datetime from datetime import datetime
import uuid import uuid
from app.models import User, Template, Notification, SMS_TYPE, KEY_TYPE_NORMAL from app.models import Service, User, Template, Notification, SMS_TYPE, KEY_TYPE_NORMAL
from app.dao.users_dao import save_model_user from app.dao.users_dao import save_model_user
from app.dao.notifications_dao import dao_create_notification from app.dao.notifications_dao import dao_create_notification
from app.dao.templates_dao import dao_create_template from app.dao.templates_dao import dao_create_template
from app.dao.services_dao import dao_create_service
def create_user(mobile_number="+447700900986", email="notify@digital.cabinet-office.gov.uk"): def create_user(mobile_number="+447700900986", email="notify@digital.cabinet-office.gov.uk"):
@@ -22,11 +23,27 @@ def create_user(mobile_number="+447700900986", email="notify@digital.cabinet-off
return user return user
def create_template(service, user=None, template_type=SMS_TYPE): def create_service(user=None, service_name="Sample service"):
service = Service(
name=service_name,
message_limit=1000,
restricted=False,
email_from=service_name.lower().replace(' ', '.'),
created_by=user or create_user()
)
dao_create_service(service, service.created_by)
return service
def create_template(
service,
template_type=SMS_TYPE,
content='Dear Sir/Madam, Hello. Yours Truly, The Government.'
):
data = { data = {
'name': '{} Template Name'.format(template_type), 'name': '{} Template Name'.format(template_type),
'template_type': template_type, 'template_type': template_type,
'content': 'Dear Sir/Madam, Hello. Yours Truly, The Government.', 'content': content,
'service': service, 'service': service,
'created_by': service.created_by, 'created_by': service.created_by,
} }
@@ -60,7 +77,7 @@ def create_notification(
'to': to_field, 'to': to_field,
'job_id': job.id if job else None, 'job_id': job.id if job else None,
'job': job, 'job': job,
'service_id': template.service_id, 'service': template.service,
'template_id': template.id if template else None, 'template_id': template.id if template else None,
'template': template, 'template': template,
'template_version': template.version, 'template_version': template.version,
@@ -76,7 +93,7 @@ def create_notification(
'sent_by': sent_by, 'sent_by': sent_by,
'updated_at': None, 'updated_at': None,
'client_reference': client_reference, 'client_reference': client_reference,
'job_row_number': None 'job_row_number': job_row_number
} }
notification = Notification(**data) notification = Notification(**data)
dao_create_notification(notification) dao_create_notification(notification)

129
tests/app/delivery/test_send_to_providers.py
View File

@@ -1,22 +1,29 @@
import uuid import uuid
from datetime import datetime from datetime import datetime
from collections import namedtuple from collections import namedtuple
from unittest.mock import ANY
import pytest import pytest
from unittest.mock import ANY from notifications_utils.recipients import validate_phone_number, format_phone_number
import app import app
from app import mmg_client from app import mmg_client
from app.dao import (provider_details_dao, notifications_dao) from app.dao import (provider_details_dao, notifications_dao)
from app.delivery import send_to_providers from app.delivery import send_to_providers
from app.models import Notification, KEY_TYPE_NORMAL, KEY_TYPE_TEST, BRANDING_ORG, BRANDING_BOTH, Organisation, \ from app.models import (
KEY_TYPE_TEAM Notification,
from tests.app.conftest import sample_notification Organisation,
KEY_TYPE_NORMAL,
KEY_TYPE_TEST,
KEY_TYPE_TEAM,
BRANDING_ORG,
BRANDING_BOTH,
)
from notifications_utils.recipients import validate_phone_number, format_phone_number from tests.app.db import create_service, create_template, create_notification
def test_should_return_highest_priority_active_provider(notify_db, notify_db_session): def test_should_return_highest_priority_active_provider(notify_db_session):
providers = provider_details_dao.get_provider_details_by_notification_type('sms') providers = provider_details_dao.get_provider_details_by_notification_type('sms')
first = providers[0] first = providers[0]
@@ -48,17 +55,14 @@ def test_should_return_highest_priority_active_provider(notify_db, notify_db_ses
def test_should_send_personalised_template_to_correct_sms_provider_and_persist( def test_should_send_personalised_template_to_correct_sms_provider_and_persist(
notify_db,
notify_db_session,
sample_sms_template_with_html, sample_sms_template_with_html,
mocker mocker
): ):
db_notification = sample_notification(notify_db, notify_db_session, template=sample_sms_template_with_html, db_notification = create_notification(template=sample_sms_template_with_html,
to_field="+447234123123", personalisation={"name": "Jo"}, to_field="+447234123123", personalisation={"name": "Jo"},
status='created') status='created')
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
send_to_providers.send_sms_to_provider( send_to_providers.send_sms_to_provider(
db_notification db_notification
@@ -80,20 +84,16 @@ def test_should_send_personalised_template_to_correct_sms_provider_and_persist(
def test_should_send_personalised_template_to_correct_email_provider_and_persist( def test_should_send_personalised_template_to_correct_email_provider_and_persist(
notify_db,
notify_db_session,
sample_email_template_with_html, sample_email_template_with_html,
mocker mocker
): ):
db_notification = sample_notification( db_notification = create_notification(
notify_db=notify_db, notify_db_session=notify_db_session,
template=sample_email_template_with_html, template=sample_email_template_with_html,
to_field="jo.smith@example.com", to_field="jo.smith@example.com",
personalisation={'name': 'Jo'} personalisation={'name': 'Jo'}
) )
mocker.patch('app.aws_ses_client.send_email', return_value='reference') mocker.patch('app.aws_ses_client.send_email', return_value='reference')
mocker.patch('app.aws_ses_client.get_name', return_value="ses")
send_to_providers.send_email_to_provider( send_to_providers.send_email_to_provider(
db_notification db_notification
@@ -132,16 +132,11 @@ def test_should_not_send_message_when_service_is_inactive_notiifcation_is_in_tec
def test_send_sms_should_use_template_version_from_notification_not_latest( def test_send_sms_should_use_template_version_from_notification_not_latest(
notify_db,
notify_db_session,
sample_template, sample_template,
mocker): mocker):
db_notification = sample_notification(notify_db, notify_db_session, db_notification = create_notification(template=sample_template, to_field='+447234123123', status='created')
template=sample_template, to_field='+447234123123',
status='created')
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
version_on_notification = sample_template.version version_on_notification = sample_template.version
# Change the template # Change the template
@@ -178,7 +173,6 @@ def test_send_sms_should_use_template_version_from_notification_not_latest(
def test_should_call_send_sms_response_task_if_research_mode(notify_db, sample_service, sample_notification, mocker, def test_should_call_send_sms_response_task_if_research_mode(notify_db, sample_service, sample_notification, mocker,
research_mode, key_type): research_mode, key_type):
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
mocker.patch('app.delivery.send_to_providers.send_sms_response') mocker.patch('app.delivery.send_to_providers.send_sms_response')
if research_mode: if research_mode:
@@ -213,7 +207,6 @@ def test_should_set_billable_units_to_zero_in_research_mode_or_test_key(
notify_db, sample_service, sample_notification, mocker, research_mode, key_type): notify_db, sample_service, sample_notification, mocker, research_mode, key_type):
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
mocker.patch('app.delivery.send_to_providers.send_sms_response') mocker.patch('app.delivery.send_to_providers.send_sms_response')
if research_mode: if research_mode:
sample_service.research_mode = True sample_service.research_mode = True
@@ -228,14 +221,12 @@ def test_should_set_billable_units_to_zero_in_research_mode_or_test_key(
assert notifications_dao.get_notification_by_id(sample_notification.id).billable_units == 0 assert notifications_dao.get_notification_by_id(sample_notification.id).billable_units == 0
def test_should_not_send_to_provider_when_status_is_not_created(notify_db, notify_db_session, def test_should_not_send_to_provider_when_status_is_not_created(
sample_service, sample_template,
mocker): mocker
notification = sample_notification(notify_db=notify_db, notify_db_session=notify_db_session, ):
service=sample_service, notification = create_notification(template=sample_template, status='sending')
status='sending')
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
mocker.patch('app.delivery.send_to_providers.send_sms_response') mocker.patch('app.delivery.send_to_providers.send_sms_response')
send_to_providers.send_sms_to_provider( send_to_providers.send_sms_to_provider(
@@ -247,21 +238,16 @@ def test_should_not_send_to_provider_when_status_is_not_created(notify_db, notif
def test_should_send_sms_sender_from_service_if_present( def test_should_send_sms_sender_from_service_if_present(
notify_db,
notify_db_session,
sample_service, sample_service,
sample_template, sample_template,
mocker): mocker):
db_notification = sample_notification(notify_db, notify_db_session, template=sample_template, db_notification = create_notification(template=sample_template,
to_field="+447234123123", to_field="+447234123123",
status='created') status='created')
sample_service.sms_sender = 'elevenchars' sample_service.sms_sender = 'elevenchars'
notify_db.session.add(sample_service)
notify_db.session.commit()
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
send_to_providers.send_sms_to_provider( send_to_providers.send_sms_to_provider(
db_notification db_notification
@@ -275,36 +261,53 @@ def test_should_send_sms_sender_from_service_if_present(
) )
def test_should_send_sms_with_downgraded_content(notify_db_session, mocker):
# é, o, and u are in GSM.
# á, ï, grapes, tabs, zero width space and ellipsis are not
msg = "á é ï o u 🍇 foo\tbar\u200bbaz((misc))…"
placeholder = '∆∆∆abc'
gsm_message = "?odz Housing Service: a é i o u ? foo barbaz???abc..."
service = create_service(service_name='Łódź Housing Service')
template = create_template(service, content=msg)
db_notification = create_notification(
template=template,
personalisation={'misc': placeholder}
)
mocker.patch('app.mmg_client.send_sms')
send_to_providers.send_sms_to_provider(db_notification)
mmg_client.send_sms.assert_called_once_with(
to=ANY,
content=gsm_message,
reference=ANY,
sender=ANY
)
@pytest.mark.parametrize('research_mode,key_type', [ @pytest.mark.parametrize('research_mode,key_type', [
(True, KEY_TYPE_NORMAL), (True, KEY_TYPE_NORMAL),
(False, KEY_TYPE_TEST) (False, KEY_TYPE_TEST)
]) ])
def test_send_email_to_provider_should_call_research_mode_task_response_task_if_research_mode( def test_send_email_to_provider_should_call_research_mode_task_response_task_if_research_mode(
notify_db,
notify_db_session,
sample_service, sample_service,
sample_email_template, sample_email_template,
ses_provider,
mocker, mocker,
research_mode, research_mode,
key_type): key_type):
notification = sample_notification(notify_db=notify_db, notify_db_session=notify_db_session, notification = create_notification(
template=sample_email_template, template=sample_email_template,
to_field="john@smith.com", to_field="john@smith.com",
key_type=key_type key_type=key_type
) )
sample_service.research_mode = research_mode
reference = uuid.uuid4() reference = uuid.uuid4()
mocker.patch('app.uuid.uuid4', return_value=reference) mocker.patch('app.uuid.uuid4', return_value=reference)
mocker.patch('app.aws_ses_client.send_email') mocker.patch('app.aws_ses_client.send_email')
mocker.patch('app.aws_ses_client.get_name', return_value="ses")
mocker.patch('app.delivery.send_to_providers.send_email_response') mocker.patch('app.delivery.send_to_providers.send_email_response')
if research_mode:
sample_service.research_mode = True
notify_db.session.add(sample_service)
notify_db.session.commit()
send_to_providers.send_email_to_provider( send_to_providers.send_email_to_provider(
notification notification
) )
@@ -322,16 +325,12 @@ def test_send_email_to_provider_should_call_research_mode_task_response_task_if_
assert persisted_notification.billable_units == 0 assert persisted_notification.billable_units == 0
def test_send_email_to_provider_should_not_send_to_provider_when_status_is_not_created(notify_db, notify_db_session, def test_send_email_to_provider_should_not_send_to_provider_when_status_is_not_created(
sample_service, sample_email_template,
sample_email_template, mocker
mocker): ):
notification = sample_notification(notify_db=notify_db, notify_db_session=notify_db_session, notification = create_notification(template=sample_email_template, status='sending')
template=sample_email_template,
service=sample_service,
status='sending')
mocker.patch('app.aws_ses_client.send_email') mocker.patch('app.aws_ses_client.send_email')
mocker.patch('app.aws_ses_client.get_name', return_value="ses")
mocker.patch('app.delivery.send_to_providers.send_email_response') mocker.patch('app.delivery.send_to_providers.send_email_response')
send_to_providers.send_sms_to_provider( send_to_providers.send_sms_to_provider(
@@ -343,14 +342,12 @@ def test_send_email_to_provider_should_not_send_to_provider_when_status_is_not_c
def test_send_email_should_use_service_reply_to_email( def test_send_email_should_use_service_reply_to_email(
notify_db, notify_db_session,
sample_service, sample_service,
sample_email_template, sample_email_template,
mocker): mocker):
mocker.patch('app.aws_ses_client.send_email', return_value='reference') mocker.patch('app.aws_ses_client.send_email', return_value='reference')
mocker.patch('app.aws_ses_client.get_name', return_value="ses")
db_notification = sample_notification(notify_db, notify_db_session, template=sample_email_template) db_notification = create_notification(template=sample_email_template)
sample_service.reply_to_email_address = 'foo@bar.com' sample_service.reply_to_email_address = 'foo@bar.com'
send_to_providers.send_email_to_provider( send_to_providers.send_email_to_provider(
@@ -431,7 +428,6 @@ def test_get_logo_url_works_for_different_environments(base_url, expected_url):
def test_should_not_set_billable_units_if_research_mode(notify_db, sample_service, sample_notification, mocker): def test_should_not_set_billable_units_if_research_mode(notify_db, sample_service, sample_notification, mocker):
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
mocker.patch('app.delivery.send_to_providers.send_sms_response') mocker.patch('app.delivery.send_to_providers.send_sms_response')
sample_service.research_mode = True sample_service.research_mode = True
@@ -461,11 +457,7 @@ def test_should_update_billable_units_according_to_research_mode_and_key_type(no
research_mode, research_mode,
key_type, key_type,
billable_units): billable_units):
assert Notification.query.count() == 1
mocker.patch('app.mmg_client.send_sms') mocker.patch('app.mmg_client.send_sms')
mocker.patch('app.mmg_client.get_name', return_value="mmg")
mocker.patch('app.delivery.send_to_providers.send_sms_response') mocker.patch('app.delivery.send_to_providers.send_sms_response')
if research_mode: if research_mode:
sample_service.research_mode = True sample_service.research_mode = True
@@ -478,5 +470,4 @@ def test_should_update_billable_units_according_to_research_mode_and_key_type(no
sample_notification sample_notification
) )
assert Notification.query.get(sample_notification.id).billable_units == billable_units, \ assert sample_notification.billable_units == billable_units
"Research mode: {0}, key type: {1}, billable_units: {2}".format(research_mode, key_type, billable_units)