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
185
app/methods/order_cart_line_methods.py
Normal file
185
app/methods/order_cart_line_methods.py
Normal file
@@ -0,0 +1,185 @@
|
||||
from __future__ import annotations
|
||||
import datetime
|
||||
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.lib_general import log, logging
|
||||
|
||||
|
||||
from app.models.order_cart_line_models import Order_Cart_Line_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Cart Line Methods ### create_order_cart_line_obj() ###
|
||||
def create_order_cart_line_obj(order_cart_line_obj_new:Order_Cart_Line_Base):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if not order_cart_line_obj_new:
|
||||
return False
|
||||
|
||||
order_cart_line_obj_data = order_cart_line_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'user', 'created_on', 'updated_on'})
|
||||
|
||||
if order_cart_line_obj_in_result := sql_insert(data=order_cart_line_obj_data, table_name='order_cart_line', rm_id_random=True, id_random_length=8): pass
|
||||
else:
|
||||
return False
|
||||
|
||||
log.debug(order_cart_line_obj_in_result)
|
||||
|
||||
order_cart_line_id = order_cart_line_obj_in_result
|
||||
|
||||
log.debug(f'Returning the new order_cart_line_id: {order_cart_line_id}')
|
||||
return order_cart_line_id
|
||||
# ### END ### API Order Cart Line Methods ### create_order_cart_line_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Cart Line Methods ### load_order_cart_line_obj() ###
|
||||
def load_order_cart_line_obj(
|
||||
order_cart_line_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
) -> Order_Cart_Line_Base|dict|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if order_cart_line_id := redis_lookup_id_random(record_id_random=order_cart_line_id, table_name='order_cart_line'): pass
|
||||
else: return False
|
||||
|
||||
if order_cart_line_rec := sql_select(table_name='v_order_cart_line', record_id=order_cart_line_id): pass
|
||||
else: return False
|
||||
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(order_cart_line_rec)
|
||||
|
||||
try:
|
||||
order_cart_line_obj = Order_Cart_Line_Base(**order_cart_line_rec)
|
||||
log.debug(order_cart_line_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
|
||||
if model_as_dict:
|
||||
return order_cart_line_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return order_cart_line_obj
|
||||
# ### END ### API Order Cart Line Methods ### load_order_cart_line_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Cart Line Methods ### update_order_cart_line_obj() ###
|
||||
def update_order_cart_line_obj(
|
||||
order_cart_line_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
order_cart_line_obj_up: Order_Cart_Line_Base,
|
||||
create_missing_obj: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if order_cart_line_id := redis_lookup_id_random(record_id_random=order_cart_line_id, table_name='order_cart_line'): pass
|
||||
else: return False
|
||||
|
||||
order_cart_line_obj_up.id = order_cart_line_id
|
||||
|
||||
log.debug(order_cart_line_obj_up)
|
||||
# log.debug(order_cart_line_obj_up.dict(by_alias=True, exclude_unset=True))
|
||||
log.debug(order_cart_line_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(order_cart_line_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
#order_cart_line_dict_up = order_cart_line_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
|
||||
# if order_cart_line_obj_up.person_id and order_cart_line_obj_up.person:
|
||||
# person_id = order_cart_line_obj_up.person_id
|
||||
# person_obj_up = order_cart_line_obj_up.person
|
||||
# log.debug(person_id)
|
||||
# log.debug(person_obj_up)
|
||||
# if person_obj_up_result := update_person_obj(
|
||||
# person_id=person_id,
|
||||
# person_obj_up=person_obj_up,
|
||||
# create_missing_obj=create_missing_obj,
|
||||
# ):
|
||||
# log.debug(person_obj_up_result)
|
||||
# else:
|
||||
# log.debug(person_obj_up_result)
|
||||
# return False
|
||||
|
||||
# if order_cart_line_obj_up.user_id and order_cart_line_obj_up.user:
|
||||
# user_id = order_cart_line_obj_up.user_id
|
||||
# user_obj_up = order_cart_line_obj_up.user
|
||||
# log.debug(user_id)
|
||||
# log.debug(user_obj_up)
|
||||
# if user_obj_up_result := update_user_obj(
|
||||
# user_id=user_id,
|
||||
# user_obj_up=user_obj_up,
|
||||
# create_missing_obj=create_missing_obj,
|
||||
# ):
|
||||
# log.debug(user_obj_up_result)
|
||||
# else:
|
||||
# log.debug(user_obj_up_result)
|
||||
# return False
|
||||
|
||||
order_cart_line_dict_up = order_cart_line_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'user'})
|
||||
log.debug(order_cart_line_dict_up)
|
||||
|
||||
if order_cart_line_obj_up_result := sql_update(data=order_cart_line_dict_up, table_name='order_cart_line', rm_id_random=True):
|
||||
log.debug(order_cart_line_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.debug(order_cart_line_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Order Cart Line Methods ### update_order_cart_line_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Cart Line Methods ### get_order_cart_line_rec_list() ###
|
||||
def get_order_cart_line_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
) -> 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 enabled in ['enabled', 'disabled', 'all']:
|
||||
# if enabled == 'enabled':
|
||||
# data['enable'] = True
|
||||
# sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
# elif enabled == 'disabled':
|
||||
# data['enable'] = False
|
||||
# sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
# elif enabled == 'all':
|
||||
# sql_enabled = ''
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'order_cart_line_id', `tbl`.id_random AS 'order_cart_line_id_random'
|
||||
FROM `order_cart_line` AS `tbl`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
if order_cart_line_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
order_cart_line_rec_li = order_cart_line_rec_li_result
|
||||
else:
|
||||
order_cart_line_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(order_cart_line_rec_li_result)
|
||||
|
||||
return order_cart_line_rec_li
|
||||
# ### END ### API Order Cart Line Methods ### get_order_cart_line_rec_list() ###
|
||||
@@ -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() ###
|
||||
|
||||
@@ -15,9 +15,9 @@ def load_order_cfg_obj(
|
||||
account_id: int|str,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
model_as_dict: bool = True,
|
||||
) -> Order_Cfg_Base|dict|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.setLevel(logging.DEBUG) # 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
|
||||
@@ -29,16 +29,20 @@ def load_order_cfg_obj(
|
||||
field_value = account_id,
|
||||
): pass
|
||||
else: return False
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(order_cfg_rec)
|
||||
|
||||
try:
|
||||
order_cfg_obj = Order_Cfg_Base(**order_cfg_rec)
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(order_cfg_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
if model_as_dict:
|
||||
log.debug('**** HERE dict ****')
|
||||
return order_cfg_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
log.debug('**** HERE obj ****')
|
||||
return order_cfg_obj
|
||||
# ### END ### API Order Cfg Methods ### load_order_cfg_obj() ###
|
||||
|
||||
@@ -170,12 +170,12 @@ def load_order_obj(
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_order_cfg: bool = False,
|
||||
inc_order_line_list: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_user: bool = False,
|
||||
):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if order_id := redis_lookup_id_random(record_id_random=order_id, table_name='order'): pass
|
||||
@@ -193,18 +193,6 @@ def load_order_obj(
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
if inc_order_cfg:
|
||||
if order_cfg_result := load_order_cfg_obj(
|
||||
order_cfg_id = order_rec.get('order_cfg_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
):
|
||||
order_obj.order_cfg = order_cfg_result
|
||||
else: order_obj.order_cfg = None
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_order_line_list:
|
||||
if order_line_rec_list_result := get_order_line_rec_list(
|
||||
@@ -226,12 +214,19 @@ def load_order_obj(
|
||||
order_obj.order_line_list = order_line_result_list
|
||||
else: order_obj.order_line_list = []
|
||||
|
||||
# if inc_order_line_list:
|
||||
# order_line_data = {}
|
||||
# order_line_data['order_id'] = order_id
|
||||
# if order_line_rec_li := sql_select(table_name='v_order_line', data=order_line_data, as_list=True):#, field_name='order_id', field_value=order_id):
|
||||
# log.debug(order_line_rec_li)
|
||||
# order_rec['order_line_li'] = order_line_rec_li
|
||||
# Updated 2021-08-07
|
||||
if inc_order_cfg:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
if order_cfg_result := load_order_cfg_obj(
|
||||
account_id = order_rec.get('account_id', None),
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = True,
|
||||
):
|
||||
order_obj.cfg = order_cfg_result
|
||||
else: order_obj.cfg = None
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(order_cfg_result)
|
||||
|
||||
# Updated 2021-06-22
|
||||
if inc_person:
|
||||
|
||||
Reference in New Issue
Block a user