Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Work on order related endpoints.

Browse Source
This commit is contained in:
Scott Idem
2021-11-22 16:41:37 -05:00
parent 841e53628f
commit b6a8e172a4
7 changed files with 312 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

135
app/methods/order_line_methods.py
View File

@@ -8,7 +8,7 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_updat
from app.lib_general import log, logging
from app.models.order_line_models import Order_Line_Base
from app.models.order_line_models import Order_Line_Base, Order_Line_Full_Detail_Base
# ### BEGIN ### API Order Line Methods ### create_order_line_obj() ###
@@ -42,7 +42,7 @@ def load_order_line_obj(
exclude_unset: bool = True, # NOTE: Normally this is True
model_as_dict: bool = False, # NOTE: Normally this is False
) -> Order_Line_Base|dict|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # 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
@@ -68,6 +68,31 @@ def load_order_line_obj(
# ### END ### API Order Line Methods ### load_order_line_obj() ###
# ### BEGIN ### API Order Line Methods ### load_order_line_obj_full_detail() ###
# Updated 2021-11-22
def load_order_line_obj_full_detail(
order_line_rec: dict,
by_alias: bool = True,
exclude_unset: bool = True, # NOTE: Normally this is True
model_as_dict: bool = False, # NOTE: Normally this is False
) -> Order_Line_Full_Detail_Base|dict|bool:
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
try:
order_line_obj_full_detail = Order_Line_Full_Detail_Base(**order_line_rec)
log.debug(order_line_obj_full_detail)
except ValidationError as e:
log.error(e.json())
return False
if model_as_dict:
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() ###
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.
@@ -135,28 +160,73 @@ def update_order_line_obj(
def get_order_line_rec_list(
for_obj_type: str,
for_obj_id: str,
from_datetime: datetime.datetime = None, # For the order, not order_line
to_datetime: datetime.datetime = None, # For the order, not order_line
prod_type = 'all', # all, cont_edu_cert, event, fundraising, membership, etc
status: str = 'closed', # started, in progress, complete, all
full_detail: bool = False,
# enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
) -> list|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 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'
sql_obj_type_id = f'`order_line`.{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 = ''
allowed_prod_type_li = ['cont_edu_cert', 'event', 'fundraising', 'membership', 'other'] # TEMPORARY list...
sql_prod_type = ''
if prod_type in allowed_prod_type_li:
if prod_type == 'closed' or prod_type == 'complete':
data['prod_type'] = ['closed', 'complete']
sql_prod_type = f'AND `order_line`.product_type IN :prod_type'
elif prod_type == 'locked' or prod_type == 'in progress':
data['prod_type'] = ['locked', 'in progress']
sql_prod_type = f'AND `order_line`.product_type IN :prod_type'
else:
data['prod_type'] = prod_type
sql_prod_type = f'AND `order_line`.product_type = :prod_type'
elif prod_type == 'all':
sql_prod_type = f'AND `order_line`.product_type IS NOT NULL'
else:
log.warning('The prod_type value passed is not allowed. Returning None')
return False
allowed_status_li = ['open', 'locked', 'in progress', 'reopened', 'closed', 'complete', 'canceled', 'other'] # TEMPORARY list...
sql_status = ''
if status in allowed_status_li:
if status == 'closed' or status == 'complete':
data['status'] = ['closed', 'complete']
sql_status = f'AND `order_line`.order_status IN :status'
elif status == 'locked' or status == 'in progress':
data['status'] = ['locked', 'in progress']
sql_status = f'AND `order_line`.order_status IN :status'
else:
data['status'] = status
sql_status = f'AND `order_line`.order_status = :status'
elif status == 'all':
sql_status = f'AND `order_line`.order_status IS NOT NULL'
else:
log.warning('The status value passed is not allowed. Returning None')
return False
if from_datetime and to_datetime:
data['from_datetime'] = from_datetime
data['to_datetime'] = to_datetime
sql_from_to_datetime = f'AND `order_line`.order_created_on >= :from_datetime AND `order_line`.order_created_on <= :to_datetime'
elif from_datetime:
data['from_datetime'] = from_datetime
sql_from_to_datetime = f'AND `order_line`.order_created_on >= :from_datetime'
elif to_datetime:
data['to_datetime'] = to_datetime
sql_from_to_datetime = f'AND `order_line`.order_created_on <= :to_datetime'
else:
sql_from_to_datetime = ''
if limit:
data['limit'] = limit
@@ -164,21 +234,38 @@ def get_order_line_rec_list(
else:
sql_limit = ''
sql = f"""
SELECT `tbl`.id AS 'order_line_id', `tbl`.id_random AS 'order_line_id_random'
FROM `order_line` AS `tbl`
WHERE
{sql_obj_type_id}
{sql_enabled}
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
{sql_limit};
"""
log.debug(data)
if not full_detail:
sql = f"""
SELECT `order_line`.id AS 'order_line_id', `order_line`.id_random AS 'order_line_id_random'
FROM `v_order_line` AS `order_line`
WHERE
{sql_obj_type_id}
{sql_prod_type}
{sql_status}
{sql_from_to_datetime}
ORDER BY order_line.name, `order_line`.created_on DESC, `order_line`.updated_on DESC
{sql_limit};
"""
else:
sql = f"""
SELECT *
FROM `v_order_line_full_detail` AS `order_line`
WHERE
{sql_obj_type_id}
{sql_prod_type}
{sql_status}
{sql_from_to_datetime}
ORDER BY order_line.name, `order_line`.created_on DESC, `order_line`.updated_on DESC
{sql_limit};
"""
log.debug(sql)
if order_line_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
order_line_rec_li = order_line_rec_li_result
else:
order_line_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_line_rec_li_result)
return order_line_rec_li

10
app/methods/order_methods.py
View File

@@ -277,7 +277,7 @@ def load_order_obj(
# ### BEGIN ### API Order Methods ### get_order_rec_list() ###
# Updated 2021-11-19
# Updated 2021-11-22
def get_order_rec_list(
for_obj_type: str,
for_obj_id: str,
@@ -288,11 +288,12 @@ def get_order_rec_list(
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # 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
@@ -313,7 +314,7 @@ def get_order_rec_list(
data['status'] = status
sql_status = f'AND `order`.status = :status'
elif status == 'all':
sql_status = ''
sql_status = f'AND `order`.status IS NOT NULL'
else:
log.warning('The status value passed is not allowed. Returning None')
return False
@@ -348,6 +349,8 @@ def get_order_rec_list(
else:
sql_limit = ''
log.debug(data)
sql = f"""
SELECT `order`.id AS 'order_id', `order`.id_random AS 'order_id_random'
FROM `order` AS `order`
@@ -359,6 +362,7 @@ def get_order_rec_list(
ORDER BY `order`.created_on DESC, `order`.updated_on DESC
{sql_limit};
"""
log.debug(sql)
if order_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
order_rec_li = order_rec_li_result