Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor changes and clean up

Browse Source
This commit is contained in:
Scott Idem
2023-07-26 11:44:06 -04:00
parent a377878781
commit a963949bbb
1 changed files with 33 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
app/routers/api_crud.py
View File

@@ -169,29 +169,30 @@ async def get_obj_li(
obj_type_l1: str = Query(..., min_length=2, max_length=50), obj_type_l1: str = Query(..., min_length=2, max_length=50),
obj_type_l2: str = Query(None, min_length=2, max_length=50), obj_type_l2: str = Query(None, min_length=2, max_length=50),
obj_type_l3: str = Query(None, min_length=2, max_length=50), obj_type_l3: str = Query(None, min_length=2, max_length=50),
#obj_id: str=None,
for_obj_type: Optional[str] = Query(None, max_length=50), for_obj_type: Optional[str] = Query(None, max_length=50),
for_obj_id: Optional[str] = Query(None, max_length=22), for_obj_id: Optional[str] = Query(None, max_length=22),
enabled: str = 'enabled', # enabled: str = 'enabled',
hidden: str = 'not_hidden', # hidden, not_hidden, all, hidden: str = 'not_hidden', # hidden, not_hidden, all,
# order_by_li: dict = None, # order_by_li: dict = None,
order_by_li: str = Header(None), # Json formatted string in a key value format. order_by_li: str = Header(None), # Json formatted string in a key value format.
dh_order_by_li: str = Header(None), # dh_order_by_li: str = Header(None),
dh_testing: str = Header(None), # dh_testing: str = Header(None),
h_order_by_li: str = Header(None), # h_order_by_li: str = Header(None),
h_testing: str = Header(None), # h_testing: str = Header(None),
limit: int = 10000, # limit: int = 10000,
offset: int = 0, # offset: int = 0,
x_account_id: str = Header(...), # x_account_id: str = Header(...),
by_alias: Optional[bool] = True, # by_alias: Optional[bool] = True,
# include: Optional[list] = [], # include: Optional[list] = [],
# exclude: Optional[list] = [], # exclude: Optional[list] = [],
exclude_unset: Optional[bool] = False, # exclude_unset: Optional[bool] = False,
exclude_none: Optional[bool] = True, # exclude_none: Optional[bool] = True,
response: Response = Response, # response: Response = Response,
# commons: Common_Route_Params = Depends(common_route_params), # Switch to this later... sooner
commons: Common_Route_Params = Depends(common_route_params), # Switch to this later... sooner
): ):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -215,22 +216,22 @@ async def get_obj_li(
if obj_name in obj_type_li: if obj_name in obj_type_li:
pass pass
else: else:
return mk_resp(data=False, status_code=400, response=response) return mk_resp(data=False, status_code=400, response=commons.response)
elif obj_type_l1 and obj_type_l2: elif obj_type_l1 and obj_type_l2:
obj_name = f'{obj_type_l1}_{obj_type_l2}' obj_name = f'{obj_type_l1}_{obj_type_l2}'
if obj_name in obj_type_li: if obj_name in obj_type_li:
pass pass
else: else:
return mk_resp(data=False, status_code=400, response=response) return mk_resp(data=False, status_code=400, response=commons.response)
elif obj_type_l1: elif obj_type_l1:
obj_name = f'{obj_type_l1}' obj_name = f'{obj_type_l1}'
if obj_name in obj_type_li: if obj_name in obj_type_li:
pass pass
else: else:
return mk_resp(data=False, status_code=400, response=response) return mk_resp(data=False, status_code=400, response=commons.response)
else: else:
log.warning('We should not be here') log.warning('We should not be here')
return mk_resp(data=False, status_code=400, response=response) return mk_resp(data=False, status_code=400, response=commons.response)
table_name = obj_type_li[obj_name]['table_name'] table_name = obj_type_li[obj_name]['table_name']
@@ -241,11 +242,11 @@ async def get_obj_li(
field_name = f'{for_obj_type}_id' 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 # 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=enabled, hidden=hidden, order_by_li=order_by_li, limit=limit, offset=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)
else: else:
# NOTE: The enabled and hidden parameters are new to this endpoint and the sql_select function! -2023-07-06 # 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. # NOTE: This call (without field_name, field_value, limit, offset) may need more testing.
sql_result = sql_select(table_name=table_name, enabled=enabled, hidden=hidden, order_by_li=order_by_li, limit=limit, offset=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)
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(sql_result) log.debug(sql_result)
@@ -255,11 +256,11 @@ async def get_obj_li(
if sql_result: if sql_result:
resp_data_li = [] resp_data_li = []
for record in sql_result: for record in sql_result:
resp_data = base_name(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset) resp_data = base_name(**record).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset)
resp_data_li.append(resp_data) resp_data_li.append(resp_data)
return mk_resp(data=resp_data_li, response=response) return mk_resp(data=resp_data_li, response=commons.response)
else: return mk_resp(data=None, response=response, status_code=404) else: return mk_resp(data=None, response=commons.response, status_code=404)
#@router.get('/{obj_type_l1}/{obj_id_int}') #@router.get('/{obj_type_l1}/{obj_id_int}')
@@ -271,17 +272,22 @@ async def get_obj(
obj_type_l2: str=None, obj_type_l2: str=None,
obj_type_l3: str=None, obj_type_l3: str=None,
obj_id: str=None, obj_id: str=None,
for_obj_type: Optional[str] = Query(None, max_length=50), for_obj_type: Optional[str] = Query(None, max_length=50),
for_obj_id: Optional[str] = Query(None, max_length=22), for_obj_id: Optional[str] = Query(None, max_length=22),
# qry_str: Optional[str] = Query(None, max_length=50),
# qry_int: Optional[int] = None,
x_account_id: str = Header(...), x_account_id: str = Header(...),
qry_str: Optional[str] = Query(None, max_length=50),
qry_int: Optional[int] = None,
by_alias: Optional[bool] = True, by_alias: Optional[bool] = True,
include: Optional[list] = [], # include: Optional[list] = [],
exclude: Optional[list] = [], # exclude: Optional[list] = [],
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
exclude_none: Optional[bool] = True, exclude_none: Optional[bool] = True,
response: Response = Response, response: Response = Response,
# commons: Common_Route_Params = Depends(common_route_params), # Switch to this later... sooner
): ):
""" """
Simple select object type with an ID: Simple select object type with an ID: