darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-07-24 18:09:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

Format letter statuses so they make more sense to our users

Browse Source
This commit is contained in:
Pea Tyczynska
2019-01-07 15:17:09 +00:00
parent 36656fd6ba
commit b8318c491b
2 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/notify_client/notification_api_client.py
View File

@@ -78,8 +78,12 @@ class NotificationApiClient(NotifyAdminAPIClient):
@staticmethod
def map_letters_to_accepted(notifications):
for notification in notifications['notifications']:
if notification['notification_type'] == 'letter' and notification['status'] in ('created', 'sending'):
notification['status'] = 'accepted'
if notification['notification_type'] == 'letter':
if notification['status'] in ('created', 'sending'):
notification['status'] = 'accepted'
if notification['status'] in ('delivered', 'returned-letter'):
notification['status'] = 'received'
return notifications
def get_notification_letter_preview(self, service_id, notification_id, file_type, page=None):

13
tests/app/notify_client/test_notification_client.py
View File

@@ -67,11 +67,18 @@ def test_get_notification(mocker):
)
def test_get_api_notifications_changes_letter_statuses(mocker):
@pytest.mark.parametrize("letter_status, expected_status", [
('created', 'accepted'),
('sending', 'accepted'),
('delivered', 'received'),
('returned-letter', 'received'),
("technical-failure", "technical-failure")
])
def test_get_api_notifications_changes_letter_statuses(mocker, letter_status, expected_status):
service_id = str(uuid.uuid4())
sms_notification = single_notification_json(service_id, notification_type='sms', status='created')
email_notification = single_notification_json(service_id, notification_type='email', status='created')
letter_notification = single_notification_json(service_id, notification_type='letter', status='created')
letter_notification = single_notification_json(service_id, notification_type='letter', status=letter_status)
notis = notification_json(service_id=service_id, rows=0)
notis['notifications'] = [sms_notification, email_notification, letter_notification]
@@ -84,7 +91,7 @@ def test_get_api_notifications_changes_letter_statuses(mocker):
assert ret['notifications'][2]['notification_type'] == 'letter'
assert ret['notifications'][0]['status'] == 'created'
assert ret['notifications'][1]['status'] == 'created'
assert ret['notifications'][2]['status'] == 'accepted'
assert ret['notifications'][2]['status'] == expected_status
def test_update_notification_to_cancelled(mocker):