From cd81c2b0b29a65b3fd3c59ec5dec7730afdd64ec Mon Sep 17 00:00:00 2001
From: Khalim Conn-Kowlessar <kconnkowlessar@gmail.com>
Date: Sun, 10 Mar 2024 16:45:59 +0000
Subject: [PATCH] done ha30 matching

---
 .../ha_15_32/ha_analysis_batch_3.py           | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

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 bdb0d0c4..71062b16 100644
--- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
+++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py
@@ -1915,6 +1915,74 @@ class DataLoader:
               (survey_list["NO."] == 9))
         ]
 
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "PAYTHORNE CLOSE") &
+              (survey_list["NO."] == 10))
+        ]
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "MARCHWOOD ROAD") &
+              (survey_list["NO."] == 11))
+        ]
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "Otterburn Close") &
+              (survey_list["NO."] == 4))
+        ]
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "Blossom Court") &
+              (survey_list["NO."] == 5))
+        ]
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "St LUKES CLOSE , HUNTINGDON", "St. Lukes Close"
+        )
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "St. Lukes Close") &
+              (survey_list["NO."].isin([4, 7, 8])))
+        ]
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "ROMAN WAY , GODMANCHESTER , HUNTINGDON", "Roman Way"
+        )
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "Roman Way") &
+              (survey_list["NO."].isin([58])))
+        ]
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "HEADLANDS , FENSTANTON , HUNTINGDON", "Headlands Fenstanton"
+        )
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "Headlands Fenstanton") &
+              (survey_list["NO."].isin([126, 134])))
+        ]
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "WALLACE COURT , HUNTINGDON", "Wallace Court"
+        )
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "CRICKETERS WAY , CHATTERIS", "Cricketers Way"
+        )
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "Jubilee Gardens", "Jubilee Green"
+        )
+
+        survey_list = survey_list[
+            ~((survey_list["Street / Block Name"] == "Harrow Road") &
+              (survey_list["NO."].isin([10])))
+        ]
+
+        survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(
+            "ST LUKES CLOSE", "St. Lukes Close"
+        )
+
         return survey_list
 
     @staticmethod