General clean up. Work on importing AAPOR. Work on sessions, presentations, and presenters.

This commit is contained in:
Scott Idem
2022-04-12 04:08:52 -04:00
parent f15179fb02
commit 16fca4b2f0
8 changed files with 485 additions and 178 deletions

View File

@@ -264,6 +264,7 @@ def load_event_session_obj(
# ### BEGIN ### API Event Session Methods ### get_event_session_rec_list() ###
# Updated 2021-12-13
@logger_reset
def get_event_session_rec_list(
event_id: str = None,
event_location_id: str = None,
@@ -373,6 +374,7 @@ def get_event_session_rec_list(
# ### BEGIN ### API Event Session Methods ### create_update_event_session_obj_v4() ###
# NOTE: This will create or update a event_session.
# Rewrite and updated 2021-08-25
@logger_reset
def create_update_event_session_obj_v4(
event_session_dict_obj: Event_Session_Base|dict,
event_session_id: int|str = None,
@@ -502,14 +504,15 @@ def create_update_event_session_obj_v4(
# ### BEGIN ### API Event Session Methods ### create_event_session_obj() ###
# Updated 2021-08-25
# Updated 2022-04-12
@logger_reset
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
) -> bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
@@ -517,18 +520,21 @@ def create_event_session_obj(
log.debug(type(event_session_obj_new))
if isinstance(event_session_obj_new, dict):
event_session_dict = event_session_obj_new
try:
event_session_obj_new = Event_Session_Base(**event_session_obj_new)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_session_obj_new)
event_session_obj = Event_Session_Base(**event_session_dict)
except ValidationError as e:
log.error(e.json())
return False
log.debug(event_session_obj)
else:
event_session_dict = 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'})
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)
event_session_dict['event_id'] = event_id
if event_session_obj_in_result := sql_insert(data=event_session_obj_data, table_name='event_session', rm_id_random=True, id_random_length=8): pass
log.debug(event_session_dict)
if event_session_obj_in_result := sql_insert(data=event_session_dict, table_name='event_session', rm_id_random=True, id_random_length=8): pass
else:
log.warning(f'Event Session not created.')
log.debug(event_session_obj_in_result)
@@ -540,13 +546,13 @@ def create_event_session_obj(
return_dict['event_session_id'] = None
return_dict['event_presentation_list'] = []
if event_session_obj_new.event_presentation_list and isinstance(event_session_obj_new.event_presentation_list, list):
if event_session_dict.get('event_presentation_list') and isinstance(event_session_dict.get('event_presentation_list'), list):
log.info(f'Event Presentation List was found. Loop through and create a new Event Presentation for each and link them to the new Event Session. Event Session ID: {event_session_id}')
for event_presentation_obj_new in event_session_obj_new.event_presentation_list:
for event_presentation_obj in event_session_dict.get('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,
event_presentation_obj_new = event_presentation_obj,
create_sub_obj = create_sub_obj,
fail_any = fail_any,
):
@@ -574,14 +580,15 @@ def create_event_session_obj(
# ### BEGIN ### API Event Session Methods ### update_event_session_obj_v3() ###
# Updated 2021-08-25
# Updated 2022-04-12
@logger_reset
def update_event_session_obj_v3(
event_session_id: int|str,
event_session_obj_exist: Event_Session_Base,
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.INFO) # 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
@@ -589,23 +596,30 @@ def update_event_session_obj_v3(
log.debug(type(event_session_obj_exist))
if isinstance(event_session_obj_exist, dict):
event_session_dict = event_session_obj_exist
try:
event_session_obj_exist = Event_Session_Base(**event_session_obj_exist)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_session_obj_exist)
event_session_obj = Event_Session_Base(**event_session_obj_exist)
except ValidationError as e:
log.error(e.json())
return False
log.debug(event_session_obj)
else:
event_session_dict = event_session_obj_exist.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'})
# Can't update the event_session_id alias if the .id was never set.
# event_session_obj_exist.event_session_id = event_session_id
if not event_session_obj_exist.id:
event_session_obj_exist.id = event_session_id
# event_session_obj.event_session_id = event_session_id
if not event_session_obj.id:
event_session_obj.id = event_session_id
event_session_obj_data = event_session_obj_exist.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)
# event_presenter_dict['event_id'] = event_id
# if event_track_id:
# event_presenter_dict['for_type'] = 'event_track'
# event_presenter_dict['for_id'] = event_track_id
# event_presenter_dict['event_track_id'] = event_track_id
if event_session_obj_up_result := sql_update(data=event_session_obj_data, table_name='event_session', rm_id_random=True): pass
log.debug(event_session_dict)
if event_session_obj_up_result := sql_update(data=event_session_dict, table_name='event_session', record_id=event_session_id, rm_id_random=True): pass
else:
log.warning(f'Event Session not updated.')
log.debug(event_session_obj_up_result)
@@ -615,8 +629,8 @@ def update_event_session_obj_v3(
return_dict['event_session_id'] = event_session_id
return_dict['event_presentation_list'] = []
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_session_obj.event_presentation_list and isinstance(event_session_obj.event_presentation_list, list):
for event_presentation_obj_unknown in event_session_obj.event_presentation_list:
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):
@@ -677,6 +691,8 @@ def update_event_session_obj_v3(
# ### BEGIN ### API Event Session Methods ### update_event_session_obj() ###
# This will be taken over by _exist version
# Updated 2022-04-12
@logger_reset
def update_event_session_obj(
event_session_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
event_session_obj_up: Event_Session_Base,