From fd2600b9ba380e25d7b34ae155c4a7be4d9eddd6 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Thu, 3 Apr 2025 09:18:22 +0100 Subject: [PATCH] modifying the handling of non-intrusive frecommendations as strings --- backend/Property.py | 5 +---- backend/app/plan/router.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/backend/Property.py b/backend/Property.py index 5dcc76da..424242fd 100644 --- a/backend/Property.py +++ b/backend/Property.py @@ -107,10 +107,7 @@ class Property: # cost and instead, provide a message that the measure has already been installed self.already_installed = ast.literal_eval(already_installed['already_installed']) if already_installed else [] - self.non_invasive_recommendations = ( - ast.literal_eval(non_invasive_recommendations['recommendations']) if - non_invasive_recommendations else [] - ) + self.non_invasive_recommendations = non_invasive_recommendations # This is a list of measures that have been recommended for the property if isinstance(measures, list): self.measures = measures diff --git a/backend/app/plan/router.py b/backend/app/plan/router.py index 45c19484..3028e45f 100644 --- a/backend/app/plan/router.py +++ b/backend/app/plan/router.py @@ -1,3 +1,4 @@ +import ast import json from datetime import datetime @@ -358,7 +359,6 @@ def extract_property_request_data( ), {}) if isinstance(property_non_invasive_recommendations.get("recommendations"), str): - import ast property_non_invasive_recommendations["recommendations"] = ast.literal_eval( property_non_invasive_recommendations["recommendations"] ) @@ -369,7 +369,7 @@ def extract_property_request_data( else: transformed.append(rec) - property_non_invasive_recommendations["recommendations"] = str(transformed) + property_non_invasive_recommendations["recommendations"] = transformed # Check if the valuation data has uprn valuation_has_uprn = "uprn" in valuation_data[0] if valuation_data else False