From 2aa9f2c532fa2880a5eef70754a48efa7d02dcb6 Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Fri, 9 Feb 2024 07:27:28 -0800
Subject: [PATCH] remove carrier column

---
 app/utils/csv.py            |  4 ----
 tests/app/utils/test_csv.py | 16 ++++------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index 9531e0b5d..679bdb84a 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -83,7 +83,6 @@ def generate_notifications_csv(**kwargs):
             "Type",
             "Sent by",
             "Job",
-            "Carrier",
             "Carrier Response",
             "Status",
             "Time",
@@ -99,7 +98,6 @@ def generate_notifications_csv(**kwargs):
             "Type",
             "Sent by",
             "Job",
-            "Carrier",
             "Carrier Response",
             "Status",
             "Time",
@@ -124,7 +122,6 @@ def generate_notifications_csv(**kwargs):
                     notification["template_type"],
                     notification["created_by_name"],
                     notification["job_name"],
-                    notification["carrier"],
                     notification["provider_response"],
                     notification["status"],
                     preferred_tz_created_at,
@@ -142,7 +139,6 @@ def generate_notifications_csv(**kwargs):
                     notification["template_type"],
                     notification["created_by_name"] or "",
                     notification["job_name"] or "",
-                    notification["carrier"],
                     notification["provider_response"],
                     notification["status"],
                     preferred_tz_created_at,
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index c39414ae5..a3dc446d2 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -18,7 +18,6 @@ def _get_notifications_csv(
     template_name="foo",
     template_type="sms",
     job_name="bar.csv",
-    carrier="ATT Mobility",
     provider_response="Did not like it",
     status="Delivered",
     created_at="1943-04-19 12:00:00",
@@ -50,7 +49,6 @@ def _get_notifications_csv(
                     "template_type": template_type,
                     "template": {"name": template_name, "template_type": template_type},
                     "job_name": job_name,
-                    "carrier": carrier,
                     "provider_response": provider_response,
                     "status": status,
                     "created_at": created_at,
@@ -90,15 +88,15 @@ def get_notifications_csv_mock(
         (
             None,
             [
-                "Recipient,Template,Type,Sent by,Job,Carrier,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,sms,,,ATT Mobility,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
+                "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",
             ],
         ),
         (
             "Anne Example",
             [
-                "Recipient,Template,Type,Sent by,Job,Carrier,Carrier Response,Status,Time\n",
-                "foo@bar.com,foo,sms,Anne Example,,ATT Mobility,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
+                "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
             ],
         ),
     ],
@@ -134,7 +132,6 @@ def test_generate_notifications_csv_without_job(
                 "Type",
                 "Sent by",
                 "Job",
-                "Carrier",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -145,7 +142,6 @@ def test_generate_notifications_csv_without_job(
                 "sms",
                 "Fake Person",
                 "bar.csv",
-                "ATT Mobility",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
@@ -162,7 +158,6 @@ def test_generate_notifications_csv_without_job(
                 "Type",
                 "Sent by",
                 "Job",
-                "Carrier",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -176,7 +171,6 @@ def test_generate_notifications_csv_without_job(
                 "sms",
                 "Fake Person",
                 "bar.csv",
-                "ATT Mobility",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",
@@ -196,7 +190,6 @@ def test_generate_notifications_csv_without_job(
                 "Type",
                 "Sent by",
                 "Job",
-                "Carrier",
                 "Carrier Response",
                 "Status",
                 "Time",
@@ -210,7 +203,6 @@ def test_generate_notifications_csv_without_job(
                 "sms",
                 "Fake Person",
                 "bar.csv",
-                "ATT Mobility",
                 "Did not like it",
                 "Delivered",
                 "1943-04-19 08:00:00 AM US/Eastern",