From 42a9bd9f32a1492f2aad2aa779e5d649ee357b76 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 12 Aug 2022 17:29:52 -0400 Subject: [PATCH] General clean up. Work on event files and event presenters. --- app/methods/event_file_methods.py | 41 ++++++---------------------- app/models/event_file_models.py | 4 +++ app/models/event_models.py | 2 +- app/models/event_presenter_models.py | 4 +++ app/routers/event_presenter.py | 4 +-- 5 files changed, 19 insertions(+), 36 deletions(-) diff --git a/app/methods/event_file_methods.py b/app/methods/event_file_methods.py index 2e88f90..43d4f49 100644 --- a/app/methods/event_file_methods.py +++ b/app/methods/event_file_methods.py @@ -106,6 +106,7 @@ def get_event_file_rec_list( # event_session_id: str = None, enabled: str = 'enabled', # enabled, disabled, all limit: int = 100, + offset: int = 0, ) -> list|bool: log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -144,21 +145,8 @@ def get_event_file_rec_list( else: sql_group = '' - if enabled in ['enabled', 'disabled', 'all']: - if enabled == 'enabled': - data['enable'] = True - sql_enabled = f'AND `event_file`.enable = :enable' - elif enabled == 'disabled': - data['enable'] = False - sql_enabled = f'AND `event_file`.enable = :enable' - elif enabled == 'all': - sql_enabled = '' - - if limit: - data['limit'] = limit - sql_limit = f'LIMIT :limit' - else: - sql_limit = '' + sql_enabled, data['enable'] = sql_enable_part(table_name='event_file', enabled=enabled) # Reasonably safe return str and bool + sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str sql = f""" SELECT `event_file`.id AS 'event_file_id', `event_file`.id_random AS 'event_file_id_random' @@ -195,10 +183,11 @@ def get_event_file_rec_list( def load_event_file_obj_list( event_id: int|str|None = None, event_session_id: int|str|None = None, - limit: int = 1000, + inc_hosted_file: bool = False, model_as_dict: bool = False, enabled: str = 'enabled', # enabled, disabled, all - inc_hosted_file: bool = False, + limit: int = 1000, + offset: int = 0, ) -> list|bool: log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -217,22 +206,8 @@ def load_event_file_obj_list( data['for_id'] = event_session_id sql_obj_type_id = f'`tbl`.for_type = :for_type AND `tbl`.for_id = :for_id' - if enabled in ['enabled', 'disabled', 'all']: - if enabled == 'enabled': - data['enable'] = True - sql_enabled = f'AND `tbl`.enable = :enable' - elif enabled == 'disabled': - data['enable'] = False - sql_enabled = f'AND `tbl`.enable = :enable' - elif enabled == 'all': - sql_enabled = '' - # else: tbl_obj['account'] = None - - if limit: - data['limit'] = limit - sql_limit = f'LIMIT :limit' - else: - sql_limit = '' + sql_enabled, data['enable'] = sql_enable_part(table_name='event_file', enabled=enabled) # Reasonably safe return str and bool + sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str sql = f""" SELECT `tbl`.id AS 'event_file_id', `tbl`.id_random AS 'event_file_id_random' diff --git a/app/models/event_file_models.py b/app/models/event_file_models.py index 8fe053d..6c8b5bb 100644 --- a/app/models/event_file_models.py +++ b/app/models/event_file_models.py @@ -93,6 +93,10 @@ class Event_File_Base(BaseModel): alias = 'file_size' ) + lu_event_file_purpose_name: Optional[str] = Field( + alias = 'file_purpose_name' + ) + # Including other related objects hosted_file: Optional[Union[Hosted_File_Base, None]] diff --git a/app/models/event_models.py b/app/models/event_models.py index a407b0f..564d7be 100644 --- a/app/models/event_models.py +++ b/app/models/event_models.py @@ -154,7 +154,7 @@ class Event_Base(BaseModel): event_track_list: Optional[list] # Optional[Event_Track_Base] # poc_event_person: Optional[Event_Person_Base] poc_person: Optional[Person_Base] - user: Optional[User_Base] + # user: Optional[User_Base] _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) diff --git a/app/models/event_presenter_models.py b/app/models/event_presenter_models.py index c413264..f4b2094 100644 --- a/app/models/event_presenter_models.py +++ b/app/models/event_presenter_models.py @@ -121,13 +121,17 @@ class Event_Presenter_Base(BaseModel): event_name: Optional[str] event_start_datetime: Optional[datetime.datetime] event_end_datetime: Optional[datetime.datetime] + event_location_code: Optional[str] event_location_name: Optional[str] + event_presentation_code: Optional[str] event_presentation_name: Optional[str] event_presentation_start_datetime: Optional[datetime.datetime] event_presentation_end_datetime: Optional[datetime.datetime] + event_session_code: Optional[str] event_session_name: Optional[str] event_session_start_datetime: Optional[datetime.datetime] event_session_end_datetime: Optional[datetime.datetime] + event_track_code: Optional[str] event_track_name: Optional[str] # Including other related objects diff --git a/app/routers/event_presenter.py b/app/routers/event_presenter.py index 2241348..827a321 100644 --- a/app/routers/event_presenter.py +++ b/app/routers/event_presenter.py @@ -260,7 +260,7 @@ async def get_event_presenter_obj( exclude_unset: Optional[bool] = True, response: Response = Response, ): - 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_presenter_id := redis_lookup_id_random(record_id_random=event_presenter_id, table_name='event_presenter'): pass @@ -311,4 +311,4 @@ async def delete_event_presenter_obj( obj_type=obj_type, obj_id=obj_id, ) - return result \ No newline at end of file + return result