diff --git a/.idea/Model.iml b/.idea/Model.iml index b0f9c00d..4413bb06 100644 --- a/.idea/Model.iml +++ b/.idea/Model.iml @@ -7,7 +7,7 @@ - + diff --git a/.idea/misc.xml b/.idea/misc.xml index 1122b380..6f308057 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -3,7 +3,7 @@ - + diff --git a/backend/Property.py b/backend/Property.py index 5fe9716e..950c1ac9 100644 --- a/backend/Property.py +++ b/backend/Property.py @@ -139,6 +139,8 @@ class Property: self.recommendations_scoring_data = [] + self.parse_kwargs(kwargs) + @classmethod def extract_kwargs(cls, kwargs): """ @@ -150,11 +152,11 @@ class Property: n_bathrooms = kwargs.get("n_bathrooms", None) if n_bathrooms is not None: # We add on a small value to ensure that the number of bathrooms is rounded up, in case the value is 0.5 - n_bathrooms = int(round(n_bathrooms + 1e-5)) + n_bathrooms = int(round(float(n_bathrooms) + 1e-5)) n_bedrooms = kwargs.get("n_bedrooms", None) if n_bedrooms is not None: - n_bedrooms = int(round(n_bedrooms + 1e-5)) + n_bedrooms = int(round(float(n_bedrooms) + 1e-5)) return { "n_bathrooms": n_bathrooms, diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index 7dc11bb9..3cb2027d 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -109,16 +109,16 @@ async def trigger_plan(body: PlanTriggerRequest): session, body.portfolio_id, epc_searcher.address_clean, epc_searcher.postcode_clean, epc_searcher.uprn ) # if a new record was not created, we don't produduce recommendations - if not is_new: - continue - - create_property_targets( - session, - property_id=property_id, - portfolio_id=body.portfolio_id, - epc_target=body.goal_value, - heat_demand_target=None - ) + # if not is_new: + # continue + # + # create_property_targets( + # session, + # property_id=property_id, + # portfolio_id=body.portfolio_id, + # epc_target=body.goal_value, + # heat_demand_target=None + # ) epc_records = { 'original_epc': epc_searcher.newest_epc.copy(),