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

Work on event tracking and general code clean up

Browse Source
This commit is contained in:
Scott Idem
2022-02-16 16:46:28 -05:00
parent 2e525fa01b
commit f57f3ba9b8
4 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/methods/event_exhibit_tracking_methods.py
View File

@@ -128,7 +128,7 @@ def remove_event_exhibit_tracking_obj(
# ### BEGIN ### API Event Exhibit Tracking Methods ### load_event_exhibit_tracking_obj() ###
# Updated 2022-02-14
# Updated 2022-02-15
@logger_reset
def load_event_exhibit_tracking_obj(
event_exhibit_tracking_id: int,
@@ -143,6 +143,7 @@ def load_event_exhibit_tracking_obj(
inc_event_badge: bool = False,
inc_event_exhibit: bool = False,
inc_event_person: bool = False,
inc_event_person_profile: bool = False,
) -> Event_Exhibit_Tracking_Base|dict|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -172,7 +173,7 @@ def load_event_exhibit_tracking_obj(
model_as_dict = model_as_dict,
):
event_exhibit_tracking_obj.event_exhibit = event_exhibit_result
else: event_exhibit_tracking_obj.event_exhibit = None
else: event_exhibit_tracking_obj.event_exhibit = {} # None
if inc_event_person:
log.info('Need to include Event Person data...')
@@ -181,12 +182,14 @@ def load_event_exhibit_tracking_obj(
from app.methods.event_person_methods import load_event_person_obj
if event_person_result := load_event_person_obj(
event_person_id = event_person_id,
inc_event_badge = inc_event_badge,
inc_event_person_profile = inc_event_person_profile,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
):
event_exhibit_tracking_obj.event_person = event_person_result
else: event_exhibit_tracking_obj.event_person = None
else: event_exhibit_tracking_obj.event_person = {} # None
if model_as_dict:
return event_exhibit_tracking_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member

14
app/methods/event_person_methods.py
View File

@@ -94,7 +94,7 @@ def load_event_person_obj(
event_person_obj.event_badge = event_badge_obj.dict(by_alias=True, exclude_unset=True)
else:
log.warning('A event_badge object was not returned.')
event_person_obj.event_badge = None
event_person_obj.event_badge = {} # None
if inc_event_exhibit_list: pass
if inc_event_file_list: pass
@@ -110,7 +110,7 @@ def load_event_person_obj(
event_person_obj.event_person_profile = event_person_profile_obj.dict(by_alias=True, exclude_unset=True)
else:
log.warning('A event_person_profile object was not returned.')
event_person_obj.event_person_profile = None
event_person_obj.event_person_profile = {} # None
if inc_event_presentation_list: pass
@@ -142,10 +142,10 @@ def load_event_person_obj(
event_presenter_result_list.append(None)
log.debug(event_presenter_result_list)
event_person_obj.event_presenter_list = event_presenter_result_list
elif isinstance(event_presenter_rec_list_result, list):
event_person_obj.event_presenter_list = []
# elif isinstance(event_presenter_rec_list_result, list):
# event_person_obj.event_presenter_list = []
else:
event_person_obj.event_presenter_list = None
event_person_obj.event_presenter_list = [] # None
if inc_event_registration: pass
if inc_event_session_list: pass
@@ -164,7 +164,7 @@ def load_event_person_obj(
event_person_obj.person = person_obj.dict(by_alias=True, exclude_unset=True)
else:
log.warning('A person object was not returned.')
event_person_obj.person = None
event_person_obj.person = {} # None
# Updated 2021-08-17
if inc_user:
@@ -179,7 +179,7 @@ def load_event_person_obj(
event_person_obj.user = user_obj.dict(by_alias=True, exclude_unset=True)
else:
log.warning('A user object was not returned.')
event_person_obj.user = None
event_person_obj.user = {} # None
return event_person_obj
# ### END ### API Event Person Methods ### load_event_person_obj() ###

4
app/routers/event_exhibit.py
View File

@@ -100,7 +100,9 @@ async def get_event_exhibit_obj(
event_exhibit_id: str = Query(..., min_length=11, max_length=22),
inc_event_exhibit_tracking_list: bool = False,
inc_event_badge: bool = False,
inc_event_person: bool = False,
# inc_event_person_profile: bool = False,
commons: Common_Route_Params = Depends(common_route_params),
):
@@ -117,7 +119,9 @@ async def get_event_exhibit_obj(
if event_exhibit_obj_result := load_event_exhibit_obj(
event_exhibit_id = event_exhibit_id,
inc_event_exhibit_tracking_list = inc_event_exhibit_tracking_list,
inc_event_badge = inc_event_badge,
inc_event_person = inc_event_person,
# inc_event_person_profile = inc_event_person_profile,
):
log.info('Loading successful. Returning result')
return mk_resp(data=event_exhibit_obj_result, response=commons.response) # Success

2
app/routers/event_exhibit_tracking.py
View File

@@ -164,6 +164,7 @@ async def get_event_exhibit_tracking_obj(
inc_event_badge: bool = False,
inc_event_exhibit: bool = False,
inc_event_person: bool = False,
inc_event_person_profile: bool = False,
commons: Common_Route_Params = Depends(common_route_params),
):
@@ -180,6 +181,7 @@ async def get_event_exhibit_tracking_obj(
inc_event_badge = inc_event_badge,
inc_event_exhibit = inc_event_exhibit,
inc_event_person = inc_event_person,
inc_event_person_profile = inc_event_person_profile,
):
log.info('Loading successful. Returning result')
return mk_resp(data=event_exhibit_tracking_obj_result, response=commons.response) # Success