From e4d60309a0e7bd4c5b96c7f5c87e4c3a1965fe16 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Mon, 12 Jul 2021 18:19:18 -0400 Subject: [PATCH] Work on event list --- app/main.py | 2 +- app/routers/event.py | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/main.py b/app/main.py index 14e7e99..b9f1114 100644 --- a/app/main.py +++ b/app/main.py @@ -96,7 +96,7 @@ app.include_router( ) app.include_router( event.router, - prefix='/event', + # prefix='/event', tags=['Event'], ) app.include_router( diff --git a/app/routers/event.py b/app/routers/event.py index 5ddc352..c9627a6 100644 --- a/app/routers/event.py +++ b/app/routers/event.py @@ -18,7 +18,7 @@ from app.models.response_models import Resp_Body_Base, mk_resp router = APIRouter() -@router.post('', response_model=Resp_Body_Base) +@router.post('/event', response_model=Resp_Body_Base) async def post_event_obj( obj: Event_Base, x_account_id: str = Header(...), @@ -41,7 +41,7 @@ async def post_event_obj( return result -@router.patch('/{obj_id}', response_model=Resp_Body_Base) +@router.patch('/event/{obj_id}', response_model=Resp_Body_Base) async def patch_event_obj( obj_id: str = Query(..., min_length=1, max_length=22), obj: Event_Base = None, @@ -69,7 +69,7 @@ async def patch_event_obj( # ### BEGIN ### API Event ### patch_event_json() ### -@router.patch('/{event_id}/json', response_model=Resp_Body_Base) +@router.patch('/event/{event_id}/json', response_model=Resp_Body_Base) async def patch_event_json( event_obj: Event_Base, event_id: str = Query(..., min_length=1, max_length=22), @@ -107,7 +107,7 @@ async def patch_event_json( # ### END ### API Event ### patch_event_json() ### -# @router.get('/list', response_model=Resp_Body_Base) +# @router.get('/event/list', response_model=Resp_Body_Base) # async def get_event_obj_li( # for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), # for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22), @@ -130,7 +130,7 @@ async def patch_event_json( -@router.get('/list', response_model=Resp_Body_Base) +@router.get('/event/list', response_model=Resp_Body_Base) async def get_event_obj_li( for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), # account for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22), @@ -251,7 +251,7 @@ async def get_event_obj_li( # ### BEGIN ### API Event ### get_event_obj() ### # Working well as of 2021-06-30. Using as a template for other routes. -@router.get('/{event_id}', response_model=Resp_Body_Base) +@router.get('/event/{event_id}', response_model=Resp_Body_Base) async def get_event_obj( event_id: str = Query(..., min_length=1, max_length=22), enabled: str = 'enabled', # For now this covers any included objects or object lists @@ -407,7 +407,7 @@ async def get_person_event_obj_li( # ### END ### API Event Methods ### get_person_event_obj_li() ### -@router.delete('/{obj_id}', response_model=Resp_Body_Base) +@router.delete('/event/{obj_id}', response_model=Resp_Body_Base) async def delete_event_obj( obj_id: str = Query(..., min_length=1, max_length=22), x_account_id: str = Header(...),