A lot of code clean up! Also adding in Response everywhere...
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import datetime, pytz, time
|
||||
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, status
|
||||
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Response, status
|
||||
from pydantic import BaseModel, EmailStr, Field
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
|
||||
@@ -27,6 +27,7 @@ async def post_person_obj(
|
||||
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())
|
||||
@@ -51,6 +52,7 @@ async def patch_person_obj(
|
||||
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())
|
||||
@@ -86,6 +88,7 @@ async def post_person_json(
|
||||
exclude: Optional[list] = [],
|
||||
exclude_unset: Optional[bool] = True,
|
||||
exclude_none: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
@@ -107,7 +110,7 @@ async def post_person_json(
|
||||
else:
|
||||
return mk_resp(data=person_obj_in_result)
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400) # Bad Request
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
# ### END ### API Person ### post_person_json() ###
|
||||
|
||||
|
||||
@@ -126,12 +129,13 @@ async def patch_person_json(
|
||||
exclude: Optional[list] = [],
|
||||
exclude_unset: Optional[bool] = True,
|
||||
exclude_none: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
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)
|
||||
|
||||
if person_obj_up_result := create_update_person_obj(
|
||||
person_id = person_id,
|
||||
@@ -147,7 +151,7 @@ async def patch_person_json(
|
||||
else:
|
||||
return mk_resp(data=person_obj_up_result)
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400) # Bad Request
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
# ### END ### API Person ### patch_person_json() ###
|
||||
|
||||
|
||||
@@ -159,6 +163,7 @@ async def get_person_obj_li(
|
||||
x_account_id: str = Header(...),
|
||||
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())
|
||||
@@ -209,12 +214,13 @@ async def get_person_obj(
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
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)
|
||||
|
||||
if person_dict := load_person_obj(
|
||||
person_id = person_id,
|
||||
@@ -248,7 +254,7 @@ async def get_person_obj(
|
||||
else:
|
||||
response_data = person_dict
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400) # Bad Request
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data)
|
||||
# ### END ### API Person ### get_person_obj() ###
|
||||
@@ -274,13 +280,14 @@ async def get_person_obj_order_list(
|
||||
x_account_id: str = Header(...),
|
||||
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())
|
||||
|
||||
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)
|
||||
return mk_resp(data=None, status_code=404, response=response)
|
||||
|
||||
# Updated 2021-06-28
|
||||
if order_rec_list_result := get_order_rec_list(
|
||||
@@ -309,7 +316,7 @@ async def get_person_obj_order_list(
|
||||
order_result_list.append(None)
|
||||
response_data = order_result_list
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400) # Bad Request
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data)
|
||||
# ### END ### API Person ### get_person_obj_order_list() ###
|
||||
@@ -338,12 +345,13 @@ async def get_account_obj_person_list(
|
||||
x_account_id: str = Header(...),
|
||||
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())
|
||||
|
||||
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
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
@@ -374,7 +382,7 @@ async def get_account_obj_person_list(
|
||||
person_result_list.append(None)
|
||||
response_data = person_result_list
|
||||
else:
|
||||
return mk_resp(data=False, status_code=400) # Bad Request
|
||||
return mk_resp(data=False, status_code=400, response=response) # Bad Request
|
||||
|
||||
return mk_resp(data=response_data)
|
||||
# ### END ### API Person ### get_account_obj_person_list() ###
|
||||
@@ -384,6 +392,7 @@ async def get_account_obj_person_list(
|
||||
async def delete_person_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
x_account_id: str = Header(...),
|
||||
response: Response = Response,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
Reference in New Issue
Block a user