Merge pull request #250 from UKGovernmentBEIS/develop

Merge develop into staging
UKGovernmentBEIS · Dec 4, 2023 · b1799ff · b1799ff
2 parents b7c1619 + d39b6ef
commit b1799ff
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/help_to_heat/portal/download_views.py b/help_to_heat/portal/download_views.py
@@ -20,6 +20,7 @@
 referral_column_headings = (
     "ECO4",
     "GBIS",
+    "country",
     "first_name",
     "last_name",
     "contact_number",
@@ -53,6 +54,8 @@
 referral_column_headings_no_pii = (
     "ECO4",
     "GBIS",
+    "country",
+    "postcode",
     "own_property",
     "benefits",
     "household_income",
@@ -236,7 +239,6 @@ def add_extra_row_data(referral, exclude_pii=False):
         "last_name",
         "email",
         "address",
-        "postcode",
         "contact_number",
     ]
 
@@ -264,7 +266,7 @@ def add_extra_row_data(referral, exclude_pii=False):
         **row,
         "ECO4": "ECO4" in eligibility and "Yes" or "No",
         "GBIS": "GBIS" in eligibility and "Yes" or "No",
-        "epc_rating": epc_rating and epc_rating != "Not found" or "",
+        "epc_rating": epc_rating and epc_rating or "",
         "epc_date": epc_date and epc_date or "",
         "submission_date": created_at.date(),
         "submission_time": created_at.time().strftime("%H:%M:%S"),

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -32,7 +32,7 @@ def test_csv():
     text = csv_page.content.decode("utf-8")
     lines = text.splitlines()
     assert len(lines) == 2
-    assert len(lines[0].split(",")) == 30, len(lines[0].split(","))
+    assert len(lines[0].split(",")) == 31, len(lines[0].split(","))
 
     rows = list(csv.DictReader(lines))
     data = rows[0]