diff --git a/app/utils/csv.py b/app/utils/csv.py index 679bdb84a..ff3c43335 100644 --- a/app/utils/csv.py +++ b/app/utils/csv.py @@ -80,9 +80,8 @@ def generate_notifications_csv(**kwargs): original_column_headers = original_upload.column_headers fieldnames = [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -95,9 +94,8 @@ def generate_notifications_csv(**kwargs): fieldnames = [ "Recipient", "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -119,7 +117,6 @@ def generate_notifications_csv(**kwargs): if kwargs.get("job_id"): values = [ notification["template_name"], - notification["template_type"], notification["created_by_name"], notification["job_name"], notification["provider_response"], @@ -136,7 +133,6 @@ def generate_notifications_csv(**kwargs): values = [ notification["recipient"], notification["template_name"], - notification["template_type"], notification["created_by_name"] or "", notification["job_name"] or "", notification["provider_response"], diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py index a3dc446d2..6963aedfe 100644 --- a/tests/app/utils/test_csv.py +++ b/tests/app/utils/test_csv.py @@ -88,15 +88,15 @@ def get_notifications_csv_mock( ( None, [ - "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", - "foo@bar.com,foo,sms,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", + "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", + "foo@bar.com,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", ], ), ( "Anne Example", [ - "Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", - "foo@bar.com,foo,sms,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa + "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n", + "foo@bar.com,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n", # noqa ], ), ], @@ -129,9 +129,8 @@ def test_generate_notifications_csv_without_job( """, [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -139,7 +138,6 @@ def test_generate_notifications_csv_without_job( ], [ "foo", - "sms", "Fake Person", "bar.csv", "Did not like it", @@ -155,9 +153,8 @@ def test_generate_notifications_csv_without_job( """, [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -168,7 +165,6 @@ def test_generate_notifications_csv_without_job( ], [ "foo", - "sms", "Fake Person", "bar.csv", "Did not like it", @@ -187,9 +183,8 @@ def test_generate_notifications_csv_without_job( """, [ "Template", - "Type", "Sent by", - "Job", + "Batch File", "Carrier Response", "Status", "Time", @@ -200,7 +195,6 @@ def test_generate_notifications_csv_without_job( ], [ "foo", - "sms", "Fake Person", "bar.csv", "Did not like it",