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

add type conversion to report downloads

Browse Source 
"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
This commit is contained in:
Leo Hemsted
2017-04-28 11:00:55 +01:00
parent 93287719e4
commit fd4e27bfd3
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/models.py
View File

@@ -752,7 +752,8 @@ class Notification(db.Model):
'permanent-failure': 'Email address doesn’t exist', 'permanent-failure': 'Email address doesn’t exist',
'delivered': 'Delivered', 'delivered': 'Delivered',
'sending': 'Sending', 'sending': 'Sending',
'created': 'Sending' 'created': 'Sending',
'sent': 'Delivered'
}, },
'sms': { 'sms': {
'failed': 'Failed', 'failed': 'Failed',
@@ -761,7 +762,8 @@ class Notification(db.Model):
'permanent-failure': 'Phone number doesn’t exist', 'permanent-failure': 'Phone number doesn’t exist',
'delivered': 'Delivered', 'delivered': 'Delivered',
'sending': 'Sending', 'sending': 'Sending',
'created': 'Sending' 'created': 'Sending',
'sent': 'Sent internationally'
}, },
'letter': { 'letter': {
'failed': 'Failed', 'failed': 'Failed',
@@ -770,7 +772,8 @@ class Notification(db.Model):
'permanent-failure': 'Permanent failure', 'permanent-failure': 'Permanent failure',
'delivered': 'Delivered', 'delivered': 'Delivered',
'sending': 'Sending', 'sending': 'Sending',
'created': 'Sending' 'created': 'Sending',
'sent': 'Delivered'
} }
}[self.template.template_type].get(self.status, self.status) }[self.template.template_type].get(self.status, self.status)

1
tests/app/test_model.py
View File

@@ -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'), ('email', 'permanent-failure', 'Email address doesn’t exist'),
('sms', 'temporary-failure', 'Phone not accepting messages right now'), ('sms', 'temporary-failure', 'Phone not accepting messages right now'),
('sms', 'permanent-failure', 'Phone number doesn’t exist'), ('sms', 'permanent-failure', 'Phone number doesn’t exist'),
('sms', 'sent', 'Sent internationally'),
('letter', 'permanent-failure', 'Permanent failure'), ('letter', 'permanent-failure', 'Permanent failure'),
('letter', 'delivered', 'Delivered') ('letter', 'delivered', 'Delivered')
]) ])