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 54cd7c58..63a72714 100644 --- a/etl/eligibility/ha_15_32/ha_analysis_batch_3.py +++ b/etl/eligibility/ha_15_32/ha_analysis_batch_3.py @@ -226,11 +226,18 @@ class DataLoader: @staticmethod def merge_ha_6(asset_list, survey_list): - # Correct the asset list - asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("baggott place", "baggotts place") - asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("cherry tree", "cherrytree") - asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("maryhill close", "mary hill close") - asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("moffat way", "moffatt way") + # Correct the asset list across propertyaddress and matching_address + asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("Baggott Place", "Baggotts Place") + asset_list["matching_address"] = asset_list["matching_address"].str.replace("baggott place", "baggotts place") + + asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("Cherry Tree", "Cherrytree") + asset_list["matching_address"] = asset_list["matching_address"].str.replace("cherry tree", "cherrytree") + + asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("Maryhill Close", "Mary Hill Close") + asset_list["matching_address"] = asset_list["matching_address"].str.replace("maryhill close", "mary hill close") + + asset_list["propertyaddress"] = asset_list["propertyaddress"].str.replace("Moffat Way", "Moffatt Way") + asset_list["matching_address"] = asset_list["matching_address"].str.replace("moffat way", "moffatt way") # Correct the survey list survey_list["Street / Block Name"] = survey_list["Street / Block Name"].str.replace(