From f3a84a96097066c3c5392ab9e63e9e6ac6c5e496 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 27 Jan 2023 16:32:30 -0500 Subject: [PATCH] Badge and launcher related changes --- app/methods/event_exhibit_methods.py | 2 +- app/methods/event_presentation_methods.py | 16 ++++++++-------- app/methods/event_session_methods.py | 3 +-- app/models/event_session_models.py | 10 +++++----- app/routers/event_exhibit.py | 2 +- 5 files changed, 16 insertions(+), 17 deletions(-) diff --git a/app/methods/event_exhibit_methods.py b/app/methods/event_exhibit_methods.py index 6a2edb7..a1b01b5 100644 --- a/app/methods/event_exhibit_methods.py +++ b/app/methods/event_exhibit_methods.py @@ -145,7 +145,7 @@ def load_event_exhibit_obj( inc_event_exhibit_tracking_list: bool = False, inc_event_person: bool = False, ) -> Event_Exhibit_Base|dict|bool: - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # if event_exhibit_id := redis_lookup_id_random(record_id_random=event_exhibit_id, table_name='event_exhibit'): pass diff --git a/app/methods/event_presentation_methods.py b/app/methods/event_presentation_methods.py index 31fe50d..c50a6bc 100644 --- a/app/methods/event_presentation_methods.py +++ b/app/methods/event_presentation_methods.py @@ -127,7 +127,7 @@ def load_event_presentation_obj( if inc_event_person_list: pass if inc_event_presenter_list: - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL data = {} data['event_presentation_id'] = event_presentation_id @@ -167,12 +167,12 @@ def load_event_presentation_obj( {sql_enabled} ORDER BY `event_presenter`.priority DESC, -`event_presenter`.sort DESC, `event_presenter`.family_name ASC, `event_presenter`.given_name ASC, `event_presenter`.display_name ASC, `event_presenter`.full_name ASC, `event_presenter`.created_on DESC, `event_presenter`.updated_on DESC; """ - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(sql) log.debug(data) if event_presenter_obj_li_result := sql_select(data=data, sql=sql, as_list=True): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(event_presenter_obj_li_result) event_presenter_obj_li = [] for event_presenter_obj in event_presenter_obj_li_result: @@ -201,13 +201,13 @@ def load_event_presentation_obj( log.debug(event_presenter_obj_li) event_presentation_obj.event_presenter_list = event_presenter_obj_li else: - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(event_presenter_obj_li_result) event_presentation_obj.event_presenter_list = [] - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL if inc_event_session: - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL from app.methods.event_session_methods import load_event_session_obj if event_session_obj := load_event_session_obj( @@ -217,10 +217,10 @@ def load_event_presentation_obj( log.debug(event_session_obj) event_presentation_obj.event_session = event_session_obj else: - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(event_session_obj) event_presentation_obj.event_session = None - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL if model_as_dict: return event_presentation_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member diff --git a/app/methods/event_session_methods.py b/app/methods/event_session_methods.py index 7bc903f..d6cf4d0 100644 --- a/app/methods/event_session_methods.py +++ b/app/methods/event_session_methods.py @@ -482,8 +482,7 @@ def create_update_event_session_obj_v4( event_session_dict['event_id'] = event_id try: event_session_obj = Event_Session_Base(**event_session_dict) - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(event_session_obj) + log.warning(event_session_obj) except ValidationError as e: log.error(e.json()) return False diff --git a/app/models/event_session_models.py b/app/models/event_session_models.py index 756d424..d3d6139 100644 --- a/app/models/event_session_models.py +++ b/app/models/event_session_models.py @@ -47,12 +47,12 @@ class Event_Session_Base(BaseModel): poc_event_person_id_random: Optional[str] poc_event_person_id: Optional[int] - poc_person_id_random: Optional[str] - poc_person_id: Optional[int] + poc_person_id_random: Optional[str] # Not used or needed? + poc_person_id: Optional[int] # Not used or needed? - session_type_id_random: Optional[str] - session_type_id: Optional[int] - session_type_code: Optional[str] + type_id_random: Optional[str] # Not used or needed? + type_id: Optional[int] # Not used or needed? + type_code: Optional[str] # None, poster (image, video), assume presentation (PPT, Key, PDF, etc) name: Optional[str] description: Optional[str] diff --git a/app/routers/event_exhibit.py b/app/routers/event_exhibit.py index 6e1a742..cadd7f3 100644 --- a/app/routers/event_exhibit.py +++ b/app/routers/event_exhibit.py @@ -108,7 +108,7 @@ async def get_event_exhibit_obj( commons: Common_Route_Params = Depends(common_route_params), ): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # time.sleep(.5)