From 86dd6efdc387a2b6c67a9244db3382d6fe7896ab Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Fri, 19 Jan 2024 11:27:51 +0000 Subject: [PATCH] fixed bug in lighting outlets cleaning --- backend/app/plan/router.py | 20 ++++++++++++-------- etl/epc/Record.py | 2 +- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index 521ec615..d3471e8f 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -66,14 +66,18 @@ async def trigger_plan(body: PlanTriggerRequest): ) # For testing: - # plan_input.extend( - # [ - # {'address': '73 Long Chaulden', 'postcode': 'HP1 2HX', 'Notes': ''}, - # {'address': '8 Lindlings', 'postcode': 'HP1 2HA', 'Notes': ''}, - # {'address': '44 Lindlings', 'postcode': 'HP1 2HE', 'Notes': ''}, - # {'address': '46 Chaulden Terrace', 'postcode': 'HP1 2AN', 'Notes': ''}, - # ] - # ) + plan_input.extend( + [ + {'address': '73 Long Chaulden', 'postcode': 'HP1 2HX', 'Notes': ''}, + {'address': '8 Lindlings', 'postcode': 'HP1 2HA', 'Notes': ''}, + {'address': '44 Lindlings', 'postcode': 'HP1 2HE', 'Notes': ''}, + {'address': '46 Chaulden Terrace', 'postcode': 'HP1 2AN', 'Notes': ''}, + {'address': '4, Heather Shaw', 'postcode': 'BA14 7JS', 'Notes': ''}, + {'address': '16 Glastonbury Road', 'postcode': 'M32 9PE', 'Notes': ''}, + {'address': '31 Loddon Way', 'postcode': 'BA15 1HG', 'Notes': ''}, + {'address': '62 Pearmain Drive', 'postcode': 'NG3 3DJ', 'Notes': ''}, + ] + ) input_properties = [] for config in plan_input: diff --git a/etl/epc/Record.py b/etl/epc/Record.py index 4474baf1..cdbafd7e 100644 --- a/etl/epc/Record.py +++ b/etl/epc/Record.py @@ -389,7 +389,7 @@ class EPCRecord: cleaned_property_data = EPCDataProcessor.apply_averages_cleaning( data_to_clean=self.epc_record_as_dataframe("prepared_epc", replace_empty_string=True), - cleaning_data=self.cleaning_data, + cleaning_data=cleaning_data, cols_to_merge_on=['PROPERTY_TYPE', 'BUILT_FORM', 'CONSTRUCTION_AGE_BAND', 'LOCAL_AUTHORITY'], ) self.prepared_epc["fixed-lighting-outlets-count"] = round(