From 41c17aa1dafe9110c74d6969f2fa06e58d3f0cf8 Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Sun, 10 Mar 2024 18:13:45 +0000
Subject: [PATCH] HA54 done

---
 .../ha_15_32/ha_analysis_batch_3.py           | 22 ++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
index 7d35386d..d556450b 100644
--- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
+++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
@@ -168,9 +168,17 @@ class DataLoader:
             "address": "A_Address",
             "postcode": "A_Postcode"
         },
+        "HA31": {
+            "address": "A_Address",
+            "postcode": "matching_postcode"
+        },
         "HA48": {
             "address": "Full Address",
             "postcode": "Postcode"
+        },
+        "HA54": {
+            "address": "Postal Address",
+            "postcode": "matching_postcode"
         }
     }
 
@@ -211,7 +219,7 @@ class DataLoader:
 
     def create_asset_list_matching_address(self, ha_name, asset_list):
 
-        if ha_name in ["HA1", "HA6", "HA12", "HA16", "HA24", "HA30", "HA48"]:
+        if ha_name in ["HA1", "HA6", "HA12", "HA16", "HA24", "HA30", "HA31", "HA48", "HA54"]:
             asset_list["matching_address"] = asset_list[
                 self.COLUMN_CONFIG[ha_name]["address"]
             ].astype(str).str.lower().str.strip()
@@ -559,6 +567,12 @@ class DataLoader:
         if ha_name == "HA25":
             asset_sheet_colnames[11] = "matching_postcode"
 
+        if ha_name == "HA31":
+            asset_sheet_colnames[2] = "matching_postcode"
+
+        if ha_name == "HA54":
+            asset_sheet_colnames[10] = "matching_postcode"
+
         rows_data = []
 
         for row in asset_sheet.iter_rows(min_row=2, values_only=False):
@@ -2568,6 +2582,7 @@ class DataLoader:
             "eco4 subject to ciga": "eco4 (subject to ciga)",
             "eco4 (subject to archetype/ciga)": "eco4 (subject to ciga) (subject to archetype)",
             "eco4( subject to ciga/archetype)": "eco4 (subject to ciga) (subject to archetype)",
+            "eco4 (subject to ciga/ archetype)": "eco4 (subject to ciga) (subject to archetype)"
         }
 
         ha_facts_and_figures = []
@@ -5065,11 +5080,12 @@ def app():
     # Add in:
     priority_has = [
         "HA1", "HA2", "HA6", "HA7", "HA9", "HA12", "HA13", "HA14", "HA15", "HA16", "HA18", "HA19", "HA24", "HA25",
-        "HA27", "HA28", "HA30", "HA32", "HA34", "HA35", "HA39", "HA41", "HA48", "HA50", "HA56", "HA63", "HA107", "HA117"
+        "HA27", "HA28", "HA30", "HA31", "HA32", "HA34", "HA35", "HA39", "HA41", "HA48", "HA50", "HA54", "HA56", "HA63",
+        "HA107", "HA117"
     ]
     # Next HAs to do: 14 [DONE], 15[DONE], 32 [DONE], 33 [Input format is 4 parts and no eco4 jobs identified - come
     # back on this], 28 [DONE], 41 [DONE], 50 [DONE], 48 [DONE], 2 [DONE], 63 [DONE], 12 [DONE], 117 [DONE], 13 [DONE],
-    # 35 [DONE], 56 [DONE], 19 [DONE], 18 [DONE], 9 [DONE], 27 [DONE], 34 [DONE], 30 [DONE]
+    # 35 [DONE], 56 [DONE], 19 [DONE], 18 [DONE], 9 [DONE], 27 [DONE], 34 [DONE], 30 [DONE], 31 [DONE], 54 [DONE]
     #
     # Consider for ECO4:
     # Consider for GBIS: