Working on event session, presentation, and presenter create and update.

This commit is contained in:
Scott Idem
2021-08-23 16:06:49 -04:00
parent bbf5d3e2bc
commit 13c2375727
8 changed files with 324 additions and 52 deletions

View File

@@ -135,7 +135,7 @@ app.include_router(
app.include_router(
event_presentation.router,
prefix='/event/presentation',
tags=['Event Presenter'],
tags=['Event Presentation'],
)
app.include_router(
event_presenter.router,

View File

@@ -139,29 +139,128 @@ def load_event_presentation_obj(
return False
return event_presentation_obj
# ### END ### API Event Presentation Methods ### load_event_presentation_obj() ###
# ### BEGIN ### API Event Presentation Methods ### get_event_id_w_event_session_id() ###
# Updated 2021-08-23
def get_event_id_w_event_session_id(
event_session_id: int|str,
) -> bool|None:
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 False
data = {}
data['event_session_id'] = event_session_id
sql = f"""
SELECT `event_session`.id AS 'event_session_id', `event_session`.id_random AS 'event_session_id_random', `event_session`.event_id AS event_id
FROM `event_session` AS `event_session`
WHERE `event_session`.id = :event_session_id
LIMIT 1;
"""
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if event_session_data_result := sql_select(data=data, sql=sql):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_session_data_result)
if event_id := event_session_data_result.get('event_id', None): return event_id
else: return False
else: return None
# ### END ### API Event Presentation Methods ### get_event_id_w_event_session_id() ###
# ### BEGIN ### API Event Presentation Methods ### create_event_presentation_obj() ###
# Updated 2021-08-21
def create_event_presentation_obj(
event_session_id: int|str,
event_presentation_obj_new: Event_Presentation_Base,
event_id: int|str = None, # If None then need to look up from event_session_id
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
) -> bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_id := event_presentation_obj_new.event_id: pass
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else:
log.error('Event ID is required')
# from app.methods.event_session_methods import get_event_id_w_event_session_id
if event_id := get_event_id_w_event_session_id(event_session_id): pass
else: return event_id # False or None
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
else: return False
# if event_id := event_presentation_obj_new.event_id: pass
# else:
# log.error('Event ID is required')
# return False
# if event_session_id := event_presentation_obj_new.event_session_id: pass
# else:
# log.error('Event Session ID is required')
# return False
log.debug(type(event_presentation_obj_new))
if isinstance(event_presentation_obj_new, dict):
try:
event_presentation_obj_new = Event_Presentation_Base(**event_presentation_obj_new)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_new)
except ValidationError as e:
log.error(e.json())
return False
event_presentation_obj_new.event_id = event_id
event_presentation_obj_new.event_session_id = event_session_id
event_presentation_obj_data = event_presentation_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'})
log.debug(event_presentation_obj_data)
if event_presentation_obj_in_result := sql_insert(data=event_presentation_obj_data, table_name='event_presentation', rm_id_random=True, id_random_length=8): pass
else:
log.warning(f'Event Presentation not created.')
log.debug(event_presentation_obj_in_result)
return False
if event_session_id := event_presentation_obj_new.event_session_id: pass
event_presentation_id = event_presentation_obj_in_result
return_dict = {}
return_dict['event_presentation_id'] = None
return_dict['event_presenter_list'] = []
if event_presentation_obj_new.event_presenter_list and isinstance(event_presentation_obj_new.event_presenter_list, list):
for event_presenter_obj_new in event_presentation_obj_new.event_presenter_list:
# NOTE: This does not account for an edge case where the presenter already exists. Possibly as part of another presentation.
if create_event_presenter_obj_result := create_event_presenter_obj(
event_presentation_id = event_presentation_id,
event_presenter_obj_new = event_presenter_obj_new,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
):
if isinstance(create_event_presenter_obj_result, int):
event_presenter_id = create_event_presenter_obj_result
log.info(f'Event Presenter created. Event Presenter ID: {event_presenter_id}')
else:
log.warning(f'Event Presenter not created. Event Presentation ID: {event_presentation_id}')
log.debug(create_event_presenter_obj_result)
event_presenter_id = None
if fail_any: return False
else:
log.warning(f'Event Presenter not created. Event Presentation ID: {event_presentation_id}')
log.debug(create_event_presenter_obj_result)
event_presenter_id = None
if fail_any: return False
return_dict['event_presenter_list'].append(event_presenter_id)
else:
log.error('Event Session ID is required')
return False
log.info('Event presenter list not found')
pass
log.info(f'The event presentation has been created. Event Presentation ID: {event_presentation_id}')
return event_presentation_id
# ### END ### API Event Presentation Methods ### create_event_presentation_obj() ###
@@ -173,12 +272,22 @@ def update_event_presentation_obj_exist(
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
) -> bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
else: return False
log.debug(type(event_presentation_obj_exist))
if isinstance(event_presentation_obj_exist, dict):
try:
event_presentation_obj_exist = Event_Presentation_Base(**event_presentation_obj_exist)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_exist)
except ValidationError as e:
log.error(e.json())
return False
# Can't update the event_presentation_id alias if the .id was never set.
# event_presentation_obj_exist.event_presentation_id = event_presentation_id
if not event_presentation_obj_exist.id:
@@ -197,10 +306,64 @@ def update_event_presentation_obj_exist(
return_dict['event_presentation_id'] = event_presentation_id
return_dict['event_presenter_list'] = []
if event_presentation_obj_exist.event_presenter_list and isinstance(event_presentation_obj_exist.event_presenter_list, list):
for event_presenter_obj_unknown in event_presentation_obj_exist.event_presenter_list:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presenter_obj_unknown)
if event_presenter_id := event_presenter_obj_unknown.get('event_presenter_id_random', None):
if update_event_presenter_obj_result := update_event_presenter_obj_exist(
event_presenter_id = event_presenter_id,
event_presenter_obj_exist = event_presenter_obj_unknown,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
):
event_presenter_id = update_event_presenter_obj_result
log.info(f'Event Presenter updated. Event Presenter ID: {event_presenter_id}')
else:
log.warning(f'Event Presenter not updated. Event Presentation ID: {event_presentation_id}')
log.debug(update_event_presenter_obj_result)
event_presenter_id = None
if fail_any: return False
if isinstance(update_event_presenter_obj_result, int):
event_presenter_id = update_event_presenter_obj_result
log.info(f'Event Presenter updated. Event Presenter ID: {event_presenter_id}')
else:
log.warning(f'Event Presenter not updated. Event Presentation ID: {event_presentation_id}')
log.debug(update_event_presenter_obj_result)
event_presenter_id = None
if fail_any: return False
else:
log.info(f'No Event Presenter ID found.')
if create_event_presenter_obj_result := create_event_presenter_obj(
event_presentation_id = event_presentation_id,
event_presenter_obj_new = event_presenter_obj_unknown,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
):
if isinstance(create_event_presenter_obj_result, int):
event_presenter_id = create_event_presenter_obj_result
log.info(f'Event Presenter created. Event Presenter ID: {event_presenter_id}')
else:
log.warning(f'Event Presenter not created. Event Presentation ID: {event_presentation_id}')
log.debug(create_event_presenter_obj_result)
event_presenter_id = None
if fail_any: return False
else:
log.warning(f'Event Presenter not created. Event Presentation ID: {event_presentation_id}')
log.debug(create_event_presenter_obj_result)
event_presenter_id = None
if fail_any: return False
return_dict['event_presenter_list'].append(event_presenter_id)
else:
log.info('Event presenter list not found or not in a list.')
pass
return False
# log.info(f'Returning the updated event_presentation_id: {event_presentation_id}')
# return event_presentation_id
log.info(f'The event presentation has been updated. Event Presentation ID: {event_presentation_id}')
return True
# ### END ### API Event Presentation Methods ### update_event_presentation_obj_exist() ###

