M1-T04: converge startup chain onto the single app DB

run_all_migrations() now adopts/initializes only the app DB and returns {'app': ...}. app/main.py drops the location/poo readiness checks (ensure_location_db_ready / ensure_poo_db_ready) and their imports; ensure_runtime_dirs only provisions the app DB path; lifespan still fail-closes on a missing/unmanaged app DB. Delete the retired location/poo adopt scripts and the alembic_location / alembic_poo chains. Update tests to single-DB expectations and drop the obsolete location/poo adoption + readiness tests. pytest 95 passed; ruff clean (pre-existing only); a fresh app DB initialized via scripts.run_migrations contains location + poo_records.
2026-06-12 16:50:05 +02:00
parent 3d3c2bcc57
commit 0d898e09f2
21 changed files with 12 additions and 1226 deletions
@@ -9,7 +9,7 @@ from app.db import reset_db_caches
 from app.config import get_settings
 from app.main import create_app
 from scripts.app_db_adopt import APP_BASELINE_REVISION, adopt_or_initialize_app_db
-from tests.conftest import _make_alembic_config, _make_app_alembic_config, _make_poo_alembic_config
+from tests.conftest import _make_app_alembic_config


 async def _run_lifespan(app) -> None:
@@ -38,16 +38,10 @@ def test_status_endpoint(client: TestClient) -> None:

 def test_app_start_fails_when_app_db_missing(tmp_path, monkeypatch: pytest.MonkeyPatch) -> None:
    missing_app_path = tmp_path / "missing_app.db"
-    poo_database_path = tmp_path / "poo_ready.db"
-    location_database_path = tmp_path / "location_ready.db"
-    command.upgrade(_make_poo_alembic_config(f"sqlite:///{poo_database_path}"), "head")
-    command.upgrade(_make_alembic_config(f"sqlite:///{location_database_path}"), "head")

    monkeypatch.setenv("APP_DATABASE_URL", f"sqlite:///{missing_app_path}")
    monkeypatch.setenv("AUTH_BOOTSTRAP_USERNAME", "admin")
    monkeypatch.setenv("AUTH_BOOTSTRAP_PASSWORD", "test-password")
-    monkeypatch.setenv("LOCATION_DATABASE_URL", f"sqlite:///{location_database_path}")
-    monkeypatch.setenv("POO_DATABASE_URL", f"sqlite:///{poo_database_path}")
    get_settings.cache_clear()
    reset_db_caches()

@@ -86,10 +80,6 @@ def test_app_start_seeds_missing_config_from_env_without_overwriting_existing_va
    tmp_path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
    app_database_url = _prepare_app_db(tmp_path)
-    location_database_path = tmp_path / "location_ready.db"
-    poo_database_path = tmp_path / "poo_ready.db"
-    command.upgrade(_make_alembic_config(f"sqlite:///{location_database_path}"), "head")
-    command.upgrade(_make_poo_alembic_config(f"sqlite:///{poo_database_path}"), "head")

    app_database_path = tmp_path / "app_ready.db"
    conn = sqlite3.connect(app_database_path)
@@ -105,8 +95,6 @@ def test_app_start_seeds_missing_config_from_env_without_overwriting_existing_va
    monkeypatch.setenv("AUTH_BOOTSTRAP_PASSWORD", "test-password")
    monkeypatch.setenv("APP_NAME", "Bootstrap Name")
    monkeypatch.setenv("HOME_ASSISTANT_BASE_URL", "http://bootstrap-ha.local:8123")
-    monkeypatch.setenv("LOCATION_DATABASE_URL", f"sqlite:///{location_database_path}")
-    monkeypatch.setenv("POO_DATABASE_URL", f"sqlite:///{poo_database_path}")
    get_settings.cache_clear()
    reset_db_caches()

@@ -131,10 +119,6 @@ def test_app_start_syncs_app_hostname_from_env_even_when_db_has_old_value(
    tmp_path, monkeypatch: pytest.MonkeyPatch
 ) -> None:
    app_database_url = _prepare_app_db(tmp_path)
-    location_database_path = tmp_path / "location_ready.db"
-    poo_database_path = tmp_path / "poo_ready.db"
-    command.upgrade(_make_alembic_config(f"sqlite:///{location_database_path}"), "head")
-    command.upgrade(_make_poo_alembic_config(f"sqlite:///{poo_database_path}"), "head")

    app_database_path = tmp_path / "app_ready.db"
    conn = sqlite3.connect(app_database_path)
