Working on redoing order to get rid of order_cart.
This commit is contained in:
@@ -27,10 +27,10 @@ async def get_lookup_li(
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
allowed_lookup_tables = ['country', 'country_subdivision', 'event_session_type', 'file_purpose', 'membership_group_status', 'membership_person_status', 'membership_type_status', 'order_status', 'post_topic', 'time_zone', 'user_status']
|
||||
allowed_lookup_tables = ['country', 'country_subdivision', 'event_session_type', 'file_purpose', 'membership_group_status', 'membership_person_status', 'membership_type_status', 'order_status', 'post_topic', 'product_type', 'time_zone', 'user_status']
|
||||
|
||||
if for_lookup_name in allowed_lookup_tables: pass
|
||||
else:
|
||||
|
||||
@@ -12,15 +12,17 @@ from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_
|
||||
from app.methods.order_methods import load_order_obj, save_order_obj
|
||||
|
||||
from app.models.response_models import *
|
||||
from app.models.order_models import Order_Base
|
||||
from app.models.order_models import Order_Base, Order_DB_Base
|
||||
|
||||
|
||||
router = APIRouter()
|
||||
|
||||
|
||||
@router.post('', response_model=Resp_Body_Base)
|
||||
# NOTE 2021-08-09: Use with rework of order_cart
|
||||
# account_id is required, person_id is ideal
|
||||
@router.post('/order', response_model=Resp_Body_Base)
|
||||
async def post_order_obj(
|
||||
obj: Order_Base,
|
||||
order_obj: Order_DB_Base,
|
||||
x_account_id: str = Header(...),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
@@ -30,18 +32,19 @@ async def post_order_obj(
|
||||
log.debug(locals())
|
||||
|
||||
obj_type = 'order'
|
||||
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
|
||||
order_obj = order_obj.dict(by_alias=False, exclude_unset=False)
|
||||
result = post_obj_template(
|
||||
obj_type=obj_type,
|
||||
data=obj_data_dict,
|
||||
return_obj=True,
|
||||
by_alias=True,
|
||||
exclude_unset=True,
|
||||
obj_type = obj_type,
|
||||
data = order_obj,
|
||||
return_obj = True,
|
||||
by_alias = True,
|
||||
exclude_unset = True,
|
||||
)
|
||||
return result
|
||||
|
||||
|
||||
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
|
||||
# NOTE 2021-08-09: Use with rework of order_cart
|
||||
@router.patch('/order/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def patch_order_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
obj: Order_Base = None,
|
||||
@@ -68,7 +71,24 @@ async def patch_order_obj(
|
||||
return result
|
||||
|
||||
|
||||
@router.get('/list', response_model=Resp_Body_Base)
|
||||
|
||||
# NOTE 2021-08-09: Use with rework of order_cart
|
||||
# NOTE: The router needs to have the prefix (/order) removed.
|
||||
@router.patch('/order/{order_id}/line/add', response_model=Resp_Body_Base)
|
||||
async def patch_order_obj_line_add(
|
||||
order_id: str = Query(..., min_length=1, max_length=22),
|
||||
obj: Order_Base = None,
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
|
||||
|
||||
@router.get('/order/list', response_model=Resp_Body_Base)
|
||||
async def get_order_obj_li(
|
||||
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),
|
||||
@@ -149,7 +169,7 @@ async def get_order_obj_li(
|
||||
order_obj_li = []
|
||||
for order_obj in order_obj_li_result:
|
||||
order_id = order_obj.get('order_id', None)
|
||||
if order_obj := load_order_obj(order_id=order_id, inc_order_line_list=inc_order_line_list, inc_order_cfg=inc_order_cfg, inc_person_obj=inc_person_obj, inc_user_obj=inc_user_obj):
|
||||
if order_obj := load_order_obj(order_id=order_id, inc_order_line_list=inc_order_line_list, inc_order_cfg=inc_order_cfg, inc_person_obj=inc_person_obj):
|
||||
data = order_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
|
||||
order_obj_li.append(data)
|
||||
return mk_resp(data=order_obj_li)
|
||||
@@ -159,14 +179,16 @@ async def get_order_obj_li(
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Routes ### get_order_obj() ###
|
||||
# NOTE 2021-08-09: Use with rework of order_cart
|
||||
# Updated 2021-08-07
|
||||
@router.get('/{order_id}', response_model=Resp_Body_Base)
|
||||
@router.get('/order/{order_id}', response_model=Resp_Body_Base)
|
||||
async def get_order_obj(
|
||||
order_id: str = Query(..., min_length=11, max_length=22),
|
||||
limit: int = 500,
|
||||
enabled: str = 'enabled',
|
||||
inc_order_line_list: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
inc_person: bool = False,
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
@@ -183,6 +205,7 @@ async def get_order_obj(
|
||||
# model_as_dict = model_as_dict,
|
||||
inc_order_line_list = inc_order_line_list,
|
||||
inc_order_cfg = inc_order_cfg,
|
||||
inc_person = inc_person,
|
||||
):
|
||||
log.debug(order_obj)
|
||||
data = order_obj.dict(by_alias=by_alias, exclude_unset=False) # NOTE NOTE NOTE NOTE exclude_unset is forced to False for now. Will return more fields than is ideal. Need to create another Order_Line_Base. Probably Order_Line_OUT_Base
|
||||
@@ -192,7 +215,24 @@ async def get_order_obj(
|
||||
# ### END ### API Order Routes ### get_order_obj() ###
|
||||
|
||||
|
||||
@router.delete('/{obj_id}', response_model=Resp_Body_Base)
|
||||
# NOTE 2021-08-09: Use with rework of order_cart
|
||||
@router.get('/person/{person_id}/order/open', response_model=Resp_Body_Base)
|
||||
async def get_person_id_order_open_obj(
|
||||
person_id: str = Query(..., min_length=11, max_length=22),
|
||||
enabled: str = 'enabled',
|
||||
inc_order_line_list: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
x_account_id: str = Header(...),
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
return False
|
||||
|
||||
|
||||
@router.delete('/order/{obj_id}', response_model=Resp_Body_Base)
|
||||
async def delete_order_obj(
|
||||
obj_id: str = Query(..., min_length=1, max_length=22),
|
||||
x_account_id: str = Header(...),
|
||||
@@ -205,4 +245,19 @@ async def delete_order_obj(
|
||||
obj_type=obj_type,
|
||||
obj_id=obj_id,
|
||||
)
|
||||
return result
|
||||
return result
|
||||
|
||||
|
||||
# NOTE 2021-08-09: Use with rework of order_cart
|
||||
# NOTE: The router needs to have the prefix (/order) removed.
|
||||
@router.delete('/order/{order_id}/line/<order_line_id>/remove', response_model=Resp_Body_Base)
|
||||
async def delete_order_line_obj_NOT_SURE(
|
||||
order_id: str = Query(..., min_length=1, max_length=22),
|
||||
obj: Order_Base = None,
|
||||
x_account_id: Optional[str] = Header(..., ),
|
||||
return_obj: Optional[bool] = True,
|
||||
by_alias: Optional[bool] = True,
|
||||
exclude_unset: Optional[bool] = True,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
Reference in New Issue
Block a user