Work on event, event_session, event_presentation, event_presenter, user, and person routes, methods, and models
This commit is contained in:
Scott Idem
@@ -5,11 +5,11 @@ from typing import Dict, List, Optional, Set, Union
|
||||
|
||||
from app.lib_general import log, logging
|
||||
from app.config import settings
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, lookup_id_random, redis_lookup_id_random
|
||||
|
||||
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 load_event_session_obj
|
||||
from app.methods.event_session_methods import create_event_session_obj, load_event_session_obj, update_event_session_obj_exist
|
||||
|
||||
from app.models.event_session_models import Event_Session_Base
|
||||
from app.models.response_models import *
|
||||
@@ -42,6 +42,89 @@ async def post_event_session_obj(
|
||||
return result
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Session ### post_event_session_obj_new() ###
|
||||
# Updated 2021-08-21 (all new)
|
||||
@router.post('/new', response_model=Resp_Body_Base)
|
||||
async def post_event_session_obj_new(
|
||||
event_session_obj: Event_Session_Base,
|
||||
create_sub_obj: bool = False,
|
||||
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: bool = True,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if create_event_session_obj_result := create_event_session_obj(event_session_obj_new=event_session_obj, create_sub_obj=create_sub_obj, fail_any=fail_any): 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):
|
||||
data = load_event_session_obj_result
|
||||
else:
|
||||
data = False
|
||||
else:
|
||||
event_session_id = create_event_session_obj_result
|
||||
event_session_id_random = lookup_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() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Event Session ### patch_event_session_obj_exist() ###
|
||||
@router.patch('/{event_session_id}/exist', response_model=Resp_Body_Base)
|
||||
async def patch_event_session_obj_exist(
|
||||
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
|
||||
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 := update_event_session_obj_exist(
|
||||
event_session_id = event_session_id,
|
||||
event_session_obj_exist = event_session_obj,
|
||||
create_sub_obj = create_sub_obj,
|
||||
fail_any = fail_any,
|
||||
): 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):
|
||||
data = load_event_session_obj_result
|
||||
else:
|
||||
data = False
|
||||
else:
|
||||
event_session_id_random = lookup_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() ###
|
||||
|
||||
|
||||
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def patch_event_session_obj(
|
||||
obj: Event_Session_Base,
|
||||
|
||||
@@ -5,12 +5,12 @@ from typing import Dict, List, Optional, Set, Union
|
||||
|
||||
from app.lib_general import log, logging, secure_hash_string, verify_secure_hash_string
|
||||
from app.config import settings
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
|
||||
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, lookup_id_random,redis_lookup_id_random
|
||||
|
||||
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.order_methods import get_order_rec_list, load_order_obj
|
||||
from app.methods.user_methods import load_user_obj
|
||||
from app.methods.user_methods import create_user_obj, load_user_obj
|
||||
|
||||
from app.models.common_field_schema import default_num_bytes
|
||||
from app.models.response_models import Resp_Body_Base, mk_resp
|
||||
@@ -44,9 +44,13 @@ async def post_user_obj(
|
||||
return result
|
||||
|
||||
|
||||
# ### BEGIN ### API User ### post_user_obj_new() ###
|
||||
# Updated 2021-08-21 (complete re-write)
|
||||
@router.post('/new', response_model=Resp_Body_Base)
|
||||
async def post_user_new_obj(
|
||||
async def post_user_obj_new(
|
||||
user_obj: User_New_Base,
|
||||
allow_update: bool = False,
|
||||
avoid_dup_username: bool = False,
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: bool = True,
|
||||
by_alias: bool = True,
|
||||
@@ -56,28 +60,26 @@ async def post_user_new_obj(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
user_data = user_obj.dict(by_alias=False, exclude_unset=False, exclude={'new_password', 'account_id_random'})
|
||||
if create_user_obj_result := create_user_obj(user_obj_new=user_obj, allow_update=allow_update, avoid_dup_username=avoid_dup_username): pass
|
||||
else: return mk_resp(data=False, status_code=400, response=response, status_message='The user account was not created. This is likely because that username already exists for this account.')
|
||||
|
||||
log.info('Checking if the username is already in use for the account...')
|
||||
sql_select_user = f"""
|
||||
SELECT *
|
||||
FROM `user` AS user
|
||||
WHERE user.account_id = :account_id and user.username = :username
|
||||
"""
|
||||
|
||||
if sql_select_result := sql_select(sql=sql_select_user, data=user_data):
|
||||
return mk_resp(data=False, status_message='The user account was not created. This is likely because of a duplicate username.')
|
||||
|
||||
log.info('Adding new user account...')
|
||||
if sql_insert_result := sql_insert(table_name='user', data=user_data):
|
||||
log.info('Selecting new user account to return as an object...')
|
||||
sql_select_user_result = sql_select(table_name='v_user', record_id=sql_insert_result)
|
||||
|
||||
user_obj_new = User_Out_Base(**sql_select_user_result)
|
||||
|
||||
return mk_resp(data=user_obj_new.dict(by_alias=True, exclude_unset=True))
|
||||
if isinstance(create_user_obj_result, int):
|
||||
user_id = create_user_obj_result
|
||||
if return_obj:
|
||||
if load_user_obj_result := load_user_obj(user_id=user_id):
|
||||
data = load_user_obj_result
|
||||
else:
|
||||
data = False
|
||||
else:
|
||||
user_id = create_user_obj_result
|
||||
user_id_random = lookup_id_random(record_id=user_id, table_name='user')
|
||||
data = {}
|
||||
data['user_id'] = user_id
|
||||
data['user_id_random'] = user_id_random
|
||||
return mk_resp(data=data, response=response, status_message='The user account was created.')
|
||||
else:
|
||||
return mk_resp(data=False, status_message='The user account was not created. Something seems to have gone wrong on insert.')
|
||||
return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create a user account was unexpected.')
|
||||
# ### END ### API User ### post_user_obj_new() ###
|
||||
|
||||
|
||||
@router.patch('/change_password/{user_id}', response_model=Resp_Body_Base)
|
||||
|
||||
Reference in New Issue
Block a user