diff --git a/app/templates/views/activity/notifications.html b/app/templates/views/activity/notifications.html index 0107ff815..cb780207e 100644 --- a/app/templates/views/activity/notifications.html +++ b/app/templates/views/activity/notifications.html @@ -19,7 +19,7 @@ {% if item.status in ('pending-virus-check', 'virus-scan-failed') %} Checking {% else %} - {{ item.to.splitlines()[0] }} + {{ item.to.splitlines()[0].lstrip().rstrip(' ,') }} {% endif %}
{{ item.preview_of_content }} diff --git a/app/utils.py b/app/utils.py index b7ce5b69e..af2537a05 100644 --- a/app/utils.py +++ b/app/utils.py @@ -165,7 +165,7 @@ def generate_notifications_csv(**kwargs): original_column_headers = original_upload.column_headers fieldnames = ['Row number'] + original_column_headers + ['Template', 'Type', 'Job', 'Status', 'Time'] else: - fieldnames = ['Recipient', 'Template', 'Type', 'Sent by', 'Sent by email', 'Job', 'Status', 'Time'] + fieldnames = ['Recipient', 'Reference', 'Template', 'Type', 'Sent by', 'Sent by email', 'Job', 'Status', 'Time'] yield ','.join(fieldnames) + '\n' @@ -187,7 +187,9 @@ def generate_notifications_csv(**kwargs): ] else: values = [ - notification['recipient'], + # the recipient for precompiled letters is the full address block + notification['recipient'].splitlines()[0].lstrip().rstrip(' ,'), + notification['client_reference'], notification['template_name'], notification['template_type'], notification['created_by_name'] or '', diff --git a/tests/app/test_utils.py b/tests/app/test_utils.py index fea2d3121..8a62252d4 100644 --- a/tests/app/test_utils.py +++ b/tests/app/test_utils.py @@ -55,6 +55,7 @@ def _get_notifications_csv( "row_number": row_number + i, "to": recipient, "recipient": recipient, + "client_reference": 'ref 1234', "template_name": template_name, "template_type": template_type, "template": {"name": template_name, "template_type": template_type}, @@ -160,14 +161,14 @@ def test_spreadsheet_checks_for_bad_arguments(args, kwargs): @pytest.mark.parametrize('created_by_name, expected_content', [ ( None, [ - 'Recipient,Template,Type,Sent by,Sent by email,Job,Status,Time\n', - 'foo@bar.com,foo,sms,,sender@email.gov.uk,,Delivered,1943-04-19 12:00:00\r\n', + 'Recipient,Reference,Template,Type,Sent by,Sent by email,Job,Status,Time\n', + 'foo@bar.com,ref 1234,foo,sms,,sender@email.gov.uk,,Delivered,1943-04-19 12:00:00\r\n', ] ), ( 'Anne Example', [ - 'Recipient,Template,Type,Sent by,Sent by email,Job,Status,Time\n', - 'foo@bar.com,foo,sms,Anne Example,sender@email.gov.uk,,Delivered,1943-04-19 12:00:00\r\n', + 'Recipient,Reference,Template,Type,Sent by,Sent by email,Job,Status,Time\n', + 'foo@bar.com,ref 1234,foo,sms,Anne Example,sender@email.gov.uk,,Delivered,1943-04-19 12:00:00\r\n', ] ), ]) @@ -183,7 +184,7 @@ def test_generate_notifications_csv_without_job( created_by_name=created_by_name, created_by_email_address="sender@email.gov.uk", job_id=None, - job_name=None, + job_name=None ) ) assert list(generate_notifications_csv(service_id=fake_uuid)) == expected_content