Working on stuff related to session proposals. Again... I think it all works now.
This commit is contained in:
@@ -38,6 +38,8 @@ async def post_event_person_obj_new_v4(
|
||||
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: bool = True,
|
||||
limit: int = 500,
|
||||
enabled: str = 'enabled',
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
response: Response = Response,
|
||||
|
||||
@@ -9,7 +9,7 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select,
|
||||
|
||||
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
|
||||
|
||||
from app.methods.event_session_methods import create_event_session_obj, load_event_session_obj, update_event_session_obj_v3
|
||||
from app.methods.event_session_methods import create_event_session_obj, create_update_event_session_obj_v4, load_event_session_obj, update_event_session_obj_v3
|
||||
|
||||
from app.models.event_session_models import Event_Session_Base
|
||||
from app.models.response_models import *
|
||||
@@ -18,7 +18,121 @@ from app.models.response_models import *
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post('', response_model=Resp_Body_Base)
|
||||
|
||||
# ### BEGIN ### API Event Session ### post_event_session_obj_new_v4() ###
|
||||
# Updated 2021-08-25
|
||||
@router.post('/event/session/new_v4', response_model=Resp_Body_Base)
|
||||
async def post_event_session_obj_new_v4(
|
||||
event_session_obj: Event_Session_Base,
|
||||
create_sub_obj: bool = False,
|
||||
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
|
||||
|
||||
inc_event_presentation_list: bool = False,
|
||||
inc_event_presenter_list: bool = False,
|
||||
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: bool = True,
|
||||
limit: int = 500,
|
||||
enabled: str = 'enabled',
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
# There should probably be a check for the event ID before calling the create function?
|
||||
if create_event_session_obj_result := create_update_event_session_obj_v4(
|
||||
event_session_dict_obj = event_session_obj,
|
||||
event_id = event_session_obj.event_id,
|
||||
create_sub_obj = create_sub_obj,
|
||||
fail_any = fail_any,
|
||||
return_outline = False,
|
||||
): pass
|
||||
else: return mk_resp(data=False, status_code=400, response=response, status_message='The event session was not created. Check the field names and data types.')
|
||||
|
||||
if isinstance(create_event_session_obj_result, int):
|
||||
event_session_id = create_event_session_obj_result
|
||||
if return_obj:
|
||||
if load_event_session_obj_result := load_event_session_obj(
|
||||
event_session_id = event_session_id,
|
||||
inc_event_presentation_list = inc_event_presentation_list,
|
||||
inc_event_presenter_list = inc_event_presenter_list,
|
||||
):
|
||||
data = load_event_session_obj_result
|
||||
else:
|
||||
data = False
|
||||
else:
|
||||
event_session_id = event_session_id
|
||||
event_session_id_random = get_id_random(record_id=event_session_id, table_name='event_session')
|
||||
data = {}
|
||||
data['event_session_id'] = event_session_id
|
||||
data['event_session_id_random'] = event_session_id_random
|
||||
return mk_resp(data=data, response=response, status_message='The event session was created.')
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create an event session was unexpected.')
|
||||
# ### BEGIN ### API Event Session ### post_event_session_obj_new_v4() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Session ### patch_event_session_obj_exist_v4() ###
|
||||
# Updated 2021-08-25
|
||||
@router.patch('/event/session/{event_session_id}/exist_v4', response_model=Resp_Body_Base)
|
||||
async def patch_event_session_obj_exist_v4(
|
||||
event_session_obj: Event_Session_Base,
|
||||
event_session_id: str = Query(..., min_length=11, max_length=22),
|
||||
create_sub_obj: bool = False,
|
||||
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
|
||||
|
||||
inc_event_presentation_list: bool = False,
|
||||
inc_event_presenter_list: bool = False,
|
||||
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
exclude_none: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
|
||||
else: return mk_resp(data=None, status_code=404)
|
||||
|
||||
if update_event_session_obj_result := create_update_event_session_obj_v4(
|
||||
event_session_dict_obj = event_session_obj,
|
||||
event_session_id = event_session_id,
|
||||
event_id = event_session_obj.event_id,
|
||||
create_sub_obj = create_sub_obj,
|
||||
fail_any = fail_any,
|
||||
return_outline = False,
|
||||
): pass
|
||||
else: return mk_resp(data=False, status_code=400, response=response, status_message='The event session was not created. Check the field names and data types.')
|
||||
|
||||
if update_event_session_obj_result:
|
||||
if return_obj:
|
||||
if load_event_session_obj_result := load_event_session_obj(
|
||||
event_session_id = event_session_id,
|
||||
inc_event_presentation_list = inc_event_presentation_list,
|
||||
inc_event_presenter_list = inc_event_presenter_list,
|
||||
):
|
||||
data = load_event_session_obj_result
|
||||
else:
|
||||
data = False
|
||||
else:
|
||||
event_session_id_random = get_id_random(record_id=event_session_id, table_name='event_session')
|
||||
data = {}
|
||||
data['event_session_id'] = event_session_id
|
||||
data['event_session_id_random'] = event_session_id_random
|
||||
return mk_resp(data=data, response=response, status_message='The event session was created.')
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create an event session was unexpected.')
|
||||
# ### END ### API Event Session ### patch_event_session_obj_exist_v4() ###
|
||||
|
||||
|
||||
|
||||
|
||||
@router.post('/event/session', response_model=Resp_Body_Base)
|
||||
async def post_event_session_obj(
|
||||
obj: Event_Session_Base,
|
||||
x_account_id: str = Header(...),
|
||||
@@ -44,7 +158,7 @@ async def post_event_session_obj(
|
||||
|
||||
# ### BEGIN ### API Event Session ### post_event_session_obj_new_v3() ###
|
||||
# Updated 2021-08-21 (all new)
|
||||
@router.post('/new_v3', response_model=Resp_Body_Base)
|
||||
@router.post('/event/session/new_v3', response_model=Resp_Body_Base)
|
||||
async def post_event_session_obj_new_v3(
|
||||
event_session_obj: Event_Session_Base,
|
||||
create_sub_obj: bool = False,
|
||||
@@ -88,7 +202,7 @@ async def post_event_session_obj_new_v3(
|
||||
|
||||
# ### BEGIN ### API Event Session ### patch_event_session_obj_exist_v3() ###
|
||||
# Updated 2021-08-24
|
||||
@router.patch('/{event_session_id}/exist_v3', response_model=Resp_Body_Base)
|
||||
@router.patch('/event/session/{event_session_id}/exist_v3', response_model=Resp_Body_Base)
|
||||
async def patch_event_session_obj_exist_v3(
|
||||
event_session_obj: Event_Session_Base,
|
||||
event_session_id: str = Query(..., min_length=11, max_length=22),
|
||||
@@ -132,7 +246,7 @@ async def patch_event_session_obj_exist_v3(
|
||||
# ### END ### API Event Session ### patch_event_session_obj_exist_v3() ###
|
||||
|
||||
|
||||
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
|
||||
@router.patch('/event/session/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def patch_event_session_obj(
|
||||
obj: Event_Session_Base,
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
@@ -169,7 +283,7 @@ async def patch_event_session_obj(
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Session ### patch_event_session_json() ###
|
||||
@router.patch('/{event_session_id}/json', response_model=Resp_Body_Base)
|
||||
@router.patch('/event/session/{event_session_id}/json', response_model=Resp_Body_Base)
|
||||
async def patch_event_session_json(
|
||||
event_session_obj: Event_Session_Base,
|
||||
event_session_id: str = Query(..., min_length=1, max_length=22),
|
||||
@@ -231,7 +345,7 @@ async def patch_event_session_json(
|
||||
# return result
|
||||
|
||||
|
||||
@router.get('/list', response_model=Resp_Body_Base)
|
||||
@router.get('/event/session/list', response_model=Resp_Body_Base)
|
||||
async def get_event_session_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),
|
||||
@@ -350,7 +464,7 @@ async def get_event_session_obj_li(
|
||||
|
||||
# ### BEGIN ### API Event Session ### get_event_session_obj() ###
|
||||
# Working well as of 2021-06-04. Using as a template for other routes.
|
||||
@router.get('/{event_session_id}', response_model=Resp_Body_Base)
|
||||
@router.get('/event/session/{event_session_id}', response_model=Resp_Body_Base)
|
||||
async def get_event_session_obj(
|
||||
event_session_id: str = Query(..., min_length=1, max_length=22),
|
||||
enabled: str = 'enabled', # For now this covers any included objects or object lists
|
||||
@@ -416,7 +530,7 @@ async def get_event_session_obj(
|
||||
# ### END ### API Event ### get_event_session_obj() ###
|
||||
|
||||
|
||||
@router.delete('/{obj_id}', response_model=Resp_Body_Base)
|
||||
@router.delete('/event/session/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def delete_event_session_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
x_account_id: str = Header(...),
|
||||
@@ -430,4 +544,4 @@ async def delete_event_session_obj(
|
||||
obj_type=obj_type,
|
||||
obj_id=obj_id,
|
||||
)
|
||||
return result
|
||||
return result
|
||||
|
||||
Reference in New Issue
Block a user