A lot of code clean up
This commit is contained in:
Scott Idem
@@ -8,7 +8,7 @@ from app.db_sql import redis_lookup_id_random, sql_delete, sql_enable_part, sql_
|
||||
from app.lib_general import log, logging, logger_reset
|
||||
|
||||
from app.methods.order_cfg_methods import load_order_cfg_obj
|
||||
from app.methods.order_line_methods import get_order_line_rec_list, load_order_line_obj
|
||||
from app.methods.order_line_methods import create_order_obj_line, get_order_line_rec_list, load_order_obj_line, update_order_obj_line
|
||||
# from app.methods.person_methods import load_person_obj
|
||||
# from app.methods.user_methods import load_user_obj
|
||||
|
||||
@@ -18,6 +18,268 @@ from app.models.order_line_models import Order_Line_Base, Order_Line_DB_Base # T
|
||||
# from app.models.user_models import User_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### create_order_obj() ###
|
||||
# Updated 2022-01-18
|
||||
def create_order_obj(
|
||||
account_id: int,
|
||||
order_dict_obj: Order_Base,
|
||||
person_id: int|None = None,
|
||||
) -> int|bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
# ### SECTION ### Secondary data validation
|
||||
log.info('Create dictionary or Pydantic object')
|
||||
log.debug(type(order_dict_obj))
|
||||
if isinstance(order_dict_obj, dict):
|
||||
order_dict = order_dict_obj
|
||||
try:
|
||||
order_obj = Order_Base(**order_dict)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
else:
|
||||
order_obj = order_dict_obj
|
||||
# order_obj.account_id = account_id
|
||||
|
||||
order_dict = order_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'cfg', 'person', 'user', 'created_on', 'updated_on'})
|
||||
log.debug(order_obj)
|
||||
|
||||
# ### SECTION ### Process data
|
||||
# Look for an account_id in the order_obj
|
||||
# if account_id: pass
|
||||
# elif account_id := order_obj.account_id: pass
|
||||
|
||||
order_obj.account_id = account_id # Is this needed?
|
||||
order_dict['account_id'] = account_id
|
||||
|
||||
# Look for a person_id in the contact_obj
|
||||
if person_id:
|
||||
order_obj.person_id = person_id # Is this needed?
|
||||
order_dict['person_id'] = person_id
|
||||
elif person_id := order_obj.person.id: pass
|
||||
|
||||
if order_dict_in_result := sql_insert(
|
||||
data = order_dict,
|
||||
table_name = 'order',
|
||||
rm_id_random = True,
|
||||
id_random_length = default_num_bytes
|
||||
): pass
|
||||
else:
|
||||
log.warning(f'Order not created.')
|
||||
log.debug(order_dict_in_result)
|
||||
return False
|
||||
|
||||
log.debug(order_dict_in_result)
|
||||
order_id = order_dict_in_result
|
||||
|
||||
if order_obj.order_line_list:
|
||||
log.info('Looping through Order Line list')
|
||||
for order_line in order_obj.order_line_list:
|
||||
if order_line.id:
|
||||
log.info('Updating Order Line')
|
||||
if update_order_obj_result := update_order_obj_line(
|
||||
order_line_id = order_line_id,
|
||||
order_line_dict_obj = order_line,
|
||||
): pass
|
||||
else: return False
|
||||
else:
|
||||
log.info('Creating Order Line')
|
||||
if create_order_obj_line_result := create_order_obj_line(
|
||||
order_id = order_id,
|
||||
order_line_dict_obj = order_line,
|
||||
): pass
|
||||
else: pass
|
||||
|
||||
log.info(f'Returning the Order ID: {order_id}')
|
||||
|
||||
return order_id
|
||||
# ### END ### API Order Methods ### create_order_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### update_order_obj() ###
|
||||
# Updated 2022-01-18
|
||||
def update_order_obj(
|
||||
order_id: int,
|
||||
order_dict_obj: Order_Base,
|
||||
person_id: int|None = None,
|
||||
) -> int|bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
# ### SECTION ### Secondary data validation
|
||||
log.info('Create dictionary or Pydantic object')
|
||||
log.debug(type(order_dict_obj))
|
||||
if isinstance(order_dict_obj, dict):
|
||||
order_dict = order_dict_obj
|
||||
try:
|
||||
order_obj = Order_Base(**order_dict)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
else:
|
||||
order_obj = order_dict_obj
|
||||
# order_obj.account_id = account_id
|
||||
|
||||
order_dict = order_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'cfg', 'person', 'user', 'created_on', 'updated_on'})
|
||||
log.debug(order_obj)
|
||||
|
||||
# ### SECTION ### Process data
|
||||
order_obj.id = order_id # Is this needed?
|
||||
order_dict['id'] = order_id
|
||||
|
||||
# Look for a person_id in the order_obj
|
||||
if person_id:
|
||||
order_obj.person_id = person_id # Is this needed?
|
||||
order_dict['person_id'] = person_id
|
||||
elif person_id := order_obj.person.id: pass
|
||||
|
||||
if order_dict_up_result := sql_update(
|
||||
data = order_dict,
|
||||
table_name = 'order',
|
||||
rm_id_random = True,
|
||||
): pass
|
||||
else:
|
||||
log.warning(f'Person not updated.')
|
||||
log.debug(order_dict_up_result)
|
||||
return False
|
||||
|
||||
log.debug(order_dict_up_result)
|
||||
|
||||
if order_obj.order_line_list:
|
||||
log.info('Looping through Order Line list')
|
||||
for order_line in order_obj.order_line_list:
|
||||
if order_line.id:
|
||||
log.info('Updating Order Line')
|
||||
if update_order_obj_result := update_order_obj_line(
|
||||
order_line_id = order_line_id,
|
||||
order_line_dict_obj = order_line,
|
||||
): pass
|
||||
else: return False
|
||||
else:
|
||||
log.info('Creating Order Line')
|
||||
if create_order_obj_line_result := create_order_obj_line(
|
||||
order_id = order_id,
|
||||
order_line_dict_obj = order_line,
|
||||
): pass
|
||||
else: pass
|
||||
|
||||
return True
|
||||
# ### END ### API Order Methods ### update_order_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### load_order_obj() ###
|
||||
# Updated 2021-11-19
|
||||
# @logger_reset
|
||||
def load_order_obj(
|
||||
order_id: int|str,
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
inc_order_line_list: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_user: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
limit: int = 500,
|
||||
offset: int = 0,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
) -> None|bool|dict|list:
|
||||
log.setLevel(logging.WARNING) # 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
|
||||
else: return False # None, false bool
|
||||
|
||||
if order_rec := sql_select(table_name='v_order', record_id=order_id): pass
|
||||
else: return order_rec # None, empty dict, empty list, false bool
|
||||
log.debug(order_rec)
|
||||
|
||||
try:
|
||||
order_obj = Order_Base(**order_rec)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
log.debug(order_obj)
|
||||
|
||||
# Updated 2022-01-18
|
||||
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'),
|
||||
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-18
|
||||
if inc_order_line_list:
|
||||
if order_line_rec_list_result := get_order_line_rec_list(
|
||||
for_obj_type = 'order',
|
||||
for_obj_id = order_id,
|
||||
limit = limit,
|
||||
):
|
||||
order_line_result_list = []
|
||||
for order_line_rec in order_line_rec_list_result:
|
||||
order_line_result_list.append(
|
||||
load_order_obj_line(
|
||||
order_line_id = order_line_rec.get('order_line_id'),
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
)
|
||||
)
|
||||
order_obj.order_line_list = order_line_result_list
|
||||
else: order_obj.order_line_list = [] # None
|
||||
|
||||
# Updated 2022-01-18
|
||||
if inc_person:
|
||||
from app.methods.person_methods import load_person_obj
|
||||
if person_result := load_person_obj(
|
||||
person_id = order_rec.get('person_id'),
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_user = inc_user, # NOTE:
|
||||
enabled = enabled,
|
||||
limit = limit,
|
||||
offset = offset,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
order_obj.person = person_result
|
||||
else: order_obj.person = {} # None
|
||||
pass
|
||||
|
||||
# Updated 2021-06-22
|
||||
# NOTE: Phasing out! Use *inc_user* under load_person_obj() instead.
|
||||
# if inc_user:
|
||||
# log.warning(f'This is being deprecated? load_order_obj() inc_user')
|
||||
# from app.methods.user_methods import load_user_obj
|
||||
# if user_result := load_user_obj(
|
||||
# user_id = order_rec.get('user_id', None),
|
||||
# limit = limit,
|
||||
# by_alias = by_alias,
|
||||
# exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
# enabled = enabled,
|
||||
# ):
|
||||
# order_obj.user = user_result
|
||||
# else: order_obj.user = None
|
||||
# pass
|
||||
|
||||
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 Methods ### load_order_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### save_order_obj() ###
|
||||
# @logger_reset
|
||||
def save_order_obj(order_obj_new:Order_Base, repl_order_line_li:bool=False):
|
||||
@@ -173,116 +435,7 @@ def save_order_obj(order_obj_new:Order_Base, repl_order_line_li:bool=False):
|
||||
# ### END ### API Order Methods ### save_order_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### load_order_obj() ###
|
||||
# Updated 2021-11-19
|
||||
# @logger_reset
|
||||
def load_order_obj(
|
||||
order_id: int|str,
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
inc_order_line_list: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_user: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
limit: int = 500,
|
||||
offset: int = 0,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
) -> None|bool|dict|list:
|
||||
log.setLevel(logging.WARNING) # 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
|
||||
else: return False # None, false bool
|
||||
|
||||
if order_rec := sql_select(table_name='v_order', record_id=order_id): pass
|
||||
else: return order_rec # None, empty dict, empty list, false bool
|
||||
log.debug(order_rec)
|
||||
|
||||
try:
|
||||
order_obj = Order_Base(**order_rec)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
log.debug(order_obj)
|
||||
|
||||
# Updated 2022-01-18
|
||||
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'),
|
||||
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-18
|
||||
if inc_order_line_list:
|
||||
if order_line_rec_list_result := get_order_line_rec_list(
|
||||
for_obj_type = 'order',
|
||||
for_obj_id = order_id,
|
||||
limit = limit,
|
||||
):
|
||||
order_line_result_list = []
|
||||
for order_line_rec in order_line_rec_list_result:
|
||||
order_line_result_list.append(
|
||||
load_order_line_obj(
|
||||
order_line_id = order_line_rec.get('order_line_id'),
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
)
|
||||
)
|
||||
order_obj.order_line_list = order_line_result_list
|
||||
else: order_obj.order_line_list = [] # None
|
||||
|
||||
# Updated 2022-01-18
|
||||
if inc_person:
|
||||
from app.methods.person_methods import load_person_obj
|
||||
if person_result := load_person_obj(
|
||||
person_id = order_rec.get('person_id'),
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_user = inc_user, # NOTE:
|
||||
enabled = enabled,
|
||||
limit = limit,
|
||||
offset = offset,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
order_obj.person = person_result
|
||||
else: order_obj.person = {} # None
|
||||
pass
|
||||
|
||||
# Updated 2021-06-22
|
||||
# NOTE: Phasing out! Use *inc_user* under load_person_obj() instead.
|
||||
# if inc_user:
|
||||
# log.warning(f'This is being deprecated? load_order_obj() inc_user')
|
||||
# from app.methods.user_methods import load_user_obj
|
||||
# if user_result := load_user_obj(
|
||||
# user_id = order_rec.get('user_id', None),
|
||||
# limit = limit,
|
||||
# by_alias = by_alias,
|
||||
# exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
# enabled = enabled,
|
||||
# ):
|
||||
# order_obj.user = user_result
|
||||
# else: order_obj.user = None
|
||||
# pass
|
||||
|
||||
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 Methods ### load_order_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Methods ### get_order_rec_list() ###
|
||||
|
||||
Reference in New Issue
Block a user