diff --git a/app/routers/api_crud.py b/app/routers/api_crud.py index 167e881..b08e5ce 100644 --- a/app/routers/api_crud.py +++ b/app/routers/api_crud.py @@ -242,11 +242,11 @@ async def get_obj_li( field_name = f'{for_obj_type}_id' # NOTE: The enabled and hidden parameters are new to this endpoint and the sql_select function! -2023-07-06 - sql_result = sql_select(table_name=table_name, field_name=field_name, field_value=for_obj_id, enabled=commons.enabled, hidden=hidden, order_by_li=order_by_li, limit=commons.limit, offset=commons.offset) + sql_result = sql_select(table_name=table_name, field_name=field_name, field_value=for_obj_id, enabled=commons.enabled, hidden=hidden, order_by_li=order_by_li, limit=commons.limit, offset=commons.offset, as_list=True) else: # NOTE: The enabled and hidden parameters are new to this endpoint and the sql_select function! -2023-07-06 # NOTE: This call (without field_name, field_value, limit, offset) may need more testing. - sql_result = sql_select(table_name=table_name, enabled=commons.enabled, hidden=hidden, order_by_li=order_by_li, limit=commons.limit, offset=commons.offset) + sql_result = sql_select(table_name=table_name, enabled=commons.enabled, hidden=hidden, order_by_li=order_by_li, limit=commons.limit, offset=commons.offset, as_list=True) # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(sql_result) @@ -254,12 +254,16 @@ async def get_obj_li( base_name = obj_type_li[obj_name]['base_name'] if sql_result: - resp_data_li = [] - for record in sql_result: - resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) - resp_data_li.append(resp_data) + if isinstance(sql_result, list): + resp_data_li = [] + for record in sql_result: + resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset) + resp_data_li.append(resp_data) + return mk_resp(data=resp_data_li, response=commons.response) + else: + status_message='Not Implemented (sort of). Attempted to process this request. Got a SQL result, but the returned data was unexpected.' - return mk_resp(data=resp_data_li, response=commons.response) + return mk_resp(data=sql_result, response=commons.response, status_code=501, status_message=status_message) # Returns "Not Implemented" (sort of... unexpected response) else: return mk_resp(data=None, response=commons.response, status_code=404)