Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A lot of work on event related modules. Also a lot of clean up.

Browse Source
This commit is contained in:
Scott Idem
2021-06-08 15:56:00 -04:00
parent b7f6a5ee2a
commit d37234d7d8
10 changed files with 66 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/methods/event_session_methods.py
View File

@@ -10,6 +10,7 @@ from app.lib_general import log, logging
# from app.methods.event_methods import load_event_obj
# from app.methods.event_file_methods import load_event_file_obj
from app.methods.event_location_methods import load_event_location_obj
from app.methods.event_person_methods import load_event_person_obj
from app.methods.event_presentation_methods import load_event_presentation_obj
# from app.methods.event_presenter_methods import load_event_presenter_obj
from app.methods.person_methods import load_person_obj
@@ -23,11 +24,14 @@ def load_event_session_obj(
event_session_id: int|str,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
inc_address: bool = False,
inc_contact: bool = False,
inc_event_abstract_list: bool = False,
inc_event_badge_list: bool = False,
inc_event_device_list: bool = False,
inc_event_file_list: bool = False,
inc_event_location: bool = False,
inc_event_person: bool = False,
inc_event_person_list: bool = False,
inc_event_presentation_list: bool = False,
inc_event_presenter_cat: bool = False, # Concantinate presenter names
@@ -35,8 +39,8 @@ def load_event_session_obj(
inc_event_registration_list: bool = False,
inc_event_track: bool = False,
inc_poc_event_person: bool = False,
# inc_poc_person: bool = False,
# inc_user: bool = False,
inc_person: bool = False,
inc_user: bool = False,
) -> Event_Session_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -63,7 +67,6 @@ def load_event_session_obj(
event_location_id = event_session_rec.get('event_location_id', None)
event_track_id = event_session_rec.get('event_track_id', None)
poc_event_person_id = event_session_rec.get('poc_event_person_id', None)
poc_person_id = event_session_rec.get('poc_person_id', None)
#if inc_event: pass
if inc_event_abstract_list: pass
@@ -125,11 +128,16 @@ def load_event_session_obj(
if event_presentation_obj := load_event_presentation_obj(
event_presentation_id=event_presentation_id,
enabled=enabled,
inc_address=inc_address,
inc_contact=inc_contact,
inc_event_abstract_list=inc_event_abstract_list,
inc_event_device_list=inc_event_device_list,
inc_event_file_list=inc_event_file_list,
inc_event_person=inc_event_person,
inc_event_person_list=inc_event_person_list,
inc_event_presenter_list=inc_event_presenter_list,
inc_person=inc_person,
inc_user=inc_user
):
data = event_presentation_obj.dict(by_alias=True, exclude_unset=True)
event_presentation_obj_li.append(data)
@@ -138,6 +146,7 @@ def load_event_session_obj(
else:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_presentation_rec_li_result)
event_session_obj.event_presentation_list = []
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if inc_event_presenter_cat:
@@ -161,11 +170,15 @@ def load_event_session_obj(
if inc_event_presenter_list: pass
if inc_poc_event_person:
poc_event_person_obj = load_person_obj(person_id=poc_person_id)
poc_event_person_obj = load_event_person_obj(
event_person_id=poc_event_person_id,
inc_address=inc_address,
inc_contact=inc_contact,
inc_person=inc_person,
inc_user=inc_user
)
log.debug(poc_event_person_obj)
event_session_obj.poc_event_person = poc_event_person_obj
log.debug(event_session_obj)
#if inc_user: pass
return event_session_obj