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

Notifications CSV Report now also shows sender email address

Browse Source
This commit is contained in:
Pea Tyczynska
2018-12-06 11:54:34 +00:00
parent a1f78abe43
commit 1858ee93fd
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/utils.py
View File

@@ -130,7 +130,7 @@ def generate_notifications_csv(**kwargs):
original_column_headers = original_upload.column_headers original_column_headers = original_upload.column_headers
fieldnames = ['Row number'] + original_column_headers + ['Template', 'Type', 'Job', 'Status', 'Time'] fieldnames = ['Row number'] + original_column_headers + ['Template', 'Type', 'Job', 'Status', 'Time']
else: else:
fieldnames = ['Recipient', 'Template', 'Type', 'Sent by', 'Job', 'Status', 'Time'] fieldnames = ['Recipient', 'Template', 'Type', 'Sent by', 'Sent by email', 'Job', 'Status', 'Time']
yield ','.join(fieldnames) + '\n' yield ','.join(fieldnames) + '\n'
@@ -156,6 +156,7 @@ def generate_notifications_csv(**kwargs):
notification['template_name'], notification['template_name'],
notification['template_type'], notification['template_type'],
notification['created_by_name'] or '', notification['created_by_name'] or '',
notification['created_by_email_address'] or '',
notification['job_name'] or '', notification['job_name'] or '',
notification['status'], notification['status'],
notification['created_at'] notification['created_at']

19
tests/app/test_utils.py
View File

@@ -29,11 +29,12 @@ def _get_notifications_csv(
template_type='sms', template_type='sms',
job_name='bar.csv', job_name='bar.csv',
status='Delivered', status='Delivered',
created_at='Thursday 19 April at 12:00', created_at='1943-04-19 12:00:00',
rows=1, rows=1,
with_links=False, with_links=False,
job_id=fake_uuid, job_id=fake_uuid,
created_by_name=None, created_by_name=None,
created_by_email_address=None,
): ):
def _get( def _get(
@@ -63,6 +64,7 @@ def _get_notifications_csv(
"created_at": created_at, "created_at": created_at,
"updated_at": None, "updated_at": None,
"created_by_name": created_by_name, "created_by_name": created_by_name,
"created_by_email_address": created_by_email_address,
} for i in range(rows)], } for i in range(rows)],
'total': rows, 'total': rows,
'page_size': 50, 'page_size': 50,
@@ -144,14 +146,14 @@ def test_can_create_spreadsheet_from_dict_with_filename():
@pytest.mark.parametrize('created_by_name, expected_content', [ @pytest.mark.parametrize('created_by_name, expected_content', [
( (
None, [ None, [
'Recipient,Template,Type,Sent by,Job,Status,Time\n', 'Recipient,Template,Type,Sent by,Sent by email,Job,Status,Time\n',
'foo@bar.com,foo,sms,,,Delivered,Thursday 19 April at 12:00\r\n', 'foo@bar.com,foo,sms,,sender@email.gov.uk,,Delivered,1943-04-19 12:00:00\r\n',
] ]
), ),
( (
'Anne Example', [ 'Anne Example', [
'Recipient,Template,Type,Sent by,Job,Status,Time\n', 'Recipient,Template,Type,Sent by,Sent by email,Job,Status,Time\n',
'foo@bar.com,foo,sms,Anne Example,,Delivered,Thursday 19 April at 12:00\r\n', 'foo@bar.com,foo,sms,Anne Example,sender@email.gov.uk,,Delivered,1943-04-19 12:00:00\r\n',
] ]
), ),
]) ])
@@ -165,6 +167,7 @@ def test_generate_notifications_csv_without_job(
'app.notification_api_client.get_notifications_for_service', 'app.notification_api_client.get_notifications_for_service',
side_effect=_get_notifications_csv( side_effect=_get_notifications_csv(
created_by_name=created_by_name, created_by_name=created_by_name,
created_by_email_address="sender@email.gov.uk",
job_id=None, job_id=None,
job_name=None, job_name=None,
) )
@@ -179,7 +182,7 @@ def test_generate_notifications_csv_without_job(
07700900123 07700900123
""", """,
['Row number', 'phone_number', 'Template', 'Type', 'Job', 'Status', 'Time'], ['Row number', 'phone_number', 'Template', 'Type', 'Job', 'Status', 'Time'],
['1', '07700900123', 'foo', 'sms', 'bar.csv', 'Delivered', 'Thursday 19 April at 12:00'], ['1', '07700900123', 'foo', 'sms', 'bar.csv', 'Delivered', '1943-04-19 12:00:00'],
), ),
( (
""" """
@@ -187,7 +190,7 @@ def test_generate_notifications_csv_without_job(
07700900123, 🐜,🐝,🦀 07700900123, 🐜,🐝,🦀
""", """,
['Row number', 'phone_number', 'a', 'b', 'c', 'Template', 'Type', 'Job', 'Status', 'Time'], ['Row number', 'phone_number', 'a', 'b', 'c', 'Template', 'Type', 'Job', 'Status', 'Time'],
['1', '07700900123', '🐜', '🐝', '🦀', 'foo', 'sms', 'bar.csv', 'Delivered', 'Thursday 19 April at 12:00'], ['1', '07700900123', '🐜', '🐝', '🦀', 'foo', 'sms', 'bar.csv', 'Delivered', '1943-04-19 12:00:00'],
), ),
( (
""" """
@@ -195,7 +198,7 @@ def test_generate_notifications_csv_without_job(
"07700900123","🐜,🐜","🐝,🐝","🦀" "07700900123","🐜,🐜","🐝,🐝","🦀"
""", """,
['Row number', 'phone_number', 'a', 'b', 'c', 'Template', 'Type', 'Job', 'Status', 'Time'], ['Row number', 'phone_number', 'a', 'b', 'c', 'Template', 'Type', 'Job', 'Status', 'Time'],
['1', '07700900123', '🐜,🐜', '🐝,🐝', '🦀', 'foo', 'sms', 'bar.csv', 'Delivered', 'Thursday 19 April at 12:00'], ['1', '07700900123', '🐜,🐜', '🐝,🐝', '🦀', 'foo', 'sms', 'bar.csv', 'Delivered', '1943-04-19 12:00:00'],
), ),
]) ])
def test_generate_notifications_csv_returns_correct_csv_file( def test_generate_notifications_csv_returns_correct_csv_file(