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

remove Type and change Job to Batch File

Browse Source
This commit is contained in:
Kenneth Kehl
2024-02-14 10:39:52 -08:00
parent 6c66fcb125
commit 53549495ea
2 changed files with 9 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/utils/csv.py
View File

@@ -80,9 +80,8 @@ def generate_notifications_csv(**kwargs):
original_column_headers = original_upload.column_headers original_column_headers = original_upload.column_headers
fieldnames = [ fieldnames = [
"Template", "Template",
"Type",
"Sent by", "Sent by",
"Job", "Batch File",
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
@@ -95,9 +94,8 @@ def generate_notifications_csv(**kwargs):
fieldnames = [ fieldnames = [
"Recipient", "Recipient",
"Template", "Template",
"Type",
"Sent by", "Sent by",
"Job", "Batch File",
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
@@ -119,7 +117,6 @@ def generate_notifications_csv(**kwargs):
if kwargs.get("job_id"): if kwargs.get("job_id"):
values = [ values = [
notification["template_name"], notification["template_name"],
notification["template_type"],
notification["created_by_name"], notification["created_by_name"],
notification["job_name"], notification["job_name"],
notification["provider_response"], notification["provider_response"],
@@ -136,7 +133,6 @@ def generate_notifications_csv(**kwargs):
values = [ values = [
notification["recipient"], notification["recipient"],
notification["template_name"], notification["template_name"],
notification["template_type"],
notification["created_by_name"] or "", notification["created_by_name"] or "",
notification["job_name"] or "", notification["job_name"] or "",
notification["provider_response"], notification["provider_response"],

20
tests/app/utils/test_csv.py
View File

@@ -88,15 +88,15 @@ def get_notifications_csv_mock(
( (
None, None,
[ [
"Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", "Recipient,Template,Sent by,Batch File,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", "foo@bar.com,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
], ],
), ),
( (
"Anne Example", "Anne Example",
[ [
"Recipient,Template,Type,Sent by,Job,Carrier Response,Status,Time\n", "Recipient,Template,Sent by,Batch File,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 "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", "Template",
"Type",
"Sent by", "Sent by",
"Job", "Batch File",
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
@@ -139,7 +138,6 @@ def test_generate_notifications_csv_without_job(
], ],
[ [
"foo", "foo",
"sms",
"Fake Person", "Fake Person",
"bar.csv", "bar.csv",
"Did not like it", "Did not like it",
@@ -155,9 +153,8 @@ def test_generate_notifications_csv_without_job(
""", """,
[ [
"Template", "Template",
"Type",
"Sent by", "Sent by",
"Job", "Batch File",
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
@@ -168,7 +165,6 @@ def test_generate_notifications_csv_without_job(
], ],
[ [
"foo", "foo",
"sms",
"Fake Person", "Fake Person",
"bar.csv", "bar.csv",
"Did not like it", "Did not like it",
@@ -187,9 +183,8 @@ def test_generate_notifications_csv_without_job(
""", """,
[ [
"Template", "Template",
"Type",
"Sent by", "Sent by",
"Job", "Batch File",
"Carrier Response", "Carrier Response",
"Status", "Status",
"Time", "Time",
@@ -200,7 +195,6 @@ def test_generate_notifications_csv_without_job(
], ],
[ [
"foo", "foo",
"sms",
"Fake Person", "Fake Person",
"bar.csv", "bar.csv",
"Did not like it", "Did not like it",