diff --git a/domain/epc/property_overlays/__init__.py b/domain/epc/property_overlays/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/domain/epc/attribute_overlay.py b/domain/epc/property_overlays/attribute_overlay.py similarity index 100% rename from domain/epc/attribute_overlay.py rename to domain/epc/property_overlays/attribute_overlay.py diff --git a/domain/epc/roof_type_overlay.py b/domain/epc/property_overlays/roof_type_overlay.py similarity index 100% rename from domain/epc/roof_type_overlay.py rename to domain/epc/property_overlays/roof_type_overlay.py diff --git a/domain/epc/wall_type_overlay.py b/domain/epc/property_overlays/wall_type_overlay.py similarity index 100% rename from domain/epc/wall_type_overlay.py rename to domain/epc/property_overlays/wall_type_overlay.py diff --git a/repositories/property/landlord_override_overlays.py b/repositories/property/landlord_override_overlays.py index 3eff5213..ab8d7ca3 100644 --- a/repositories/property/landlord_override_overlays.py +++ b/repositories/property/landlord_override_overlays.py @@ -25,12 +25,12 @@ from __future__ import annotations from typing import Callable, Optional -from domain.epc.attribute_overlay import ( +from domain.epc.property_overlays.attribute_overlay import ( built_form_overlay_for, property_type_overlay_for, ) -from domain.epc.roof_type_overlay import roof_overlay_for -from domain.epc.wall_type_overlay import wall_overlay_for +from domain.epc.property_overlays.roof_type_overlay import roof_overlay_for +from domain.epc.property_overlays.wall_type_overlay import wall_overlay_for from domain.modelling.simulation import EpcSimulation from repositories.property.property_overrides_reader import ResolvedPropertyOverrides diff --git a/scripts/inspect_overlay.py b/scripts/inspect_overlay.py index 94b073e9..ae590766 100644 --- a/scripts/inspect_overlay.py +++ b/scripts/inspect_overlay.py @@ -33,7 +33,7 @@ from datatypes.epc.domain.epc_property_data import ( BuildingPartIdentifier, EpcPropertyData, ) -from domain.epc.wall_type_overlay import wall_overlay_for +from domain.epc.property_overlays.wall_type_overlay import wall_overlay_for from domain.property.property import Property, PropertyIdentity from domain.sap10_calculator.calculator import Sap10Calculator from infrastructure.epc_client.epc_client_service import EpcClientService diff --git a/tests/domain/epc/test_attribute_overlay.py b/tests/domain/epc/test_attribute_overlay.py index f890875f..4816069d 100644 --- a/tests/domain/epc/test_attribute_overlay.py +++ b/tests/domain/epc/test_attribute_overlay.py @@ -8,7 +8,7 @@ from __future__ import annotations import pytest -from domain.epc.attribute_overlay import ( +from domain.epc.property_overlays.attribute_overlay import ( built_form_overlay_for, property_type_overlay_for, ) diff --git a/tests/domain/epc/test_roof_type_overlay.py b/tests/domain/epc/test_roof_type_overlay.py index b2ca85a1..753feb22 100644 --- a/tests/domain/epc/test_roof_type_overlay.py +++ b/tests/domain/epc/test_roof_type_overlay.py @@ -10,7 +10,7 @@ from __future__ import annotations import pytest from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier -from domain.epc.roof_type_overlay import roof_overlay_for +from domain.epc.property_overlays.roof_type_overlay import roof_overlay_for def test_pitched_loft_depth_maps_to_roof_insulation_thickness() -> None: diff --git a/tests/domain/epc/test_wall_type_overlay.py b/tests/domain/epc/test_wall_type_overlay.py index 4fe0c320..df0edccc 100644 --- a/tests/domain/epc/test_wall_type_overlay.py +++ b/tests/domain/epc/test_wall_type_overlay.py @@ -10,7 +10,7 @@ from __future__ import annotations import pytest from datatypes.epc.domain.epc_property_data import BuildingPartIdentifier -from domain.epc.wall_type_overlay import wall_overlay_for +from domain.epc.property_overlays.wall_type_overlay import wall_overlay_for def test_solid_brick_with_internal_insulation_overlays_main_wall() -> None: diff --git a/tests/domain/property/test_property_landlord_overlay.py b/tests/domain/property/test_property_landlord_overlay.py index a3cfa3b3..47e9c02a 100644 --- a/tests/domain/property/test_property_landlord_overlay.py +++ b/tests/domain/property/test_property_landlord_overlay.py @@ -16,8 +16,8 @@ from datatypes.epc.domain.epc_property_data import ( BuildingPartIdentifier, EpcPropertyData, ) -from domain.epc.attribute_overlay import property_type_overlay_for -from domain.epc.wall_type_overlay import wall_overlay_for +from domain.epc.property_overlays.attribute_overlay import property_type_overlay_for +from domain.epc.property_overlays.wall_type_overlay import wall_overlay_for from domain.property.property import Property, PropertyIdentity _JSON_SAMPLES = Path(__file__).resolve().parents[3] / "backend/epc_api/json_samples"