diff --git a/app/routers/api_crud.py b/app/routers/api_crud.py index 17bbacc..0d4e727 100644 --- a/app/routers/api_crud.py +++ b/app/routers/api_crud.py @@ -80,7 +80,7 @@ obj_type_li['archive_content'] = {'table_name': 'v_archive_content', 'tbl_name_u obj_type_li['contact'] = {'table_name': 'v_contact', 'tbl_name_update': 'contact', 'base_name': Contact_Base} obj_type_li['cont_edu_cert'] = {'table_name': 'v_cont_edu_cert', 'tbl_name_update': 'cont_edu_cert', 'base_name': Cont_Edu_Cert_Base} obj_type_li['cont_edu_cert_person'] = {'table_name': 'v_cont_edu_cert_person', 'tbl_name_update': 'cont_edu_cert_person', 'base_name': Cont_Edu_Cert_Person_Base} -obj_type_li['event'] = {'table_name': 'v_event', 'tbl_name_update': 'event', 'base_name': Event_Base} +obj_type_li['event'] = {'table_name': 'v_event', 'table_name_alt': 'v_event_w_file_count', 'tbl_name_update': 'event', 'base_name': Event_Base, 'base_name_alt': Event_Meeting_Flat_Base} obj_type_li['event_abstract'] = {'table_name': 'v_event_abstract', 'tbl_name_update': 'event_abstract', 'base_name': Event_Abstract_In} obj_type_li['event_badge'] = {'table_name': 'event_badge', 'tbl_name_update': 'event_badge', 'base_name': Event_Badge_Base} #obj_type_li['event_badge_log'] = {'table_name': 'event_badge_log', 'tbl_name_update': 'event_badge_log', 'base_name': Event_Badge_Log_Base} @@ -173,6 +173,9 @@ async def get_obj_li( for_obj_type: Optional[str] = Query(None, max_length=50), for_obj_id: Optional[str] = Query(None, max_length=22), + use_alt_table: bool = False, # NOTE: This will use table_name_alt if they exist. -2023-11-17 + use_alt_base: bool = False, # NOTE: This will use base_name_alt if they exist. -2023-11-17 + hidden: str = 'not_hidden', # hidden, not_hidden, all, # order_by_li: dict = None, order_by_li: str = Header(None), # Json formatted string in a key value format. It is not ideal that this is in the header. Need a better option, but this is currently a GET request. @@ -188,7 +191,7 @@ async def get_obj_li( commons: Common_Route_Params = Depends(common_route_params), ): - log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL + log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) if order_by_li: @@ -227,7 +230,10 @@ async def get_obj_li( log.warning('We should not be here') return mk_resp(data=False, status_code=400, response=commons.response) - table_name = obj_type_li[obj_name]['table_name'] + if use_alt_table: + table_name = obj_type_li[obj_name]['table_name_alt'] + else: + table_name = obj_type_li[obj_name]['table_name'] if for_obj_type and for_obj_id: for_obj_id = redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type) @@ -246,7 +252,10 @@ async def get_obj_li( # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(sql_result) - base_name = obj_type_li[obj_name]['base_name'] + if use_alt_base: + base_name = obj_type_li[obj_name]['base_name_alt'] + else: + base_name = obj_type_li[obj_name]['base_name'] if sql_result: if isinstance(sql_result, list):