From e65d190e1938eddfb28d549ee1a760a591833d0f Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Thu, 21 Dec 2023 11:23:30 +0000 Subject: [PATCH] removed todo --- .idea/Model.iml | 2 +- .idea/misc.xml | 2 +- backend/app/plan/router.py | 7 ------- backend/app/plan/utils.py | 2 +- etl/testing_data/windows_portfolio.py | 2 +- 5 files changed, 4 insertions(+), 11 deletions(-) diff --git a/.idea/Model.iml b/.idea/Model.iml index 4413bb06..b0f9c00d 100644 --- a/.idea/Model.iml +++ b/.idea/Model.iml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 6f308057..1122b380 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index f89395cc..952d4982 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -118,19 +118,12 @@ async def trigger_plan(body: PlanTriggerRequest): logger.info("Getting components and epc recommendations") - # TODO: Move this to a class. We probably want a Recommender class which takes the injects the optimisers - # in as a dependency and then the optimisers can take the input measures in as part of the setup() method - recommendations = {} recommendations_scoring_data = [] property_scoring_data = {} for p in input_properties: - # TODO: TEMP - if p.address1 == "The Hollies Farm House, Church Walk, Little Dalby": - continue - # Property recommendations p.get_components(cleaned) diff --git a/backend/app/plan/utils.py b/backend/app/plan/utils.py index 4185c30e..90042fa2 100644 --- a/backend/app/plan/utils.py +++ b/backend/app/plan/utils.py @@ -178,7 +178,7 @@ def create_recommendation_scoring_data( if recommendation["type"] == "windows_glazing": scoring_dict["MULTI_GLAZE_PROPORTION_ENDING"] = 100 scoring_dict["WINDOWS_ENERGY_EFF_ENDING"] = "Average" - if scoring_dict["glazing_type_ENDING"] == "multiple": + if scoring_dict["glazing_type_ENDING"] in ["multiple", "double"]: pass else: raise NotImplementedError("Implement me") diff --git a/etl/testing_data/windows_portfolio.py b/etl/testing_data/windows_portfolio.py index 16b28c8f..356d107e 100644 --- a/etl/testing_data/windows_portfolio.py +++ b/etl/testing_data/windows_portfolio.py @@ -19,7 +19,7 @@ def app(): [ {"address": "3 Church Terrace", "postcode": "LE13 0PW", "Notes": None}, {"address": "3, Main Street, Redmile", "postcode": "NG13 0GA", "Notes": None}, - {"address": "The Hollies Farm House, Church Walk, Little Dalby", "postcode": "LE14 2UQ", "Notes": None}, + {"address": "Manor House, Kennel Lane, Reepham", "postcode": "LN3 4DZ", "Notes": None}, {"address": "13 Main Street", "postcode": "LE14 2JU", "Notes": None}, {"address": "8 The Crescent, Coston Road, Buckminster", "postcode": "NG33 5SF", "Notes": None}, ]