Work on a lot of things. Mainly cleaning up person and profile related fields in multiple tables.

This commit is contained in:
Scott Idem
2021-09-10 18:12:24 -04:00
parent 72820f08ae
commit 15fd32b252
20 changed files with 558 additions and 219 deletions

View File

@@ -27,6 +27,10 @@ def load_event_session_obj(
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
event_file_file_purpose_id: int = None,
event_file_file_purpose: str = None,
event_file_priority: bool = None,
event_file_group: str = None,
inc_address: bool = False,
inc_contact: bool = False,
inc_event_abstract_list: bool = False,
@@ -42,6 +46,7 @@ def load_event_session_obj(
inc_event_presenter_list: bool = False,
inc_event_registration_list: bool = False,
inc_event_track: bool = False,
inc_hosted_file: bool = False,
inc_poc_event_person: bool = False,
inc_person: bool = False,
inc_user: bool = False,
@@ -79,20 +84,56 @@ def load_event_session_obj(
if inc_event_file_list: pass
if inc_event_file_list:
if event_file_dict_list := load_event_file_obj_list(
event_session_id = event_session_id,
limit = limit,
model_as_dict = model_as_dict,
enabled = enabled,
):
event_session_obj.event_file_list = event_file_dict_list
else: event_session_obj.event_file_list = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info('Need to include event file list...')
from app.methods.event_file_methods import get_event_file_rec_list, load_event_file_obj
if event_file_rec_list_result := get_event_file_rec_list(
for_type = 'event_session',
for_id = event_session_id,
file_purpose_id = event_file_file_purpose_id,
file_purpose = event_file_file_purpose,
priority = event_file_priority,
group = event_file_group,
enabled = enabled,
limit = limit,
):
event_file_result_list = []
for event_file_rec in event_file_rec_list_result:
if load_event_file_result := load_event_file_obj(
event_file_id = event_file_rec.get('event_file_id', None),
enabled = enabled,
limit = limit,
inc_hosted_file = inc_hosted_file,
# model_as_dict = True,
# by_alias = by_alias,
# exclude_unset = False,
):
event_file_result_list.append(load_event_file_result)
else:
event_file_result_list.append(None)
log.debug(event_file_result_list)
event_session_obj.event_file_list = event_file_result_list
elif isinstance(event_file_rec_list_result, list):
event_session_obj.event_file_list = []
else:
event_session_obj.event_file_list = None
# if event_file_dict_list := load_event_file_obj_list(
# event_session_id = event_session_id,
# limit = limit,
# model_as_dict = model_as_dict,
# enabled = enabled,
# ):
# event_session_obj.event_file_list = event_file_dict_list
# else: event_session_obj.event_file_list = []
if inc_event_location and event_location_id:
log.info('Need to include event location...')
if event_location_obj := load_event_location_obj(
event_location_id=event_location_id,
enabled=enabled,
):
event_location_id = event_location_id,
enabled = enabled,
):
event_session_obj.event_location = event_location_obj.dict(by_alias=True, exclude_unset=True)
else:
event_session_obj.event_location = None