A lot of code clean up
This commit is contained in:
Scott Idem
@@ -11,34 +11,194 @@ from app.lib_general import log, logging, logger_reset
|
||||
from app.models.order_line_models import Order_Line_Base, Order_Line_Full_Detail_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### create_order_line_obj() ###
|
||||
@logger_reset
|
||||
def create_order_line_obj(order_line_obj_new:Order_Line_Base):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# ### BEGIN ### API Order Line Methods ### create_order_obj_line() ###
|
||||
# Updated 2022-01-18
|
||||
def create_order_obj_line(
|
||||
order_id: int,
|
||||
order_line_dict_obj: Order_Line_Base,
|
||||
) -> int|bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if not order_line_obj_new:
|
||||
return False
|
||||
|
||||
order_line_obj_data = order_line_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'user', 'created_on', 'updated_on'})
|
||||
|
||||
if order_line_obj_in_result := sql_insert(data=order_line_obj_data, table_name='order_line', rm_id_random=True, id_random_length=8): pass
|
||||
# ### SECTION ### Secondary data validation
|
||||
log.info('Create dictionary or Pydantic object')
|
||||
log.debug(type(order_line_dict_obj))
|
||||
if isinstance(order_line_dict_obj, dict):
|
||||
order_line_dict = order_line_dict_obj
|
||||
try:
|
||||
order_obj = Order_Line_Base(**order_line_dict)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
else:
|
||||
order_obj = order_line_dict_obj
|
||||
# order_obj.order_id = order_id
|
||||
|
||||
order_line_dict = order_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'product', 'created_on', 'updated_on'})
|
||||
log.debug(order_obj)
|
||||
|
||||
# ### SECTION ### Process data
|
||||
order_obj.order_id = order_id # Is this needed?
|
||||
order_line_dict['order_id'] = order_id
|
||||
|
||||
if order_line_dict_in_result := sql_insert(
|
||||
data = order_line_dict,
|
||||
table_name = 'order_line',
|
||||
rm_id_random = True,
|
||||
id_random_length = default_num_bytes
|
||||
): pass
|
||||
else:
|
||||
log.warning(f'Order Line not created.')
|
||||
log.debug(order_line_dict_in_result)
|
||||
return False
|
||||
|
||||
log.debug(order_line_obj_in_result)
|
||||
log.debug(order_line_dict_in_result)
|
||||
order_line_id = order_line_dict_in_result
|
||||
|
||||
order_line_id = order_line_obj_in_result
|
||||
log.info(f'Returning the Order Line ID: {order_line_id}')
|
||||
|
||||
log.debug(f'Returning the new order_line_id: {order_line_id}')
|
||||
return order_line_id
|
||||
# ### END ### API Order Line Methods ### create_order_line_obj() ###
|
||||
# ### END ### API Order Methods ### create_order_obj_line() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### load_order_line_obj() ###
|
||||
# # ### BEGIN ### API Order Line Methods ### create_order_obj_line() ###
|
||||
# @logger_reset
|
||||
# def create_order_obj_line(order_line_dict_obj:Order_Line_Base):
|
||||
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(locals())
|
||||
|
||||
# if not order_line_dict_obj:
|
||||
# return False
|
||||
|
||||
# order_line_obj_data = order_line_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'user', 'created_on', 'updated_on'})
|
||||
|
||||
# if order_line_obj_in_result := sql_insert(data=order_line_obj_data, table_name='order_line', rm_id_random=True, id_random_length=8): pass
|
||||
# else:
|
||||
# return False
|
||||
|
||||
# log.debug(order_line_obj_in_result)
|
||||
|
||||
# order_line_id = order_line_obj_in_result
|
||||
|
||||
# log.debug(f'Returning the new order_line_id: {order_line_id}')
|
||||
# return order_line_id
|
||||
# # ### END ### API Order Line Methods ### create_order_obj_line() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### update_order_obj_line() ###
|
||||
# Updated 2022-01-18
|
||||
def update_order_obj_line(
|
||||
order_line_id: int,
|
||||
order_line_dict_obj: Order_Line_Base,
|
||||
) -> 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_line_dict_obj))
|
||||
if isinstance(order_line_dict_obj, dict):
|
||||
order_line_dict = order_line_dict_obj
|
||||
try:
|
||||
order_line_obj = Order_Line_Base(**order_line_dict)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
return False
|
||||
else:
|
||||
order_line_obj = order_line_dict_obj
|
||||
# order_line_obj.order_line_id = order_line_id
|
||||
|
||||
order_line_dict = order_line_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'product', 'updated_on', 'updated_on'})
|
||||
log.debug(order_line_obj)
|
||||
|
||||
# ### SECTION ### Process data
|
||||
order_line_obj.order_line_id = order_line_id # Is this needed?
|
||||
order_line_dict['order_line_id'] = order_line_id
|
||||
|
||||
if order_line_dict_up_result := sql_update(
|
||||
data = order_line_dict,
|
||||
table_name = 'order_line',
|
||||
rm_id_random = True,
|
||||
): pass
|
||||
else:
|
||||
log.warning(f'Order Line not updated.')
|
||||
log.debug(order_line_dict_up_result)
|
||||
return False
|
||||
|
||||
log.debug(order_line_dict_up_result)
|
||||
|
||||
return True
|
||||
# ### END ### API Order Methods ### update_order_obj_line() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### update_order_obj_line() ###
|
||||
@logger_reset
|
||||
def update_order_obj_line(
|
||||
order_line_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
order_obj_line_obj_up: Order_Line_Base,
|
||||
create_sub_obj: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if order_line_id := redis_lookup_id_random(record_id_random=order_line_id, table_name='order_line'): pass
|
||||
else: return False
|
||||
|
||||
order_obj_line_obj_up.id = order_line_id
|
||||
|
||||
log.debug(order_obj_line_obj_up)
|
||||
# log.debug(order_obj_line_obj_up.dict(by_alias=True, exclude_unset=True))
|
||||
log.debug(order_obj_line_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(order_obj_line_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
#order_line_dict_up = order_obj_line_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
|
||||
# if order_obj_line_obj_up.person_id and order_obj_line_obj_up.person:
|
||||
# person_id = order_obj_line_obj_up.person_id
|
||||
# person_obj_up = order_obj_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_sub_obj = create_sub_obj,
|
||||
# ):
|
||||
# log.debug(person_obj_up_result)
|
||||
# else:
|
||||
# log.debug(person_obj_up_result)
|
||||
# return False
|
||||
|
||||
# if order_obj_line_obj_up.user_id and order_obj_line_obj_up.user:
|
||||
# user_id = order_obj_line_obj_up.user_id
|
||||
# user_obj_up = order_obj_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_dict_obj = user_obj_up,
|
||||
# create_sub_obj = create_sub_obj,
|
||||
# ):
|
||||
# log.debug(user_obj_up_result)
|
||||
# else:
|
||||
# log.debug(user_obj_up_result)
|
||||
# return False
|
||||
|
||||
order_line_dict_up = order_obj_line_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'user'})
|
||||
log.debug(order_line_dict_up)
|
||||
|
||||
if order_obj_line_obj_up_result := sql_update(data=order_line_dict_up, table_name='order_line', rm_id_random=True):
|
||||
log.debug(order_obj_line_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.debug(order_obj_line_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Order Line Methods ### update_order_obj_line() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### load_order_obj_line() ###
|
||||
# Updated 2021-11-19
|
||||
@logger_reset
|
||||
def load_order_line_obj(
|
||||
def load_order_obj_line(
|
||||
order_line_id: int|str,
|
||||
# limit: int = 500,
|
||||
# offset: int = 0,
|
||||
@@ -67,13 +227,13 @@ def load_order_line_obj(
|
||||
return order_line_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return order_line_obj
|
||||
# ### END ### API Order Line Methods ### load_order_line_obj() ###
|
||||
# ### END ### API Order Line Methods ### load_order_obj_line() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### load_order_line_obj_full_detail() ###
|
||||
# ### BEGIN ### API Order Line Methods ### load_order_obj_line_full_detail() ###
|
||||
# Updated 2021-11-22
|
||||
@logger_reset
|
||||
def load_order_line_obj_full_detail(
|
||||
def load_order_obj_line_full_detail(
|
||||
order_line_rec: dict,
|
||||
# limit: int = 500,
|
||||
# offset: int = 0,
|
||||
@@ -95,71 +255,7 @@ def load_order_line_obj_full_detail(
|
||||
return order_line_obj_full_detail.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return order_line_obj_full_detail
|
||||
# ### END ### API Order Line Methods ### load_order_line_obj_full_detail() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### update_order_line_obj() ###
|
||||
@logger_reset
|
||||
def update_order_line_obj(
|
||||
order_line_id: int|str, # Ideally the int ID should be passed. This allows for updating of the id_random value.
|
||||
order_line_obj_up: Order_Line_Base,
|
||||
create_sub_obj: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if order_line_id := redis_lookup_id_random(record_id_random=order_line_id, table_name='order_line'): pass
|
||||
else: return False
|
||||
|
||||
order_line_obj_up.id = order_line_id
|
||||
|
||||
log.debug(order_line_obj_up)
|
||||
# log.debug(order_line_obj_up.dict(by_alias=True, exclude_unset=True))
|
||||
log.debug(order_line_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(order_line_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
#order_line_dict_up = order_line_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
|
||||
# if order_line_obj_up.person_id and order_line_obj_up.person:
|
||||
# person_id = order_line_obj_up.person_id
|
||||
# person_obj_up = order_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_sub_obj = create_sub_obj,
|
||||
# ):
|
||||
# log.debug(person_obj_up_result)
|
||||
# else:
|
||||
# log.debug(person_obj_up_result)
|
||||
# return False
|
||||
|
||||
# if order_line_obj_up.user_id and order_line_obj_up.user:
|
||||
# user_id = order_line_obj_up.user_id
|
||||
# user_obj_up = order_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_dict_obj = user_obj_up,
|
||||
# create_sub_obj = create_sub_obj,
|
||||
# ):
|
||||
# log.debug(user_obj_up_result)
|
||||
# else:
|
||||
# log.debug(user_obj_up_result)
|
||||
# return False
|
||||
|
||||
order_line_dict_up = order_line_obj_up.dict(by_alias=False, exclude_unset=True, exclude={'user'})
|
||||
log.debug(order_line_dict_up)
|
||||
|
||||
if order_line_obj_up_result := sql_update(data=order_line_dict_up, table_name='order_line', rm_id_random=True):
|
||||
log.debug(order_line_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.debug(order_line_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Order Line Methods ### update_order_line_obj() ###
|
||||
# ### END ### API Order Line Methods ### load_order_obj_line_full_detail() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Order Line Methods ### get_order_line_rec_list() ###
|
||||
|
||||
Reference in New Issue
Block a user