From 96d5e7251452e9af586d89ccde5ff9170d4bacdf Mon Sep 17 00:00:00 2001
From: Kenneth Kehl <@kkehl@flexion.us>
Date: Wed, 21 Feb 2024 10:30:24 -0800
Subject: [PATCH] change Recipient to Phone Number

---
 app/utils/csv.py            |  8 ++++----
 tests/app/utils/test_csv.py | 10 +++++-----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/utils/csv.py b/app/utils/csv.py
index e923b2eb2..04d5d19ed 100644
--- a/app/utils/csv.py
+++ b/app/utils/csv.py
@@ -71,6 +71,7 @@ def generate_notifications_csv(**kwargs):
     if "page" not in kwargs:
         kwargs["page"] = 1
 
+    # This generates the "batch" csv report
     if kwargs.get("job_id"):
         original_file_contents = s3download(kwargs["service_id"], kwargs["job_id"])
         original_upload = RecipientCSV(
@@ -79,7 +80,7 @@ def generate_notifications_csv(**kwargs):
         )
         original_column_headers = original_upload.column_headers
         fieldnames = [
-            "Recipient",
+            "Phone Number",
             "Template",
             "Sent by",
             "Batch File",
@@ -92,9 +93,9 @@ def generate_notifications_csv(**kwargs):
                 fieldnames.append(header)
 
     else:
-        # TODO This is deprecated because everything should be a job now, is it ever invoked?
+        # This generates the "full" csv report
         fieldnames = [
-            "Recipient",
+            "Phone Number",
             "Template",
             "Sent by",
             "Batch File",
@@ -102,7 +103,6 @@ def generate_notifications_csv(**kwargs):
             "Status",
             "Time",
         ]
-        current_app.logger.warning("Invoking deprecated report format")
 
     yield ",".join(fieldnames) + "\n"
 
diff --git a/tests/app/utils/test_csv.py b/tests/app/utils/test_csv.py
index 78a1da42b..a7e77055b 100644
--- a/tests/app/utils/test_csv.py
+++ b/tests/app/utils/test_csv.py
@@ -88,14 +88,14 @@ def get_notifications_csv_mock(
         (
             None,
             [
-                "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
+                "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
                 "8005555555,foo,,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",
             ],
         ),
         (
             "Anne Example",
             [
-                "Recipient,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
+                "Phone Number,Template,Sent by,Batch File,Carrier Response,Status,Time\n",
                 "8005555555,foo,Anne Example,,Did not like it,Delivered,1943-04-19 08:00:00 AM US/Eastern\r\n",  # noqa
             ],
         ),
@@ -128,7 +128,7 @@ def test_generate_notifications_csv_without_job(
             8005555555
         """,
             [
-                "Recipient",
+                "Phone Number",
                 "Template",
                 "Sent by",
                 "Batch File",
@@ -152,7 +152,7 @@ def test_generate_notifications_csv_without_job(
             8005555555,  🐜,🐝,🦀
         """,
             [
-                "Recipient",
+                "Phone Number",
                 "Template",
                 "Sent by",
                 "Batch File",
@@ -182,7 +182,7 @@ def test_generate_notifications_csv_without_job(
             "8005555555","🐜,🐜","🐝,🐝","🦀"
         """,
             [
-                "Recipient",
+                "Phone Number",
                 "Template",
                 "Sent by",
                 "Batch File",