tliu93
3d3c2bcc57
Collapse the three data layers into one. app/db.py now exposes a single Base, a cached engine bound to app_database_url with SQLite WAL enabled, and get_engine/get_session_local/reset_db_caches/get_db_session. Delete app/auth_db.py, app/poo_db.py and app/models/base.py. All models (auth, config, public_ip, location, poo) inherit the one Base and register on a single metadata. Dependencies converge to a single get_db; all routes use it. Also update the alembic env.py files (app/location/poo) and tests that imported the removed modules so the suite stays green, and drop the obsolete test_legacy_style_location_db test whose flow (app reading a separate location DB) no longer exists. Location/poo Alembic chains, adopt scripts and adoption tests remain for M1-T04; config fields remain for M1-T05. pytest 109 passed; ruff clean (pre-existing only); WAL verified; single Base.metadata holds all seven tables.
77 lines
2.8 KiB
Python
77 lines
2.8 KiB
Python
import json
|
|
import logging
|
|
|
|
from fastapi import APIRouter, Depends, Request, status
|
|
from fastapi.responses import PlainTextResponse, Response
|
|
from pydantic import ValidationError
|
|
from sqlalchemy.orm import Session
|
|
|
|
from app.config import Settings
|
|
from app.dependencies import get_app_settings, get_homeassistant_client, get_db
|
|
from app.integrations.homeassistant import HomeAssistantClient
|
|
from app.schemas.poo import PooRecordRequest
|
|
from app.services.poo import publish_latest_poo_status, record_poo
|
|
|
|
router = APIRouter(tags=["poo"])
|
|
logger = logging.getLogger(__name__)
|
|
BAD_REQUEST_MESSAGE = "bad request"
|
|
INTERNAL_SERVER_ERROR_MESSAGE = "internal server error"
|
|
|
|
|
|
@router.post("/poo/record")
|
|
async def create_poo_record(
|
|
request: Request,
|
|
db: Session = Depends(get_db),
|
|
settings: Settings = Depends(get_app_settings),
|
|
homeassistant_client: HomeAssistantClient = Depends(get_homeassistant_client),
|
|
) -> Response:
|
|
try:
|
|
raw_payload = await request.body()
|
|
data = json.loads(raw_payload)
|
|
payload = PooRecordRequest.model_validate(data)
|
|
record_poo(
|
|
db,
|
|
payload,
|
|
settings=settings,
|
|
homeassistant_client=homeassistant_client,
|
|
)
|
|
except json.JSONDecodeError as exc:
|
|
logger.warning("Rejected poo record request due to invalid JSON: %s", exc)
|
|
return PlainTextResponse(BAD_REQUEST_MESSAGE, status_code=status.HTTP_400_BAD_REQUEST)
|
|
except ValidationError as exc:
|
|
logger.warning("Rejected poo record request due to validation failure: %s", exc)
|
|
return PlainTextResponse(BAD_REQUEST_MESSAGE, status_code=status.HTTP_400_BAD_REQUEST)
|
|
except ValueError as exc:
|
|
logger.warning("Rejected poo record request due to invalid numeric input: %s", exc)
|
|
return PlainTextResponse(BAD_REQUEST_MESSAGE, status_code=status.HTTP_400_BAD_REQUEST)
|
|
except Exception as exc:
|
|
logger.warning("Failed to store poo record: %s", exc)
|
|
return PlainTextResponse(
|
|
INTERNAL_SERVER_ERROR_MESSAGE,
|
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
|
)
|
|
|
|
return Response(status_code=status.HTTP_200_OK)
|
|
|
|
|
|
@router.get("/poo/latest")
|
|
def notify_latest_poo(
|
|
db: Session = Depends(get_db),
|
|
settings: Settings = Depends(get_app_settings),
|
|
homeassistant_client: HomeAssistantClient = Depends(get_homeassistant_client),
|
|
) -> Response:
|
|
try:
|
|
publish_latest_poo_status(
|
|
session=db,
|
|
settings=settings,
|
|
homeassistant_client=homeassistant_client,
|
|
)
|
|
except Exception as exc:
|
|
logger.warning("Failed to publish latest poo status: %s", exc)
|
|
return PlainTextResponse(
|
|
INTERNAL_SERVER_ERROR_MESSAGE,
|
|
status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
|
|
)
|
|
|
|
return Response(status_code=status.HTTP_200_OK)
|