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

Working finally getting this to interact with the actual front end.

Browse Source
This commit is contained in:
Scott Idem
2021-03-13 02:17:24 -05:00
parent 46c562871f
commit 4ba34d594d
10 changed files with 353 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

91
app/routers/order.py
View File

@@ -11,8 +11,9 @@ from app.db_sql import *
from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from ..models.order_model import Order_Base
from ..models.response_model import *
from ..models.order_model import Order_Base
from ..models.order_methods import load_order_obj, save_order_obj
router = APIRouter()
@@ -73,6 +74,13 @@ async def get_order_obj_li(
for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50),
for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22),
order_status: Optional[str] = 'complete',
from_datetime: Optional[datetime.datetime] = None,
to_datetime: Optional[datetime.datetime] = None,
limit: Optional[int] = None,
inc_order_line_li: Optional[bool] = False,
inc_order_cfg: Optional[bool] = False,
inc_person_obj: Optional[bool] = False,
inc_user_obj: Optional[bool] = False,
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
@@ -80,45 +88,49 @@ async def get_order_obj_li(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'order'
result = get_obj_li_template(
obj_type=obj_type,
for_obj_type=for_obj_type,
for_obj_id=for_obj_id,
by_alias=True,
exclude_unset=True,
)
return result
person_id = redis_lookup_id_random(record_id_random=person_id_random, table_name='person')
# obj_type = 'order'
# result = get_obj_li_template(
# obj_type=obj_type,
# for_obj_type=for_obj_type,
# for_obj_id=for_obj_id,
# by_alias=True,
# exclude_unset=True,
# )
# return result
data = {}
data['person_id'] = person_id
if obj_type == 'person': # and check there is an ID as well!
if for_obj_type == 'account' and for_obj_id:
data['account_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='account')
sql_account_person_user = f"""`order`.account_id = :account_id"""
elif for_obj_type == 'person' and for_obj_id:
data['person_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='person')
sql_account_person_user = f"""`order`.person_id = :person_id"""
elif for_obj_type == 'user' and for_obj_id:
data['user_id'] = redis_lookup_id_random(record_id_random=for_obj_id, table_name='user')
sql_account_person_user = f"""`order`.user_id = :user_id"""
else:
sql_account_person_user = ''
if order_status:
if order_status in ['canceled', 'complete', 'in progress', 'started']:
data['status'] = order_status
sql_status = f"""AND `order`.status = :status"""
else:
sql_status = ''
if from_datetime and to_datetime:
data['from_datetime'] = from_datetime
data['to_datetime'] = to_datetime
sql_from_to_datetime = f"""AND `order`.created_on >= :from_datetime AND `order`.created_on <= :to_datetime"""
elif from_datetime:
data['from_datetime'] = from_datetime
sql_from_to_datetime = f"""AND `order`.created_on >= :from_datetime"""
elif to_datetime:
data['to_datetime'] = to_datetime
sql_from_to_datetime = f"""AND `order`.created_on <= :to_datetime"""
else:
sql_from_to_datetime = ''
# if from_datetime and to_datetime:
# data['from_datetime'] = from_datetime
# data['to_datetime'] = to_datetime
# sql_from_to_datetime = f"""AND `order`.created_on >= :from_datetime AND `order`.created_on <= :to_datetime"""
# elif from_datetime:
# data['from_datetime'] = from_datetime
# sql_from_to_datetime = f"""AND `order`.created_on >= :from_datetime"""
# elif to_datetime:
# data['to_datetime'] = to_datetime
# sql_from_to_datetime = f"""AND `order`.created_on <= :to_datetime"""
# else:
# sql_from_to_datetime = ''
if limit := request.args.get('limit', default=None, type=int):
if limit:
data['limit'] = limit
sql_limit = f"""LIMIT :limit"""
else:
@@ -129,20 +141,21 @@ async def get_order_obj_li(
FROM `order` AS `order`
WHERE {sql_account_person_user}
{sql_status}
/*{sql_from_to_datetime}*/
{sql_from_to_datetime}
ORDER BY `order`.created_on DESC, `order`.updated_on DESC
{sql_limit};
"""
if sql_result := sql_select(data=data, sql=sql, as_list=True):
resp_data_li = []
for record in sql_result:
resp_data = base_name(**record).dict(by_alias=by_alias, exclude_unset=exclude_unset)
resp_data_li.append(resp_data)
return mk_resp(data=resp_data_li)
if order_obj_li_result := sql_select(data=data, sql=sql, as_list=True):
order_obj_li = []
for order_obj in order_obj_li_result:
order_id = order_obj.get('order_id', None)
if order_obj := load_order_obj(order_id=order_id, inc_order_line_li=inc_order_line_li, inc_order_cfg=inc_order_cfg, inc_person_obj=inc_person_obj, inc_user_obj=inc_user_obj):
data = order_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
order_obj_li.append(data)
return mk_resp(data=order_obj_li)
else:
log.debug(sql_result)
log.debug(order_obj_li_result)
return mk_resp(data=False, status_code=404)