A lot of unplanned clean up and created some new/missing methods and routes. Mainly working on order and order_cart related stuff.

This commit is contained in:
Scott Idem
2021-08-07 18:15:59 -04:00
parent 9915c7d9ed
commit 106a186ea6
12 changed files with 565 additions and 278 deletions

View File

@@ -7,7 +7,11 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
from app.lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
from app.methods.order_cart_line_methods import get_order_cart_line_rec_list, load_order_cart_line_obj
from app.methods.order_cfg_methods import load_order_cfg_obj
from app.models.order_cart_models import Order_Cart_Base
from app.models.order_cart_line_models import Order_Cart_Line_Base
def update_order_cart_obj(
@@ -122,9 +126,14 @@ def update_order_cart_obj(
# ### BEGIN ### API Order Cart Methods ### load_order_cart_obj() ###
# Update 2021-08-02 (partially)
# Updated 2021-08-07
def load_order_cart_obj(
order_cart_id: int|str,
limit: int = 1000,
by_alias: bool = True,
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_order_cart_line_list: bool = False,
inc_order_cfg: bool = False,
) -> Order_Cart_Base|dict|bool:
@@ -134,37 +143,106 @@ def load_order_cart_obj(
if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id, table_name='order_cart'): pass
else: return False
if order_cart_rec := sql_select(table_name='v_order_cart', record_id=order_cart_id):
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_rec)
if order_cart_rec := sql_select(table_name='v_order_cart', record_id=order_cart_id): pass
else: return False
if inc_order_cart_line_list:
order_cart_line_data = {}
order_cart_line_data['order_cart_id'] = order_cart_id
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
else: order_cart_rec['order_cart_line_list'] = []
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)
else:
return False
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_rec)
try:
order_cart_obj = Order_Cart_Base(**order_cart_rec)
log.debug(order_cart_obj)
except ValidationError as e:
log.error(e.json())
return False
return order_cart_obj
# Updated 2021-08-07
if inc_order_cart_line_list:
if order_cart_line_rec_list_result := get_order_cart_line_rec_list(
for_obj_type = 'order_cart',
for_obj_id = order_cart_id,
limit = limit,
):
order_cart_line_result_list = []
for order_cart_line_rec in order_cart_line_rec_list_result:
order_cart_line_result_list.append(
load_order_cart_line_obj(
order_cart_line_id = order_cart_line_rec.get('order_cart_line_id', None),
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
)
)
order_cart_obj.order_cart_line_list = order_cart_line_result_list
else: order_cart_obj.order_cart_line_list = []
if inc_order_cfg:
if order_cfg_result := load_order_cfg_obj(
account_id = order_cart_rec.get('account_id', None),
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
):
order_cart_obj.cfg = order_cfg_result
else: order_cart_obj.cfg = None
if model_as_dict:
return order_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
else:
return order_obj
# ### END ### API Order Cart Methods ### load_order_cart_obj() ###
# ### BEGIN ### API Order Cart Methods ### get_order_cart_rec_list() ###
# Updated 2021-08-07
def get_order_cart_rec_list(
for_obj_type: str,
for_obj_id: str,
limit: int = 1000,
enabled: str = 'enabled', # enabled, disabled, all
from_datetime: datetime.datetime = None,
to_datetime: datetime.datetime = None,
# status: str = 'complete', # started, in progress, complete, all
balance_gt: int = 0, # $0 to $99999
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
else: return False
data = {}
data[f'{for_obj_type}_id'] = for_obj_id
# data['for_obj_type'] = for_obj_type
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
sql = f"""
SELECT `tbl`.id AS 'order_cart_id', `tbl`.id_random AS 'order_cart_id_random'
FROM `order` AS `tbl`
WHERE
{sql_obj_type_id}
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
{sql_limit};
"""
if order_cart_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
order_cart_rec_li = order_cart_rec_li_result
else:
order_cart_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_rec_li_result)
return order_cart_rec_li
# ### END ### API Order Cart Methods ### get_order_cart_rec_list() ###
# IS THIS STILL NEEDED?
# ### BEGIN ### API Order Cart Model ### save_order_cart_obj() ###