test db address fixes, and more POSTGRES_URL fixes

Author: afriedman412

.github/workflows/deploy.yml

@@ -8,6 +8,9 @@ jobs:
   deploy:
     runs-on: ubuntu-latest
 
+    env:
+      IMAGE: us-central1-docker.pkg.dev/freeway2026/fec/fec:latest
+
     steps:
       - uses: actions/checkout@v4
 
@@ -22,7 +25,6 @@ jobs:
 
       - name: Build & Push Image
         run: |
-          IMAGE=us-central1-docker.pkg.dev/freeway2026/fec/fec:latest
           docker build -t $IMAGE .
           docker push $IMAGE
 

app/db.py

@@ -10,7 +10,7 @@ def get_engine():
     )
 
 
-def create_tables(database_url: str, echo: bool = False) -> None:
+def create_tables(database_url: str = POSTGRES_URL, echo: bool = False) -> None:
     engine = create_engine(database_url, echo=echo)
     SQLModel.metadata.create_all(engine)
 

app/main.py

@@ -1,6 +1,7 @@
 from app.query import fetch, FetchRun
 from app.ingestion import ingest_jsonl
 from app.mail import send_email
+from app.logger import logger
 from app.db import get_engine, create_tables
 from app.helpers import get_now, format_results, get_today
 from app.config import CYCLE
@@ -57,8 +58,10 @@ def run(variant, key, cycle):
 if __name__ == "__main__":
     today = get_today()
     create_tables()
+    logger.info("Running...")
     run(
         variant="expenditure",
         key=today,
         cycle=CYCLE
     )
+    logger.info("Run complete.")

scripts/stop_test_db.sh

@@ -1,2 +1,2 @@
 #!/usr/bin/env bash
-docker stop fec-test-db
+docker stop test_db

tests/conftest.py

@@ -1,5 +1,6 @@
 import pytest
 from sqlmodel import SQLModel
+import os
 from app.db import get_engine
 from app.config import DATA_DIR
 from tests.helpers import reset_data_dir
@@ -17,6 +18,16 @@ def engine():
     SQLModel.metadata.drop_all(engine)
 
 
+@pytest.fixture(scope="session", autouse=True)
+def set_test_postgres_url():
+    # this is hard-wired in start_test_db.sh
+    os.environ["POSTGRES_URL"] = (
+        "postgresql+psycopg2://postgres:postgres@localhost:5433/test_db"
+    )
+    yield
+    os.environ.pop("POSTGRES_URL", None)
+
+
 @pytest.fixture
 def clean_data_dir():
     reset_data_dir(DATA_DIR)