From 3b325395b9fd5ab61fe76c4af07bb29806ba64f4 Mon Sep 17 00:00:00 2001 From: Khalim Conn-Kowlessar Date: Tue, 17 Sep 2024 09:28:01 +0100 Subject: [PATCH] added dual heating recommendations --- recommendations/HeatingRecommender.py | 4 ++-- .../tests/test_data/heating_recommendations_data.py | 9 +++++++++ recommendations/tests/test_heating_recommendations.py | 2 -- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/recommendations/HeatingRecommender.py b/recommendations/HeatingRecommender.py index 23b9bf7d..db83508b 100644 --- a/recommendations/HeatingRecommender.py +++ b/recommendations/HeatingRecommender.py @@ -33,7 +33,7 @@ class HeatingRecommender: # These are the heating types we need to produce a dual heating recommendation "dual": { "recommendation_description": "Upgrade both the existing boiler to a new condensing boiler and" - "upgrade storage heaters to high heat retention storage heaters.", + " upgrade storage heaters to high heat retention storage heaters.", "types": [ # type 1 "boiler_upgrade", @@ -248,7 +248,7 @@ class HeatingRecommender: # If we have dual heating and we allow for a combined recommendation, to upgrade both systems if self.dual_heating: - self.recommend_dual_heating(phase=phase, measures=measures) + self.recommend_dual_heating() # We recommend air source heat pumps # Heat pumps are suitable for all property types: diff --git a/recommendations/tests/test_data/heating_recommendations_data.py b/recommendations/tests/test_data/heating_recommendations_data.py index 821e79c6..76b8b218 100644 --- a/recommendations/tests/test_data/heating_recommendations_data.py +++ b/recommendations/tests/test_data/heating_recommendations_data.py @@ -1154,6 +1154,15 @@ testing_examples = [ 'uprn': 90041166, 'uprn-source': 'Energy Assessor', 'sheating-energy-eff': None, 'sheating-env-eff': None }, "heating_recommendation_descriptions": [ + 'Install an air source heat pump, and upgrade heating controls to Smart Thermostats, room sensors and ' + 'smart radiator valves (time & temperature zone control). The cost includes the £7500 boiler upgrade ' + 'scheme grant', + 'Upgrade the existing boiler to a new, more efficient condensing boiler. ', + 'Upgrade both the existing boiler to a new condensing boiler and upgrade storage heaters to high heat ' + 'retention storage heaters.', + 'Install high heat retention electric storage heaters alongside the boiler. The current electric heaters ' + 'may be retrofit with high heat retention storage controls however this is dependent on the existing ' + 'system and may not be possible. Upgrade heating controls to High Heat Retention Storage Heater Controls' ], "heating_controls_recommendation_descriptions": [], "notes": "This property is a modified version of the previous dual heating property, where we lower the" diff --git a/recommendations/tests/test_heating_recommendations.py b/recommendations/tests/test_heating_recommendations.py index b80780d9..35373729 100644 --- a/recommendations/tests/test_heating_recommendations.py +++ b/recommendations/tests/test_heating_recommendations.py @@ -53,8 +53,6 @@ class TestHeatingRecommendations: we retrieve alongside them :return: """ - if test_case["epc"]["uprn"] == 90041166: - raise Exception("Finish the second test case with this uprn") epc_records = {"original_epc": test_case["epc"].copy(), "full_sap_epc": {}, "old_data": []}