darkhelm/notifications-api
1
0
Fork 0
mirror of https://github.com/GSA/notifications-api.git synced 2025-12-23 08:51:30 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make the errors in the process_sms_client_reponse more obvious by changing variable name.

Browse Source 
Added a missing test if mmg sends a CID (or reference) that is not a UUID.

NB: All client specific tests are in test_callbacks.
This commit is contained in:
Rebecca Law
2018-02-12 12:06:43 +00:00
parent e68604a600
commit fa8cd780b0
2 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
app/notifications/process_client_response.py
View File

@@ -40,8 +40,8 @@ def process_sms_client_response(status, reference, client_name):
try: try:
uuid.UUID(reference, version=4) uuid.UUID(reference, version=4)
except ValueError: except ValueError:
message = "{} callback with invalid reference {}".format(client_name, reference) errors = "{} callback with invalid reference {}".format(client_name, reference)
return success, message return success, errors
try: try:
response_parser = sms_response_mapper[client_name] response_parser = sms_response_mapper[client_name]
@@ -55,15 +55,14 @@ def process_sms_client_response(status, reference, client_name):
client_name, status, reference) client_name, status, reference)
) )
except KeyError: except KeyError:
process_for_status(notification_status='technical-failure', client_name=client_name, reference=reference) _process_for_status(notification_status='technical-failure', client_name=client_name, reference=reference)
raise ClientException("{} callback failed: status {} not found.".format(client_name, status)) raise ClientException("{} callback failed: status {} not found.".format(client_name, status))
success = process_for_status(notification_status=notification_status, client_name=client_name, reference=reference) success = _process_for_status(notification_status=notification_status, client_name=client_name, reference=reference)
return success, errors return success, errors
def process_for_status(notification_status, client_name, reference): def _process_for_status(notification_status, client_name, reference):
# record stats # record stats
notification = notifications_dao.update_notification_status_by_id(reference, notification_status) notification = notifications_dao.update_notification_status_by_id(reference, notification_status)
if not notification: if not notification:

12
tests/app/notifications/rest/test_callbacks.py
View File

@@ -176,7 +176,7 @@ def test_firetext_callback_should_set_status_technical_failure_if_status_unknown
assert 'Firetext callback failed: status 99 not found.' in str(e.value) assert 'Firetext callback failed: status 99 not found.' in str(e.value)
def test_firetext_callback_returns_200_when_notification_id_not_found_or_already_updated(client, mocker): def test_firetext_callback_returns_200_when_notification_id_is_not_a_valid_uuid(client, mocker):
mocker.patch('app.statsd_client.incr') mocker.patch('app.statsd_client.incr')
data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference=1234' data = 'mobile=441234123123&status=0&time=2016-03-10 14:17:00&reference=1234'
response = firetext_post(client, data) response = firetext_post(client, data)
@@ -438,6 +438,16 @@ def test_mmg_callback_returns_200_when_notification_id_not_found_or_already_upda
assert response.status_code == 200 assert response.status_code == 200
def test_mmg_callback_returns_400_when_notification_id_is_not_a_valid_uuid(client):
data = '{"reference": "10100164", "CID": "1234", "MSISDN": "447775349060", "status": "3", \
"deliverytime": "2016-04-05 16:01:07"}'
response = mmg_post(client, data)
json_resp = json.loads(response.get_data(as_text=True))
assert response.status_code == 400
assert json_resp['message'] == 'MMG callback with invalid reference 1234'
def test_process_mmg_response_records_statsd(notify_db, notify_db_session, client, mocker): def test_process_mmg_response_records_statsd(notify_db, notify_db_session, client, mocker):
with freeze_time('2001-01-01T12:00:00'): with freeze_time('2001-01-01T12:00:00'):