fixed ventilation recommendations

This commit is contained in:
Khalim Conn-Kowlessar 2023-12-02 18:24:24 +00:00
parent 5efa6ea59d
commit 82432c0593
3 changed files with 11 additions and 20 deletions

View file

@ -31,8 +31,7 @@ class Recommendations:
self.wall_recomender = WallRecommendations(property_instance=property_instance, materials=materials)
self.roof_recommender = RoofRecommendations(property_instance=property_instance, materials=materials)
self.ventilation_recomender = VentilationRecommendations(
property_instance=property_instance,
materials=[part for part in materials if part["type"] == "mechanical_ventilation"]
property_instance=property_instance, materials=materials
)
self.fireplace_recommender = FireplaceRecommendations(property_instance=property_instance)
self.lighting_recommender = LightingRecommendations(property_instance=property_instance, materials=materials)

View file

@ -27,7 +27,7 @@ class VentilationRecommendations(Definitions):
self.has_ventilaion = None
self.recommendation = None
self.materials = materials
self.materials = [part for part in materials if part["type"] == "mechanical_ventilation"]
def identify_ventilation(self):
self.has_ventilaion = self.property.data["mechanical-ventilation"] in self.VENTILATION_DESCRIPTIONS

View file

@ -1,15 +1,7 @@
from backend.Property import Property
from unittest.mock import Mock
from recommendations.VentilationRecommendations import VentilationRecommendations
ventilation_materials = [
{
'id': 17, 'type': 'mechanical_ventilation', 'description': 'Mechanical Extract Ventilation',
'depths': None, 'depth_unit': None, 'cost': 500, 'cost_unit': 'gbp_per_unit', 'r_value_per_mm': None,
'r_value_unit': None, 'thermal_conductivity': None, 'thermal_conductivity_unit': None,
'link': None, 'is_active': True, 'estimated_cost': 1000, 'quantity': 2, 'quantity_unit': None
}
]
from recommendations.tests.test_data.materials import materials
class TestVentilationRecommendations:
@ -20,7 +12,7 @@ class TestVentilationRecommendations:
recommender = VentilationRecommendations(
property_instance=input_property1,
materials=ventilation_materials
materials=materials
)
assert not recommender.recommendation
@ -29,7 +21,7 @@ class TestVentilationRecommendations:
assert len(recommender.recommendation) == 1
assert recommender.recommendation[0]["cost"] == 1000
assert recommender.recommendation[0]["total"] == 1000
assert recommender.recommendation[0]["type"] == "mechanical_ventilation"
assert len(recommender.recommendation[0]["parts"]) == 1
assert recommender.recommendation[0]["parts"][0]["description"] == 'Mechanical Extract Ventilation'
@ -41,7 +33,7 @@ class TestVentilationRecommendations:
recommender2 = VentilationRecommendations(
property_instance=input_property2,
materials=ventilation_materials
materials=materials
)
assert not recommender2.recommendation
@ -50,7 +42,7 @@ class TestVentilationRecommendations:
assert len(recommender2.recommendation) == 1
assert recommender2.recommendation[0]["cost"] == 1000
assert recommender2.recommendation[0]["total"] == 1000
assert recommender2.recommendation[0]["type"] == "mechanical_ventilation"
assert len(recommender2.recommendation[0]["parts"]) == 1
assert recommender2.recommendation[0]["parts"][0]["description"] == 'Mechanical Extract Ventilation'
@ -62,7 +54,7 @@ class TestVentilationRecommendations:
recommender3 = VentilationRecommendations(
property_instance=input_property3,
materials=ventilation_materials
materials=materials
)
assert not recommender3.recommendation
@ -71,7 +63,7 @@ class TestVentilationRecommendations:
assert len(recommender3.recommendation) == 1
assert recommender3.recommendation[0]["cost"] == 1000
assert recommender3.recommendation[0]["total"] == 1000
assert recommender3.recommendation[0]["type"] == "mechanical_ventilation"
assert len(recommender3.recommendation[0]["parts"]) == 1
assert recommender3.recommendation[0]["parts"][0]["description"] == 'Mechanical Extract Ventilation'
@ -83,7 +75,7 @@ class TestVentilationRecommendations:
recommender4 = VentilationRecommendations(
property_instance=input_property4,
materials=ventilation_materials
materials=materials
)
assert not recommender4.recommendation
@ -99,7 +91,7 @@ class TestVentilationRecommendations:
recommender5 = VentilationRecommendations(
property_instance=input_property5,
materials=ventilation_materials
materials=materials
)
assert not recommender5.recommendation