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

Code clean up. Adding missing response=response to mk_resp() function calls

Browse Source
This commit is contained in:
Scott Idem
2021-09-28 15:57:11 -04:00
parent e0b9c975b0
commit fb7efa9930
1 changed files with 17 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
app/routers/event.py
View File

@@ -42,35 +42,8 @@ async def post_event_obj(
return result return result
# @router.patch('/event/{obj_id}', response_model=Resp_Body_Base)
# async def patch_event_obj(
# obj_id: str = Query(..., min_length=1, max_length=22),
# obj: Event_Base = None,
# x_account_id: Optional[str] = Header(..., ),
# return_obj: Optional[bool] = True,
# by_alias: Optional[bool] = True,
# exclude_unset: Optional[bool] = True,
# response: Response = Response,
# ):
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.debug(locals())
# obj_type = 'event'
# obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
# obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type)
# obj_data_dict['id_random'] = obj_id
# result = patch_obj_template(
# obj_type=obj_type,
# data=obj_data_dict,
# obj_id=obj_id,
# return_obj=True,
# by_alias=True,
# exclude_unset=True,
# )
# return result
# ### BEGIN ### API Event ### patch_event() ### # ### BEGIN ### API Event ### patch_event() ###
# Updated 2021-09-28
@router.patch('/event/{event_id}', response_model=Resp_Body_Base) @router.patch('/event/{event_id}', response_model=Resp_Body_Base)
async def patch_event( async def patch_event(
event_obj: Event_Base, event_obj: Event_Base,
@@ -84,11 +57,11 @@ async def patch_event(
exclude_none: Optional[bool] = True, exclude_none: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else: return mk_resp(data=None, status_code=404) else: return mk_resp(data=None, status_code=404, response=response)
if event_obj_up_result := update_event_obj( if event_obj_up_result := update_event_obj(
event_id = event_id, event_id = event_id,
@@ -100,37 +73,16 @@ async def patch_event(
if return_obj: if return_obj:
event_obj = load_event_obj(event_id=event_id, inc_event_cfg=inc_event_cfg) event_obj = load_event_obj(event_id=event_id, inc_event_cfg=inc_event_cfg)
event_dict = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) event_dict = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
return mk_resp(data=event_dict) return mk_resp(data=event_dict, response=response)
else: else:
return mk_resp(data=event_obj_up_result) return mk_resp(data=event_obj_up_result, response=response)
else: else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request
# ### END ### API Event ### patch_event() ### # ### END ### API Event ### patch_event() ###
# @router.get('/event/list', response_model=Resp_Body_Base) # ### BEGIN ### API Event ### get_event_obj_li() ###
# async def get_event_obj_li( # Updated 2021-09-28
# for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50),
# for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22),
# x_account_id: str = Header(...),
# by_alias: Optional[bool] = True,
# exclude_unset: Optional[bool] = True,
# ):
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.debug(locals())
# obj_type = 'event'
# result = get_obj_li_template(
# obj_type=obj_type,
# for_obj_type=for_obj_type,
# for_obj_id=for_obj_id,
# by_alias=True,
# exclude_unset=True,
# )
# return result
@router.get('/event/list', response_model=Resp_Body_Base) @router.get('/event/list', response_model=Resp_Body_Base)
async def get_event_obj_li( async def get_event_obj_li(
for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), # account for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), # account
@@ -161,7 +113,7 @@ async def get_event_obj_li(
exclude_unset: bool = True, exclude_unset: bool = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
data = {} data = {}
@@ -245,10 +197,11 @@ async def get_event_obj_li(
data = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member data = event_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
event_obj_li.append(data) event_obj_li.append(data)
return mk_resp(data=event_obj_li) return mk_resp(data=event_obj_li, response=response)
else: else:
log.debug(event_obj_li_result) log.debug(event_obj_li_result)
return mk_resp(data=False, status_code=404, response=response) return mk_resp(data=False, status_code=404, response=response)
# ### END ### API Event ### get_event_obj_li() ###
# ### BEGIN ### API Event ### get_event_obj() ### # ### BEGIN ### API Event ### get_event_obj() ###
@@ -292,12 +245,12 @@ async def get_event_obj(
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass if event_id := redis_lookup_id_random(record_id_random=event_id, table_name='event'): pass
else: else:
return mk_resp(data=None, status_code=404) return mk_resp(data=None, status_code=404, response=response)
if event_obj := load_event_obj( if event_obj := load_event_obj(
event_id = event_id, event_id = event_id,
@@ -340,7 +293,7 @@ async def get_event_obj(
else: else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=event_obj) return mk_resp(data=event_obj, response=response)
# ### END ### API Event ### get_event_obj() ### # ### END ### API Event ### get_event_obj() ###
@@ -391,7 +344,7 @@ async def get_account_obj_event_list(
log.debug(locals()) log.debug(locals())
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
else: return mk_resp(data=None, status_code=404) else: return mk_resp(data=None, status_code=404, response=response)
response_data = None response_data = None
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -447,7 +400,7 @@ async def get_account_obj_event_list(
else: else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data) return mk_resp(data=response_data, response=response)
# ### END ### API Event ### get_account_obj_event_list() ### # ### END ### API Event ### get_account_obj_event_list() ###
@@ -482,7 +435,7 @@ async def get_person_event_obj_li(
log.debug(locals()) log.debug(locals())
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
else: return mk_resp(data=None, status_code=404) else: return mk_resp(data=None, status_code=404, response=response)
# Updated 2021-07-12 # Updated 2021-07-12
if event_rec_list_result := get_event_rec_list( if event_rec_list_result := get_event_rec_list(
@@ -513,7 +466,7 @@ async def get_person_event_obj_li(
else: else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data) return mk_resp(data=response_data, response=response)
# ### END ### API Event Methods ### get_person_event_obj_li() ### # ### END ### API Event Methods ### get_person_event_obj_li() ###