derekc
1939b2cc45
Separates "recommended time" (time_start/time_end) from actual timer duration. If duration_minutes is set, the timer counts down from that value; otherwise falls back to the time_start–time_end window. - ScheduleBlock model: add nullable duration_minutes INT column - Startup migration: idempotent ADD COLUMN for existing DBs - Schemas: duration_minutes in create, update, and out - TimerDisplay: prefer duration_minutes * 60 over time diff when set - Admin block forms: Duration (min) input on add and edit forms Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
80 lines
2.5 KiB
Python
80 lines
2.5 KiB
Python
from contextlib import asynccontextmanager
|
|
|
|
from fastapi import FastAPI, WebSocket, WebSocketDisconnect
|
|
from fastapi.middleware.cors import CORSMiddleware
|
|
from sqlalchemy import text
|
|
from sqlalchemy.exc import OperationalError
|
|
|
|
from app.config import get_settings
|
|
from app.database import engine
|
|
from app.models import Base
|
|
from app.routers import auth, users, children, subjects, schedules, sessions, logs, dashboard
|
|
from app.websocket.manager import manager
|
|
|
|
settings = get_settings()
|
|
|
|
|
|
async def _add_column_if_missing(conn, table: str, column: str, definition: str):
|
|
"""Add a column to a table, silently ignoring if it already exists (MySQL 1060)."""
|
|
try:
|
|
await conn.execute(text(f"ALTER TABLE {table} ADD COLUMN {column} {definition}"))
|
|
except OperationalError as e:
|
|
if e.orig.args[0] != 1060: # 1060 = Duplicate column name
|
|
raise
|
|
|
|
|
|
@asynccontextmanager
|
|
async def lifespan(app: FastAPI):
|
|
# Create tables on startup (Alembic handles migrations in prod, this is a safety net)
|
|
async with engine.begin() as conn:
|
|
await conn.run_sync(Base.metadata.create_all)
|
|
# Idempotent column additions for schema migrations
|
|
await _add_column_if_missing(conn, "schedule_templates", "day_start_time", "TIME NULL")
|
|
await _add_column_if_missing(conn, "schedule_templates", "day_end_time", "TIME NULL")
|
|
await _add_column_if_missing(conn, "schedule_blocks", "duration_minutes", "INT NULL")
|
|
yield
|
|
|
|
|
|
app = FastAPI(
|
|
title="Homeschool API",
|
|
version="1.0.0",
|
|
docs_url="/api/docs",
|
|
redoc_url="/api/redoc",
|
|
openapi_url="/api/openapi.json",
|
|
lifespan=lifespan,
|
|
)
|
|
|
|
app.add_middleware(
|
|
CORSMiddleware,
|
|
allow_origins=settings.cors_origins_list,
|
|
allow_credentials=True,
|
|
allow_methods=["*"],
|
|
allow_headers=["*"],
|
|
)
|
|
|
|
# Routers
|
|
app.include_router(auth.router)
|
|
app.include_router(users.router)
|
|
app.include_router(children.router)
|
|
app.include_router(subjects.router)
|
|
app.include_router(schedules.router)
|
|
app.include_router(sessions.router)
|
|
app.include_router(logs.router)
|
|
app.include_router(dashboard.router)
|
|
|
|
|
|
@app.get("/api/health")
|
|
async def health():
|
|
return {"status": "ok"}
|
|
|
|
|
|
@app.websocket("/ws/{child_id}")
|
|
async def websocket_endpoint(websocket: WebSocket, child_id: int):
|
|
await manager.connect(websocket, child_id)
|
|
try:
|
|
while True:
|
|
# Keep connection alive; TV clients are receive-only
|
|
await websocket.receive_text()
|
|
except WebSocketDisconnect:
|
|
manager.disconnect(websocket, child_id)
|