Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 48 additions & 2 deletions src/routers/occupancy.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,12 @@

from datetime import datetime, timezone
from typing import Annotated, Union, cast
import ast
import json
from typing import Annotated, Any, Union, cast

from fastapi import APIRouter, Depends, HTTPException, Query, Request, status
from pydantic import ValidationError

from fastapi import APIRouter, Depends, HTTPException, Query, status
from sqlalchemy import text, func
Expand Down Expand Up @@ -244,16 +250,56 @@ def list_occupancy(
return [_serialize_obs(obs, db) for obs in observations]


async def _parse_lenient_body(request: Request) -> dict[str, Any]:
raw = await request.body()

if not raw:
return {}

text = raw.decode("utf-8", errors="replace").strip()

try:
data = json.loads(text)
except json.JSONDecodeError:
try:
data = ast.literal_eval(text)
except (SyntaxError, ValueError):
raise HTTPException(
status.HTTP_422_UNPROCESSABLE_ENTITY,
detail={"error_description": "Request body must be JSON or Python-like dict"},
)

if not isinstance(data, dict):
raise HTTPException(
status.HTTP_422_UNPROCESSABLE_ENTITY,
detail={"error_description": "Request body must be an object"},
)

return data

# ---------------------------------------------------------------------------
# POST /occupancy/new
# ---------------------------------------------------------------------------

@router.post("/new", status_code=status.HTTP_201_CREATED)
def create_observation(
body: CreateOccupancyRequest,
async def create_observation(
request: Request,
current_user: Annotated[User, require("occupancy.write")],
db: Annotated[Session, Depends(get_db)],
):
raw_body = await _parse_lenient_body(request)

try:
body = CreateOccupancyRequest.model_validate(raw_body)
except ValidationError as exc:
raise HTTPException(
status.HTTP_422_UNPROCESSABLE_ENTITY,
detail={
"error_description": "Invalid occupancy payload",
"errors": exc.errors(),
},
)

zone = db.query(ParkingZone).filter(
ParkingZone.parking_zone_id == body.zone_id
).one_or_none()
Expand Down
Loading