mirror of
https://github.com/Hestia-Homes/Model.git
synced 2026-07-12 13:29:04 +00:00
11393e54dc
The FE-owned `material.type` pgEnum cannot carry `secondary_heating_removal`, so pricing it through the DB catalogue raises a DataError that poisons the session — the modelling pipeline crashed on any property with a lodged secondary heater unless the measure was excluded on the Scenario. Realise the `ProductRepository` docstring's intent (DB catalogue today, a JSON file for costs the ETL does not yet supply, behind the same port): add a `CompositeProductRepository` that resolves an override source first, then the catalogue. Checking the override first keeps that Measure Type away from the DB entirely; every other type misses the override and falls through unchanged. - off_catalogue_costs.json prices it at £270 flat per-dwelling — the legacy `Costs.heater_removal` ported to the new flat model (ADR-0028): (£25 + £200 baseline) x 1.2 VAT, for the single fixed secondary a cert lodges. Contingency (0.25) is joined from config, not the file. - Wire the composite into PostgresUnitOfWork.product and run_modelling_e2e, so the first-run pipeline and the local runner both honour the overlay. - Integration test: drop the unrealistic seeded secondary_heating_removal DB rows (the pgEnum can't hold the type) and assert it is JSON-sourced (material_id is None, cost £270) end-to-end through a real Unit of Work. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
71 lines
2.6 KiB
Python
71 lines
2.6 KiB
Python
from __future__ import annotations
|
|
|
|
from collections.abc import Callable
|
|
from types import TracebackType
|
|
from typing import Optional
|
|
|
|
from sqlmodel import Session
|
|
|
|
from repositories.property_baseline.property_baseline_postgres_repository import (
|
|
PropertyBaselinePostgresRepository,
|
|
)
|
|
from repositories.epc.epc_postgres_repository import EpcPostgresRepository
|
|
from repositories.plan.plan_postgres_repository import PlanPostgresRepository
|
|
from repositories.product.composite_product_repository import (
|
|
catalogue_with_off_catalogue_overrides,
|
|
)
|
|
from repositories.property.property_postgres_repository import (
|
|
PropertyPostgresRepository,
|
|
)
|
|
from repositories.scenario.scenario_postgres_repository import (
|
|
ScenarioPostgresRepository,
|
|
)
|
|
from repositories.solar.solar_postgres_repository import SolarPostgresRepository
|
|
from repositories.spatial.spatial_postgres_repository import SpatialPostgresRepository
|
|
from repositories.unit_of_work import UnitOfWork
|
|
|
|
|
|
class PostgresUnitOfWork(UnitOfWork):
|
|
"""Postgres-backed Unit of Work: one ``Session``, all repos bound to it.
|
|
|
|
Built from a session factory (a module-scoped engine + sessionmaker in
|
|
production, ADR-0012) so the connection pool is reused across warm Lambda
|
|
invocations. The session is opened on ``__enter__`` and closed on
|
|
``__exit__``; a fresh instance is one single-use unit.
|
|
"""
|
|
|
|
def __init__(self, session_factory: Callable[[], Session]) -> None:
|
|
self._session_factory = session_factory
|
|
|
|
def __enter__(self) -> "PostgresUnitOfWork":
|
|
self._session = self._session_factory()
|
|
epc_repo = EpcPostgresRepository(self._session)
|
|
spatial_repo = SpatialPostgresRepository(self._session)
|
|
self.property = PropertyPostgresRepository(
|
|
self._session, epc_repo, spatial_repo
|
|
)
|
|
self.epc = epc_repo
|
|
self.solar = SolarPostgresRepository(self._session)
|
|
self.spatial = spatial_repo
|
|
self.property_baseline = PropertyBaselinePostgresRepository(self._session)
|
|
self.scenario = ScenarioPostgresRepository(self._session)
|
|
self.product = catalogue_with_off_catalogue_overrides(self._session)
|
|
self.plan = PlanPostgresRepository(self._session)
|
|
return self
|
|
|
|
def __exit__(
|
|
self,
|
|
exc_type: Optional[type[BaseException]],
|
|
exc: Optional[BaseException],
|
|
tb: Optional[TracebackType],
|
|
) -> None:
|
|
try:
|
|
self._session.rollback()
|
|
finally:
|
|
self._session.close()
|
|
|
|
def commit(self) -> None:
|
|
self._session.commit()
|
|
|
|
def rollback(self) -> None:
|
|
self._session.rollback()
|