View File

@@ -9,8 +9,6 @@ from app.lib_general import log, logging
# from app.methods.event_file_methods import load_event_file_obj
from app.methods.event_person_methods import create_event_person_obj, load_event_person_obj, update_event_person_obj
# from app.methods.event_presentation_methods import create_event_presentation_obj, update_event_presentation_obj
# from app.methods.event_session_methods import create_event_session_obj, load_event_session_obj, update_event_session_obj
# from app.methods.person_methods import load_person_obj
# from app.methods.user_methods import load_user_obj
@@ -111,27 +109,105 @@ def load_event_presenter_obj(
# ### END ### API Event Presenter Methods ### load_event_presenter_obj() ###
# ### BEGIN ### API Event Presenter Methods ### get_event_session_id_w_event_presentation_id() ###
# Updated 2021-08-23
def get_event_session_id_w_event_presentation_id(
event_presentation_id: int|str,
) -> bool|None:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_presentation_id := redis_lookup_id_random(record_id_random=event_presentation_id, table_name='event_presentation'): pass
else: return False
data = {}
data['event_presentation_id'] = event_presentation_id
sql = f"""
SELECT `event_presentation`.id AS 'event_presentation_id', `event_presentation`.id_random AS 'event_presentation_id_random', `event_presentation`.event_id AS event_id, `event_presentation`.event_session_id AS event_session_id
FROM `event_presentation` AS `event_presentation`
WHERE `event_presentation`.id = :event_presentation_id
LIMIT 1;
"""
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if event_presentation_data_result := sql_select(data=data, sql=sql):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_data_result)
if event_session_id := event_presentation_data_result.get('event_session_id', None): return event_session_id
else: return False
else: return None
# ### END ### API Event Presenter Methods ### get_event_session_id_w_event_presentation_id() ###
# ### BEGIN ### API Event Presenter Methods ### create_event_presenter_obj() ###
# Updated 2021-08-21
def create_event_presenter_obj(
event_presentation_id: int|str,
event_presenter_obj_new: Event_Presenter_Base,
event_id: int|str = None, # If None then need to look up from event_session_id
event_session_id: int|str = None, # If None then need to look up from event_presentation_id
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
) -> bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_id := event_presenter_obj_new.event_id: pass
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
else:
log.error('Event ID is required')
# from app.methods.event_presentation_methods import get_event_session_id_w_event_presentation_id
if event_session_id := get_event_session_id_w_event_presentation_id(event_presentation_id): pass
else:
log.warning(f'The event_session_id was not found using the event_presentation_id. Event Presentation ID: {event_presentation_id}')
return event_session_id # False or None
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else:
from app.methods.event_presentation_methods import get_event_id_w_event_session_id
if event_id := get_event_id_w_event_session_id(event_session_id): pass
else:
log.warning(f'The event_id was not found using the event_session_id. Event Session ID: {event_session_id}')
return event_id # False or None
if event_session_id := redis_lookup_id_random(record_id_random=event_session_id, table_name='event_session'): pass
else: return False
# if event_presentation_id := event_presenter_obj_new.event_presentation_id: pass
# else:
# log.error('Event Presentation ID is required')
# return False
log.debug(type(event_presenter_obj_new))
if isinstance(event_presenter_obj_new, dict):
try:
event_presenter_obj_new = Event_Presenter_Base(**event_presenter_obj_new)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presenter_obj_new)
except ValidationError as e:
log.error(e.json())
return False
event_presenter_obj_new.event_id = event_id
event_presenter_obj_new.event_session_id = event_session_id
event_presenter_obj_new.event_presentation_id = event_presentation_id
event_presenter_obj_data = event_presenter_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
log.debug(event_presenter_obj_data)
if event_presenter_obj_in_result := sql_insert(data=event_presenter_obj_data, table_name='event_presenter', rm_id_random=True, id_random_length=8): pass
else:
log.warning(f'Event Presenter not created.')
log.debug(event_presenter_obj_in_result)
return False
if event_session_id := event_presenter_obj_new.event_session_id: pass
else:
log.error('Event Session ID is required')
return False
event_presenter_id = event_presenter_obj_in_result
return_dict = {}
return_dict['event_presenter_id'] = None
log.info(f'The event presenter has been created. Event Presenter ID: {event_presenter_id}')
return event_presenter_id
# ### END ### API Event Presenter Methods ### create_event_presenter_obj() ###
@@ -149,6 +225,16 @@ def update_event_presenter_obj_exist(
if event_presenter_id := redis_lookup_id_random(record_id_random=event_presenter_id, table_name='event_presenter'): pass
else: return False
log.debug(type(event_presenter_obj_exist))
if isinstance(event_presenter_obj_exist, dict):
try:
event_presenter_obj_exist = Event_Presenter_Base(**event_presenter_obj_exist)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presenter_obj_exist)
except ValidationError as e:
log.error(e.json())
return False
# Can't update the event_presenter_id alias if the .id was never set.
# event_presenter_obj_exist.event_presenter_id = event_presenter_id
if not event_presenter_obj_exist.id:
@@ -165,12 +251,10 @@ def update_event_presenter_obj_exist(
return_dict = {}
return_dict['event_presenter_id'] = event_presenter_id
# return_dict['something_list'] = []
return False
log.info(f'The event presenter has been updated. Event Presenter ID: {event_presenter_id}')
return True
# ### END ### API Event Presenter Methods ### update_event_presenter_obj_exist() ###

View File

@@ -205,6 +205,7 @@ def load_event_session_obj(
# ### BEGIN ### API Event Session Methods ### create_event_session_obj() ###
# Updated 2021-08-21
def create_event_session_obj(
event_id: int|str,
event_session_obj_new: Event_Session_Base,
create_sub_obj: bool = False,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
@@ -212,10 +213,13 @@ def create_event_session_obj(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_id := event_session_obj_new.event_id: pass
else:
log.error('Event ID is required')
return False
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else: return False
# if event_id := event_session_obj_new.event_id: pass
# else:
# log.error('Event ID is required')
# return False
event_session_obj_data = event_session_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_presentation', 'event_presentation_list', 'event_presenter', 'event_presenter_list', 'created_on', 'updated_on'})
log.debug(event_session_obj_data)
@@ -232,10 +236,11 @@ def create_event_session_obj(
return_dict['event_session_id'] = None
return_dict['event_presentation_list'] = []
# event_presentation_id = event_session_obj_new.event_presentation_id
if event_session_obj_new.event_presentation_list and isinstance(event_session_obj_new.event_presentation_list, list):
for event_presentation_obj_new in event_session_obj_new.event_presentation_list:
# NOTE: This does not account for an edge case where the presentation already exists. Possibly as part of another session.
if create_event_presentation_obj_result := create_event_presentation_obj(
event_session_id = event_session_id,
event_presentation_obj_new = event_presentation_obj_new,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
@@ -258,7 +263,7 @@ def create_event_session_obj(
log.info('Event presentation list not found')
pass
log.debug(f'Returning the new event_session_id: {event_session_id}')
log.info(f'The event session has been created. Event Session ID: {event_presentation_id}')
return event_session_id
# ### END ### API Event Session Methods ### create_event_session_obj() ###
@@ -295,10 +300,11 @@ def update_event_session_obj_exist(
return_dict['event_session_id'] = event_session_id
return_dict['event_presentation_list'] = []
# event_presentation_id = event_session_obj_exist.event_presentation_id
if event_session_obj_exist.event_presentation_list and isinstance(event_session_obj_exist.event_presentation_list, list):
for event_presentation_obj_unknown in event_session_obj_exist.event_presentation_list:
if event_presentation_id := event_presentation_obj_unknown.event_presentation_id:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_unknown)
if event_presentation_id := event_presentation_obj_unknown.get('event_presentation_id_random', None):
if update_event_presentation_obj_result := update_event_presentation_obj_exist(
event_presentation_id = event_presentation_id,
event_presentation_obj_exist = event_presentation_obj_unknown,
@@ -324,6 +330,7 @@ def update_event_session_obj_exist(
else:
log.info(f'No Event Presentation ID found.')
if create_event_presentation_obj_result := create_event_presentation_obj(
event_session_id = event_session_id,
event_presentation_obj_new = event_presentation_obj_unknown,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
@@ -343,11 +350,13 @@ def update_event_session_obj_exist(
if fail_any: return False
return_dict['event_presentation_list'].append(event_presentation_id)
else:
log.info('Event presentation list not found')
log.info('Event presentation list not found or not in a list.')
pass
log.debug(f'Returning the new event_session_id: {event_session_id}')
return event_session_id
# log.info(f'Returning the updated event_session_id: {event_session_id}')
# return event_session_id
log.info(f'The event session has been updated. Event Session ID: {event_session_id}')
return True
# ### END ### API Event Session Methods ### update_event_session_obj_exist() ###
@@ -420,7 +429,7 @@ def update_event_session_obj(
# NOTE: This will blindly create a new event_presentation even if there was one associated but the event_session.event_presentation_id was not found.
event_presentation_obj_in = event_session_obj_up.event_presentation
log.debug(event_presentation_obj_in)
if event_presentation_obj_in_result := create_event_presentation_obj(event_presentation_obj_new=event_presentation_obj_in):
if event_presentation_obj_in_result := create_event_presentation_obj(event_session_id=event_session, event_presentation_obj_new=event_presentation_obj_in):
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_obj_in_result)
event_session_obj_up.event_presentation_id = event_presentation_obj_in_result

View File

@@ -27,16 +27,22 @@ class Event_Presentation_Base(BaseModel):
id: Optional[int] = Field(
alias = 'event_presentation_id'
)
event_id_random: Optional[str]
event_id: Optional[int]
event_abstract_id_random: Optional[str]
event_abstract_id: Optional[int]
#event_location_id_random: Optional[str]
#event_location_id: Optional[int]
event_session_id_random: Optional[str]
event_session_id: Optional[int]
#event_track_id_random: Optional[str]
#event_track_id: Optional[int]
poc_event_person: Optional[Event_Person_Base]
poc_person: Optional[Person_Base]

View File

@@ -27,15 +27,19 @@ class Event_Session_Base(BaseModel):
id: Optional[int] = Field(
alias = 'event_session_id'
)
event_id_random: Optional[str]
event_id: Optional[int]
event_location_id_random: Optional[str]
event_location_id: Optional[int]
event_track_id_random: Optional[str]
event_track_id: Optional[int]
poc_event_person_id_random: Optional[str]
poc_event_person_id: Optional[int]
poc_person_id_random: Optional[str]
poc_person_id: Optional[int]

View File

@@ -144,22 +144,22 @@ async def get_event_presentation_obj(
return mk_resp(data=None, status_code=404)
if event_presentation_obj := load_event_presentation_obj(
event_presentation_id=event_presentation_id,
enabled=enabled,
limit=limit,
inc_address=inc_address,
inc_contact=inc_contact,
inc_event_abstract_list=inc_event_abstract_list,
inc_event_badge=inc_event_badge,
# inc_event_badge_list=inc_event_badge_list,
inc_event_device_list=inc_event_device_list,
inc_event_file_list=inc_event_file_list,
inc_event_person_list=inc_event_person_list,
inc_event_presenter_list=inc_event_presenter_list,
inc_event_registration=inc_event_registration,
# inc_event_registration_list=inc_event_registration_list,
inc_person=inc_person,
inc_user=inc_user,
event_presentation_id = event_presentation_id,
enabled = enabled,
limit = limit,
inc_address = inc_address,
inc_contact = inc_contact,
inc_event_abstract_list = inc_event_abstract_list,
inc_event_badge = inc_event_badge,
# inc_event_badge_list = inc_event_badge_list,
inc_event_device_list = inc_event_device_list,
inc_event_file_list = inc_event_file_list,
inc_event_person_list = inc_event_person_list,
inc_event_presenter_list = inc_event_presenter_list,
inc_event_registration = inc_event_registration,
# inc_event_registration_list = inc_event_registration_list,
inc_person = inc_person,
inc_user = inc_user,
):
event_presentation_dict = event_presentation_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
pass

View File

@@ -58,7 +58,13 @@ async def post_event_session_obj_new(
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
# There should probably be a check for the event ID before calling the create function?
if create_event_session_obj_result := create_event_session_obj(
event_id = event_session_obj.event_id,
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):