Audit pass: cookie auth migration, route guards, GP% clamp, CSV export, OCR transaction safety, N+1 fix, and cleanup
- Migrated all 435 frontend fetch calls from Authorization Bearer header to credentials: 'include' (cookie auth) - Removed ?token= from all file/image URLs (browser history exposure) - Added ProtectedRoute wrapper to all capability-gated routes in App.tsx - OCR background task: added transaction boundary, improved error handling and status rollback - DuplicateDetector: wrapped in non-fatal try/except so crashes don't abort invoice processing - File upload: commit DB row before writing to disk to prevent orphaned files - GP% clamped to 100% in GPReport (credit notes can inflate above 100%) - Added CSV export to GPReport (suppliers, daily data, allowances breakdown) - Backend file-serving endpoints: cookie auth with ?token= fallback for backward compatibility - DATA_DIR: moved from hardcoded /app/data to os.getenv in invoices.py and recipes.py - N+1 fix in list_recipes: batch-loads latest cost snapshot in 1 query (was N) - Zero-yield sub-recipe: logs warning instead of silently zeroing cost contribution - Budget spend rate input: rejects negative values - GPReport allowances toggle: persisted to localStorage across page loads - DB pool_size/max_overflow: configurable via DB_POOL_SIZE/DB_MAX_OVERFLOW env vars - Fixed SyntaxWarning from \\d in invoices.py docstring Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
parent
6f6e16c88f
commit
ba075276b1
57 changed files with 15427 additions and 15274 deletions
|
|
@ -10,7 +10,7 @@ from decimal import Decimal
|
|||
from typing import Optional
|
||||
from html import escape as html_escape
|
||||
|
||||
from fastapi import APIRouter, Depends, HTTPException, UploadFile, File, Query
|
||||
from fastapi import APIRouter, Depends, HTTPException, UploadFile, File, Query, Request
|
||||
from fastapi.responses import HTMLResponse
|
||||
from sqlalchemy.ext.asyncio import AsyncSession
|
||||
from sqlalchemy import select, func, text, and_, delete
|
||||
|
|
@ -35,7 +35,7 @@ logger = logging.getLogger(__name__)
|
|||
|
||||
router = APIRouter()
|
||||
|
||||
DATA_DIR = "/app/data"
|
||||
DATA_DIR = os.getenv("DATA_DIR", "/app/data")
|
||||
|
||||
|
||||
# ── Pydantic schemas ─────────────────────────────────────────────────────────
|
||||
|
|
@ -686,16 +686,33 @@ async def list_recipes(
|
|||
result = await db.execute(query.order_by(Recipe.name))
|
||||
recipes = result.scalars().all()
|
||||
|
||||
# Batch-load latest cost snapshot per recipe (1 query vs N)
|
||||
recipe_ids = [r.id for r in recipes]
|
||||
snap_map: dict[int, RecipeCostSnapshot] = {}
|
||||
if recipe_ids:
|
||||
latest_subq = (
|
||||
select(
|
||||
RecipeCostSnapshot.recipe_id,
|
||||
func.max(RecipeCostSnapshot.snapshot_date).label("max_date"),
|
||||
)
|
||||
.where(RecipeCostSnapshot.recipe_id.in_(recipe_ids))
|
||||
.group_by(RecipeCostSnapshot.recipe_id)
|
||||
.subquery()
|
||||
)
|
||||
snap_rows = await db.execute(
|
||||
select(RecipeCostSnapshot).join(
|
||||
latest_subq,
|
||||
and_(
|
||||
RecipeCostSnapshot.recipe_id == latest_subq.c.recipe_id,
|
||||
RecipeCostSnapshot.snapshot_date == latest_subq.c.max_date,
|
||||
),
|
||||
)
|
||||
)
|
||||
snap_map = {s.recipe_id: s for s in snap_rows.scalars().all()}
|
||||
|
||||
items = []
|
||||
for r in recipes:
|
||||
# Get latest cost snapshot
|
||||
snap_result = await db.execute(
|
||||
select(RecipeCostSnapshot)
|
||||
.where(RecipeCostSnapshot.recipe_id == r.id)
|
||||
.order_by(RecipeCostSnapshot.snapshot_date.desc())
|
||||
.limit(1)
|
||||
)
|
||||
snap = snap_result.scalar_one_or_none()
|
||||
snap = snap_map.get(r.id)
|
||||
|
||||
# Get flag summary (lightweight)
|
||||
from api.food_flags import compute_recipe_flags
|
||||
|
|
@ -1529,13 +1546,18 @@ async def upload_image(
|
|||
async def serve_image(
|
||||
recipe_id: int,
|
||||
image_id: int,
|
||||
request: Request,
|
||||
token: Optional[str] = Query(None),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
# img tags can't send Authorization header, so auth via query param
|
||||
if not token:
|
||||
raise HTTPException(401, "Not authenticated")
|
||||
user = await get_current_user_from_token(token, db)
|
||||
user = None
|
||||
if token:
|
||||
user = await get_current_user_from_token(token, db)
|
||||
if not user:
|
||||
try:
|
||||
user = await get_current_user(request)
|
||||
except HTTPException:
|
||||
pass
|
||||
if not user:
|
||||
raise HTTPException(401, "Not authenticated")
|
||||
await _get_recipe(recipe_id, user.kitchen_id, db)
|
||||
|
|
@ -1728,6 +1750,8 @@ async def _calc_recipe_cost(recipe_id: int, db: AsyncSession, scale_to: Optional
|
|||
needed_unit = sr.portions_needed_unit or child_output_unit
|
||||
portions_needed_raw = float(sr.portions_needed) * scale_factor
|
||||
portions_needed = _convert_unit(portions_needed_raw, needed_unit, child_output_unit)
|
||||
if not child_output_qty:
|
||||
logger.warning(f"Recipe {child.id} ({child.name!r}) has zero yield qty — cost contribution zeroed in parent recipe")
|
||||
scale_ratio = portions_needed / child_output_qty if child_output_qty else 0
|
||||
cost_contribution = float(child_total) * scale_ratio if child_total else None
|
||||
cost_contribution_min = float(child_total_min) * scale_ratio if child_total_min else None
|
||||
|
|
@ -2098,14 +2122,19 @@ async def backfill_invoice_references(
|
|||
@router.get("/{recipe_id}/print")
|
||||
async def print_recipe(
|
||||
recipe_id: int,
|
||||
request: Request,
|
||||
format: str = Query("full"), # "full" | "kitchen"
|
||||
token: Optional[str] = Query(None),
|
||||
db: AsyncSession = Depends(get_db),
|
||||
):
|
||||
# window.open() can't send Authorization header, so auth via query param
|
||||
if not token:
|
||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||
user = await get_current_user_from_token(token, db)
|
||||
user = None
|
||||
if token:
|
||||
user = await get_current_user_from_token(token, db)
|
||||
if not user:
|
||||
try:
|
||||
user = await get_current_user(request)
|
||||
except HTTPException:
|
||||
pass
|
||||
if not user:
|
||||
raise HTTPException(status_code=401, detail="Not authenticated")
|
||||
recipe = await _get_recipe(recipe_id, user.kitchen_id, db)
|
||||
|
|
@ -2116,11 +2145,11 @@ async def print_recipe(
|
|||
from api.food_flags import compute_recipe_flags
|
||||
flags = await compute_recipe_flags(recipe_id, user.kitchen_id, db)
|
||||
|
||||
html = _build_recipe_html(full_data, cost_data, flags, format, recipe_id=recipe_id, token=token)
|
||||
html = _build_recipe_html(full_data, cost_data, flags, format, recipe_id=recipe_id)
|
||||
return HTMLResponse(content=html)
|
||||
|
||||
|
||||
def _build_recipe_html(recipe_data: dict, cost_data: dict, flags, format: str = "full", recipe_id: int = 0, token: str = "") -> str:
|
||||
def _build_recipe_html(recipe_data: dict, cost_data: dict, flags, format: str = "full", recipe_id: int = 0) -> str:
|
||||
"""Generate print-optimised HTML for a recipe."""
|
||||
esc = html_escape
|
||||
name = esc(recipe_data.get("name", ""))
|
||||
|
|
@ -2204,7 +2233,7 @@ def _build_recipe_html(recipe_data: dict, cost_data: dict, flags, format: str =
|
|||
if not plating_images:
|
||||
plating_images = recipe_data.get("images", [])[:1]
|
||||
for img in plating_images:
|
||||
img_url = f"/api/recipes/{recipe_id}/images/{img['id']}?token={token}"
|
||||
img_url = f"/kitchen/api/recipes/{recipe_id}/images/{img['id']}"
|
||||
images_html += f'<img src="{esc(img_url)}" style="max-width:300px;border-radius:8px;margin:10px 0;" />'
|
||||
|
||||
time_info = ""
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue