From fd4e27bfd32c576bd52d82852c359be9e1dc89e8 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Fri, 28 Apr 2017 11:00:55 +0100 Subject: [PATCH] add type conversion to report downloads "sent" is fine as an internal marker but not very obvious to the end user that it specifically refers to international messages. We now say "Sent internationally" in the CSV --- app/models.py | 9 ++++++--- tests/app/test_model.py | 1 + 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/app/models.py b/app/models.py index 82d9efb43..064e62ac5 100644 --- a/app/models.py +++ b/app/models.py @@ -752,7 +752,8 @@ class Notification(db.Model): 'permanent-failure': 'Email address doesn’t exist', 'delivered': 'Delivered', 'sending': 'Sending', - 'created': 'Sending' + 'created': 'Sending', + 'sent': 'Delivered' }, 'sms': { 'failed': 'Failed', @@ -761,7 +762,8 @@ class Notification(db.Model): 'permanent-failure': 'Phone number doesn’t exist', 'delivered': 'Delivered', 'sending': 'Sending', - 'created': 'Sending' + 'created': 'Sending', + 'sent': 'Sent internationally' }, 'letter': { 'failed': 'Failed', @@ -770,7 +772,8 @@ class Notification(db.Model): 'permanent-failure': 'Permanent failure', 'delivered': 'Delivered', 'sending': 'Sending', - 'created': 'Sending' + 'created': 'Sending', + 'sent': 'Delivered' } }[self.template.template_type].get(self.status, self.status) diff --git a/tests/app/test_model.py b/tests/app/test_model.py index ba0920745..14fa5609f 100644 --- a/tests/app/test_model.py +++ b/tests/app/test_model.py @@ -111,6 +111,7 @@ def test_notification_for_csv_returns_correct_job_row_number(notify_db, notify_d ('email', 'permanent-failure', 'Email address doesn’t exist'), ('sms', 'temporary-failure', 'Phone not accepting messages right now'), ('sms', 'permanent-failure', 'Phone number doesn’t exist'), + ('sms', 'sent', 'Sent internationally'), ('letter', 'permanent-failure', 'Permanent failure'), ('letter', 'delivered', 'Delivered') ])