From 17cb6786f85951f58d734b91b0cf739d7a100bac Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Fri, 6 Aug 2021 18:53:24 -0400 Subject: [PATCH] Working on orders and order carts --- app/methods/order_cart_methods.py | 16 ++++++++-------- app/models/order_cart_models.py | 15 ++++++++------- app/routers/order_cart.py | 14 +++++++------- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/app/methods/order_cart_methods.py b/app/methods/order_cart_methods.py index a2ed4d5..8625d73 100644 --- a/app/methods/order_cart_methods.py +++ b/app/methods/order_cart_methods.py @@ -126,7 +126,7 @@ def update_order_cart_obj( def load_order_cart_obj( order_cart_id: int|str, inc_order_cart_line_list: bool = False, - inc_order_cart_cfg: bool = False, + inc_order_cfg: bool = False, ) -> Order_Cart_Base|dict|bool: log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -145,9 +145,9 @@ def load_order_cart_obj( order_cart_rec['order_cart_line_list'] = order_cart_line_rec_li else: order_cart_rec['order_cart_line_list'] = [] - if inc_order_cart_cfg: - if order_cart_cfg_rec := sql_select(table_name='v_account_cfg_detail', field_name='account_id', field_value=order_cart_rec.get('account_id', None)): - order_cart_rec['cfg'] = order_cart_cfg_rec + if inc_order_cfg: + if order_cfg_rec := sql_select(table_name='v_account_cfg_detail', field_name='account_id', field_value=order_cart_rec.get('account_id', None)): + order_cart_rec['cfg'] = order_cfg_rec else: order_cart_rec['cfg'] = None log.debug(order_cart_rec) @@ -273,7 +273,7 @@ def old_save_order_cart_obj(order_cart_obj_new=None): # IS THIS STILL NEEDED? # ### BEGIN ### API Order Cart Model ### get_order_cart_obj() ### -def old_get_order_cart_obj(order_cart_id=None, inc_order_cart_line_list=None, inc_order_cart_cfg=None): +def old_get_order_cart_obj(order_cart_id=None, inc_order_cart_line_list=None, inc_order_cfg=None): log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -291,9 +291,9 @@ def old_get_order_cart_obj(order_cart_id=None, inc_order_cart_line_list=None, in if order_cart_line_rec_li := sql_select(table_name='v_order_cart_line', data=order_cart_line_data, as_list=True): order_cart_rec['order_cart_line_list'] = order_cart_line_rec_li - if inc_order_cart_cfg: - if order_cart_cfg_rec := sql_select(table_name='v_account_cfg_detail', field_name='account_id', field_value=order_cart_rec.get('account_id', None)): - order_cart_rec['cfg'] = order_cart_cfg_rec + if inc_order_cfg: + if order_cfg_rec := sql_select(table_name='v_account_cfg_detail', field_name='account_id', field_value=order_cart_rec.get('account_id', None)): + order_cart_rec['cfg'] = order_cfg_rec log.debug(order_cart_rec) else: diff --git a/app/models/order_cart_models.py b/app/models/order_cart_models.py index 12eeb99..1d977ee 100644 --- a/app/models/order_cart_models.py +++ b/app/models/order_cart_models.py @@ -8,16 +8,17 @@ from app.db_sql import redis_lookup_id_random from app.lib_general import * from .common_field_schema import base_fields, default_num_bytes +from .order_models import Order_Cfg_Base -class Order_Cart_Cfg_Base(BaseModel): - log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(locals()) +# class Order_Cfg_Base(BaseModel): +# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL +# log.debug(locals()) - account_name: Optional[str] +# account_name: Optional[str] - show_cart: Optional[bool] - cart_label: Optional[str] +# show_cart: Optional[bool] +# cart_label: Optional[str] class Order_Cart_Line_Base(BaseModel): @@ -230,7 +231,7 @@ class Order_Cart_Base(BaseModel): # Including other related objects order_cart_line_list: Optional[list[Order_Cart_Line_Base]] # Order_Line_Base() # List[Order_Cart_Line_Base] = [] - cfg: Optional[Order_Cart_Cfg_Base] = Order_Cart_Cfg_Base() # Should this be renamed to order_cart_cfg? + cfg: Optional[Order_Cfg_Base] = Order_Cfg_Base() # Should this be renamed to order_cfg? _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) diff --git a/app/routers/order_cart.py b/app/routers/order_cart.py index 15459ac..ded5113 100644 --- a/app/routers/order_cart.py +++ b/app/routers/order_cart.py @@ -53,7 +53,7 @@ async def patch_order_cart_obj( x_account_id: Optional[str] = Header(..., ), return_obj: Optional[bool] = True, inc_order_cart_line_list: Optional[bool] = True, - inc_order_cart_cfg: Optional[bool] = True, + inc_order_cfg: Optional[bool] = True, by_alias: Optional[bool] = True, exclude_unset: Optional[bool] = True, ): @@ -80,7 +80,7 @@ async def patch_order_cart_obj( if order_cart_obj := load_order_cart_obj( order_cart_id = order_cart_id, inc_order_cart_line_list = inc_order_cart_line_list, - inc_order_cart_cfg = inc_order_cart_cfg + inc_order_cfg = inc_order_cfg ): data = order_cart_obj.dict(by_alias=True, exclude_unset=False) return mk_resp(data=data) @@ -119,7 +119,7 @@ async def lookup_order_cart_obj( for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), for_obj_id: Optional[Union[int,str]] = None, inc_order_cart_line_list: Optional[bool] = True, - inc_order_cart_cfg: Optional[bool] = True, + inc_order_cfg: Optional[bool] = True, x_account_id: str = Header(...), by_alias: Optional[bool] = True, exclude_unset: Optional[bool] = True, @@ -173,7 +173,7 @@ async def lookup_order_cart_obj( if order_cart_obj := load_order_cart_obj( order_cart_id = order_cart_id, inc_order_cart_line_list = inc_order_cart_line_list, - inc_order_cart_cfg = inc_order_cart_cfg, + inc_order_cfg = inc_order_cfg, ): data = order_cart_obj.dict(by_alias=True, exclude_unset=False) return mk_resp(data=data) @@ -187,7 +187,7 @@ async def lookup_order_cart_obj( load_order_cart_obj( order_cart_id = order_cart_id, inc_order_cart_line_list = inc_order_cart_line_list, - inc_order_cart_cfg = inc_order_cart_cfg, + inc_order_cfg = inc_order_cfg, ) ) data = order_cart_obj_li @@ -202,7 +202,7 @@ async def lookup_order_cart_obj( async def get_order_cart_obj( order_cart_id: str = Query(..., min_length=1, max_length=22), inc_order_cart_line_list: bool = False, - inc_order_cart_cfg: bool = False, + inc_order_cfg: bool = False, x_account_id: str = Header(...), by_alias: bool = True, exclude_unset: bool = True, @@ -213,7 +213,7 @@ async def get_order_cart_obj( if order_cart_obj := load_order_cart_obj( order_cart_id = order_cart_id, inc_order_cart_line_list = inc_order_cart_line_list, - inc_order_cart_cfg = inc_order_cart_cfg, + inc_order_cfg = inc_order_cfg, ): data = order_cart_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) return mk_resp(data=data)