diff --git a/backend/documents_parser/tests/test_end_to_end.py b/backend/documents_parser/tests/test_end_to_end.py index b59e667b..1310859f 100644 --- a/backend/documents_parser/tests/test_end_to_end.py +++ b/backend/documents_parser/tests/test_end_to_end.py @@ -14,6 +14,8 @@ from datatypes.epc.domain.epc_property_data import ( SapFloorDimension, SapHeating, SapWindow, + ShowerOutlet, + ShowerOutlets, ) from datatypes.epc.domain.mapper import EpcPropertyDataMapper @@ -52,6 +54,9 @@ class TestPdfToEpcPropertyData: ) ], has_fixed_air_conditioning=False, + shower_outlets=ShowerOutlets( + shower_outlet=ShowerOutlet(shower_outlet_type="Non-Electric Shower"), + ), ), sap_windows=[ SapWindow( diff --git a/datatypes/epc/domain/epc_property_data.py b/datatypes/epc/domain/epc_property_data.py index ef01155f..84a76d43 100644 --- a/datatypes/epc/domain/epc_property_data.py +++ b/datatypes/epc/domain/epc_property_data.py @@ -39,8 +39,8 @@ class MainHeatingDetail: @dataclass class ShowerOutlet: - shower_wwhrs: int - shower_outlet_type: int + shower_outlet_type: Union[int, str] + shower_wwhrs: Optional[int] = None @dataclass diff --git a/datatypes/epc/domain/tests/test_from_site_notes.py b/datatypes/epc/domain/tests/test_from_site_notes.py index 78af5152..cb69e42d 100644 --- a/datatypes/epc/domain/tests/test_from_site_notes.py +++ b/datatypes/epc/domain/tests/test_from_site_notes.py @@ -14,6 +14,8 @@ from datatypes.epc.domain.epc_property_data import ( SapFloorDimension, SapHeating, SapWindow, + ShowerOutlet, + ShowerOutlets, ) from datatypes.epc.domain.mapper import EpcPropertyDataMapper from datatypes.epc.schema.tests.helpers import from_dict @@ -382,6 +384,9 @@ class TestFromSiteNotesExample1: ) ], has_fixed_air_conditioning=False, + shower_outlets=ShowerOutlets( + shower_outlet=ShowerOutlet(shower_outlet_type="Non-Electric Shower"), + ), ), # Windows sap_windows=[