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

Refactor to abstract inbound_sms perms check

Browse Source
This commit is contained in:
Ken Tsang
2017-07-05 15:08:53 +01:00
committed by venusbb
parent 3372fe6b18
commit 8b04039a5a
2 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/notifications/receive_notifications.py
View File

@@ -128,8 +128,7 @@ def fetch_potential_services(inbound_number, provider_name):
statsd_client.incr('inbound.{}.failed'.format(provider_name)) statsd_client.incr('inbound.{}.failed'.format(provider_name))
return False return False
str_permissions = [p.permission for p in potential_services[0].permissions] if not has_inbound_sms_permissions(potential_services[0].permissions):
if set([INBOUND_SMS_TYPE, SMS_TYPE]).issubset(set(str_permissions)) is False:
current_app.logger.error( current_app.logger.error(
'Service "{}" does not allow inbound SMS'.format(potential_services[0].id)) 'Service "{}" does not allow inbound SMS'.format(potential_services[0].id))
return False return False
@@ -137,6 +136,11 @@ def fetch_potential_services(inbound_number, provider_name):
return potential_services return potential_services
def has_inbound_sms_permissions(permissions):
str_permissions = [p.permission for p in permissions]
return set([INBOUND_SMS_TYPE, SMS_TYPE]).issubset(set(str_permissions))
def strip_leading_forty_four(number): def strip_leading_forty_four(number):
if number.startswith('44'): if number.startswith('44'):
return number.replace('44', '0', 1) return number.replace('44', '0', 1)

18
tests/app/notifications/test_receive_notification.py
View File

@@ -10,7 +10,8 @@ from app.notifications.receive_notifications import (
format_mmg_message, format_mmg_message,
format_mmg_datetime, format_mmg_datetime,
create_inbound_sms_object, create_inbound_sms_object,
strip_leading_forty_four strip_leading_forty_four,
has_inbound_sms_permissions,
) )
from app.models import InboundSms, EMAIL_TYPE, SMS_TYPE, INBOUND_SMS_TYPE from app.models import InboundSms, EMAIL_TYPE, SMS_TYPE, INBOUND_SMS_TYPE
@@ -78,7 +79,8 @@ def test_receive_notification_without_permissions_does_not_create_inbound(
return_value=[service]) return_value=[service])
mocked_send_inbound_sms = mocker.patch( mocked_send_inbound_sms = mocker.patch(
"app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async") "app.notifications.receive_notifications.tasks.send_inbound_sms_to_service.apply_async")
mocked_logger = mocker.patch("flask.current_app.logger.error") mocked_has_permissions = mocker.patch(
"app.notifications.receive_notifications.has_inbound_sms_permissions", return_value=False)
response = client.post(path='/notifications/sms/receive/{}'.format(provider), response = client.post(path='/notifications/sms/receive/{}'.format(provider),
data=data, data=data,
@@ -87,8 +89,18 @@ def test_receive_notification_without_permissions_does_not_create_inbound(
assert response.status_code == 200 assert response.status_code == 200
assert response.get_data(as_text=True) == expected_response assert response.get_data(as_text=True) == expected_response
assert len(InboundSms.query.all()) == 0 assert len(InboundSms.query.all()) == 0
assert mocked_has_permissions.called
mocked_send_inbound_sms.assert_not_called() mocked_send_inbound_sms.assert_not_called()
mocked_logger.assert_called_once_with('Service "{}" does not allow inbound SMS'.format(service.id))
@pytest.mark.parametrize('permissions,expected_response', [
([SMS_TYPE, INBOUND_SMS_TYPE], True),
([INBOUND_SMS_TYPE], False),
([SMS_TYPE], False),
])
def test_check_permissions_for_inbound_sms(notify_db, notify_db_session, permissions, expected_response):
service = create_service(service_permissions=permissions)
assert has_inbound_sms_permissions(service.permissions) is expected_response
@pytest.mark.parametrize('message, expected_output', [ @pytest.mark.parametrize('message, expected_output', [