diff --git a/backend/main.py b/backend/main.py index 780fbfc..e811ad3 100644 --- a/backend/main.py +++ b/backend/main.py @@ -1,5 +1,6 @@ -# GEEN SQL IN MAIN.PY, DIT IS DE API WRAPPER, HOU HET OVERZICHTELIJK!! +# GEEN SQL IN MAIN.PY, DIT IS DE API, HOU HET OVERZICHTELIJK!! +from datetime import date from fastapi import FastAPI, Depends, HTTPException, Query from fastapi.middleware.cors import CORSMiddleware from fastapi.responses import PlainTextResponse @@ -608,15 +609,14 @@ def delete_room( summary="Get room events", description="Returns events belonging to a room, optionally filtered by date.", ) - def api_room_events( room_id: int, - date_from: str | None = Query( + date_from: date | None = Query( None, alias="from", description="Only return events starting on or after this date.", ), - date_to: str | None = Query( + date_to: date | None = Query( None, alias="to", description="Only return events starting on or before this date.", @@ -631,8 +631,8 @@ def api_room_events( events = get_room_events( room_id, - date_from, - date_to, + date_from.isoformat() if date_from else None, + date_to.isoformat() if date_to else None, ) return { @@ -678,12 +678,12 @@ def api_create_event( description="Returns events from rooms the authenticated user belongs to, optionally filtered by date.", ) def get_events( - date_from: str | None = Query( + date_from: date | None = Query( None, alias="from", description="Only return events starting on or after this date.", ), - date_to: str | None = Query( + date_to: date | None = Query( None, alias="to", description="Only return events starting on or before this date.", @@ -692,15 +692,14 @@ def get_events( ): events = get_user_events( user_id, - date_from, - date_to, + date_from.isoformat() if date_from else None, + date_to.isoformat() if date_to else None, ) return { "events": [dict(event) for event in events], } - @app.get( "/events/{event_id}", summary="Get an event",