@@ -149,8 +133,6 @@ def test_app_start_syncs_app_hostname_from_env_even_when_db_has_old_value(
    monkeypatch.setenv("AUTH_BOOTSTRAP_USERNAME", "admin")
    monkeypatch.setenv("AUTH_BOOTSTRAP_PASSWORD", "test-password")
    monkeypatch.setenv("APP_HOSTNAME", "new.example.com")
-    monkeypatch.setenv("LOCATION_DATABASE_URL", f"sqlite:///{location_database_path}")
-    monkeypatch.setenv("POO_DATABASE_URL", f"sqlite:///{poo_database_path}")
    get_settings.cache_clear()
    reset_db_caches()

@@ -167,98 +149,3 @@ def test_app_start_syncs_app_hostname_from_env_even_when_db_has_old_value(

    get_settings.cache_clear()
    reset_db_caches()
-
-
-def test_app_start_fails_when_location_db_missing(
-    tmp_path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    app_database_url = _prepare_app_db(tmp_path)
-    monkeypatch.setenv("APP_DATABASE_URL", app_database_url)
-    monkeypatch.setenv("AUTH_BOOTSTRAP_USERNAME", "admin")
-    monkeypatch.setenv("AUTH_BOOTSTRAP_PASSWORD", "test-password")
-    poo_database_path = tmp_path / "poo_ready.db"
-    command.upgrade(_make_poo_alembic_config(f"sqlite:///{poo_database_path}"), "head")
-
-    monkeypatch.setenv("LOCATION_DATABASE_URL", f"sqlite:///{tmp_path / 'missing.db'}")
-    monkeypatch.setenv("POO_DATABASE_URL", f"sqlite:///{poo_database_path}")
-    get_settings.cache_clear()
-    reset_db_caches()
-
-    app = create_app()
-    with pytest.raises(RuntimeError, match="Run 'python scripts/location_db_adopt.py' first"):
-        anyio.run(_run_lifespan, app)
-
-    get_settings.cache_clear()
-    reset_db_caches()
-
-
-def test_app_start_fails_when_location_db_exists_but_is_not_adopted(
-    tmp_path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    app_database_url = _prepare_app_db(tmp_path)
-    monkeypatch.setenv("APP_DATABASE_URL", app_database_url)
-    monkeypatch.setenv("AUTH_BOOTSTRAP_USERNAME", "admin")
-    monkeypatch.setenv("AUTH_BOOTSTRAP_PASSWORD", "test-password")
-    poo_database_path = tmp_path / "poo_ready.db"
-    command.upgrade(_make_poo_alembic_config(f"sqlite:///{poo_database_path}"), "head")
-
-    database_path = tmp_path / "legacy_only.db"
-    conn = sqlite3.connect(database_path)
-    conn.execute(
-        """
-        CREATE TABLE location (
-          person TEXT NOT NULL,
-          datetime TEXT NOT NULL,
-          latitude REAL NOT NULL,
-          longitude REAL NOT NULL,
-          altitude REAL,
-          PRIMARY KEY (person, datetime)
-        )
-        """
-    )
-    conn.execute("PRAGMA user_version = 2")
-    conn.commit()
-    conn.close()
-
-    monkeypatch.setenv("LOCATION_DATABASE_URL", f"sqlite:///{database_path}")
-    monkeypatch.setenv("POO_DATABASE_URL", f"sqlite:///{poo_database_path}")
-    get_settings.cache_clear()
-    reset_db_caches()
-
-    app = create_app()
-    with pytest.raises(RuntimeError, match="is not yet Alembic-managed"):
-        anyio.run(_run_lifespan, app)
-
-    get_settings.cache_clear()
-    reset_db_caches()
-
-
-def test_app_start_fails_when_location_db_revision_mismatches(
-    tmp_path, monkeypatch: pytest.MonkeyPatch
-) -> None:
-    app_database_url = _prepare_app_db(tmp_path)
-    monkeypatch.setenv("APP_DATABASE_URL", app_database_url)
-    monkeypatch.setenv("AUTH_BOOTSTRAP_USERNAME", "admin")
-    monkeypatch.setenv("AUTH_BOOTSTRAP_PASSWORD", "test-password")
-    poo_database_path = tmp_path / "poo_ready.db"
-    command.upgrade(_make_poo_alembic_config(f"sqlite:///{poo_database_path}"), "head")
-
-    database_path = tmp_path / "wrong_revision.db"
-    command.upgrade(_make_alembic_config(f"sqlite:///{database_path}"), "head")
-
-    conn = sqlite3.connect(database_path)
-    conn.execute("UPDATE alembic_version SET version_num = 'wrong_revision'")
-    conn.commit()
-    conn.close()
-
-    monkeypatch.setenv("LOCATION_DATABASE_URL", f"sqlite:///{database_path}")
-    monkeypatch.setenv("POO_DATABASE_URL", f"sqlite:///{poo_database_path}")
-    get_settings.cache_clear()
-    reset_db_caches()
-
-    app = create_app()
-    with pytest.raises(RuntimeError, match="Location DB revision mismatch"):
-        anyio.run(_run_lifespan, app)
-
-    get_settings.cache_clear()
-    reset_db_caches()