From 554ea353e0f2da7b6ffcee9b96760a87c1479d71 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Sun, 10 Apr 2022 22:20:54 -0400 Subject: [PATCH] Unknown --- app/methods/event_exhibit_methods.py | 5 +++-- app/methods/event_exhibit_tracking_methods.py | 4 ++-- app/models/event_exhibit_tracking_models.py | 2 +- app/routers/event_badge.py | 2 +- app/routers/event_exhibit_tracking.py | 2 ++ 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/app/methods/event_exhibit_methods.py b/app/methods/event_exhibit_methods.py index c23461d..08e76ca 100644 --- a/app/methods/event_exhibit_methods.py +++ b/app/methods/event_exhibit_methods.py @@ -139,7 +139,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.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # 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 @@ -193,7 +193,7 @@ def get_event_exhibit_rec_list( limit: int = 100, offset: int = 0, ) -> list|bool: - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) data = {} @@ -250,6 +250,7 @@ def get_event_exhibit_rec_list( ORDER BY `event_exhibit`.priority DESC, `event_exhibit`.sort ASC, `event_exhibit`.name ASC, `event_exhibit`.created_on DESC, `event_exhibit`.updated_on DESC {sql_limit}; """ + log.debug(sql) if event_exhibit_rec_li_result := sql_select(data=data, sql=sql, as_list=True): log.info('Got a list result') diff --git a/app/methods/event_exhibit_tracking_methods.py b/app/methods/event_exhibit_tracking_methods.py index 0e7c03d..77cfbf5 100644 --- a/app/methods/event_exhibit_tracking_methods.py +++ b/app/methods/event_exhibit_tracking_methods.py @@ -94,7 +94,7 @@ def update_event_exhibit_tracking_obj( event_exhibit_tracking_obj.id = event_exhibit_tracking_id log.debug(event_exhibit_tracking_obj) - event_exhibit_tracking_dict = event_exhibit_tracking_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'event_badge', 'event_badge_id_random', 'event_person', 'event_person_id_random', 'created_on', 'updated_on'}) + event_exhibit_tracking_dict = event_exhibit_tracking_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={ 'event_id', 'event_id_random', 'event_badge', 'event_badge_id_random', 'event_badge_informal_name', 'event_badge_given_name', 'event_badge_family_name', 'event_badge_display_name', 'event_badge_full_name', 'event_badge_affiliations', 'event_badge_email', 'event_person_informal_name', 'event_person_given_name', 'event_person_family_name', 'event_person_display_name', 'event_person_full_name', 'event_person_affiliations', 'event_person_email', 'event_exhibit_name', 'event_person', 'event_person_id_random', 'created_on', 'updated_on'}) # ### SECTION ### Process data if event_exhibit_tracking_dict_up_result := sql_update( @@ -269,7 +269,7 @@ def get_event_exhibit_tracking_rec_list( {sql_select_event_exhibit_id} {sql_select_event_person_id} {sql_enabled} - ORDER BY `event_exhibit_tracking`.created_on DESC, `event_exhibit_tracking`.updated_on DESC + ORDER BY `event_exhibit_tracking`.priority DESC, `event_exhibit_tracking`.sort ASC, `event_exhibit_tracking`.created_on DESC, `event_exhibit_tracking`.updated_on DESC {sql_limit}; """ diff --git a/app/models/event_exhibit_tracking_models.py b/app/models/event_exhibit_tracking_models.py index 1dcd3ba..35feeec 100644 --- a/app/models/event_exhibit_tracking_models.py +++ b/app/models/event_exhibit_tracking_models.py @@ -41,7 +41,7 @@ class Event_Exhibit_Tracking_Base(BaseModel): enable: Optional[bool] hide: Optional[bool] priority: Optional[bool] = False - sort: Optional[int] + sort: Optional[Union[None, int]] = None group: Optional[str] notes: Optional[str] diff --git a/app/routers/event_badge.py b/app/routers/event_badge.py index ef76c87..79c8fb3 100644 --- a/app/routers/event_badge.py +++ b/app/routers/event_badge.py @@ -154,7 +154,7 @@ async def search_event_badge_obj_li( commons: Common_Route_Params = Depends(common_route_params), ): - log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) # account_id = commons.x_account_id diff --git a/app/routers/event_exhibit_tracking.py b/app/routers/event_exhibit_tracking.py index 79da584..402a7f1 100644 --- a/app/routers/event_exhibit_tracking.py +++ b/app/routers/event_exhibit_tracking.py @@ -109,6 +109,8 @@ async def patch_event_exhibit_tracking_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) + time.sleep(2) + # ### SECTION ### Secondary data validation event_exhibit_tracking_id_random = event_exhibit_tracking_id # This is used later for the response data if event_exhibit_tracking_id := redis_lookup_id_random(record_id_random=event_exhibit_tracking_id, table_name='event_exhibit_tracking'): pass