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

Working on the cart and other related things

Browse Source
This commit is contained in:
Scott Idem
2021-05-12 16:49:53 -04:00
parent ee863face2
commit 1d3045f946
3 changed files with 158 additions and 155 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/db_sql.py
View File

@@ -26,15 +26,15 @@ db = engine.connect()
# ### BEGIN ### Core Help CRUD ### sql_insert() ### # ### BEGIN ### Core Help CRUD ### sql_insert() ###
def sql_insert(sql:str=None, data:dict=None, table_name:str=None, id_random_length:int=8): def sql_insert(sql:str=None, data:dict=None, table_name:str=None, rm_id_random=None, id_random_length:int=8):
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if sql: if sql:
sql_insert = text(sql) sql_insert = text(sql)
elif table_name and data: elif table_name and data:
#if rm_id_random: if rm_id_random:
#data = lookup_id_random_pop(obj_data=data) data = lookup_id_random_pop(obj_data=data)
if not data.get('id_random', None) and id_random_length: if not data.get('id_random', None) and id_random_length:
data['id_random'] = secrets.token_urlsafe(id_random_length) data['id_random'] = secrets.token_urlsafe(id_random_length)

152
app/models/order_cart_methods.py
View File

@@ -5,7 +5,7 @@ from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from ..lib_general import * from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert_or_update, sql_update, sql_select from ..db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
from .order_cart_model import Order_Cart_Base from .order_cart_model import Order_Cart_Base
@@ -16,8 +16,10 @@ def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_l
if order_cart_obj.account_id_random and (order_cart_obj.person_id_random or order_cart_obj.user_id_random): if order_cart_obj.account_id_random and (order_cart_obj.person_id_random or order_cart_obj.user_id_random):
log.info(f'An account.id_random {order_cart_obj.account_id_random} was passed. And either a person.id_random {order_cart_obj.person_id_random} or user.id_random {order_cart_obj.user_id_random} was passed. We can update the order cart.') log.info(f'An account.id_random {order_cart_obj.account_id_random} was passed. And either a person.id_random {order_cart_obj.person_id_random} or user.id_random {order_cart_obj.user_id_random} was passed. We can update the order cart.')
elif order_cart_obj.account_id_random and not (order_cart_obj.person_id_random or order_cart_obj.user_id_random):
log.info(f'An account.id_random {order_cart_obj.account_id_random} was passed. A person.id_random {order_cart_obj.person_id_random} or user.id_random {order_cart_obj.user_id_random} was not passed. We can update the order cart without one of those.')
else: else:
log.error('An account ID along with a person ID or user ID is required to create an order.') log.error('An account ID. A person ID or user ID is not required until starting to process an order.')
return False return False
#if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id_random, table_name='order_cart'): pass #if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id_random, table_name='order_cart'): pass
@@ -89,8 +91,6 @@ def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_l
log.error('Something went wrong while trying to update an order cart record.') log.error('Something went wrong while trying to update an order cart record.')
return False return False
return False return False
@@ -129,3 +129,147 @@ def load_order_cart_obj(order_cart_id:int|str, inc_order_cart_line_li:bool=False
return order_cart_obj return order_cart_obj
# ### END ### API Order Cart Methods ### load_order_cart_obj() ### # ### END ### API Order Cart Methods ### load_order_cart_obj() ###
# IS THIS STILL NEEDED?
# ### BEGIN ### API Order Cart Model ### save_order_cart_obj() ###
def old_save_order_cart_obj(order_cart_obj_new=None):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if not order_cart_obj_new:
return False
#log.debug(order_cart_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True))
# Get the current order_cart_line li to compare with what was sent
data = {}
data['order_cart_id_random'] = order_cart_obj_new.id_random
if order_cart_line_rec_li_curr := sql_select(table_name='v_order_cart_line', data=data, rm_id_random=True, as_list=True):
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#log.debug(order_cart_line_rec_li_curr)
order_cart_line_obj_li_curr = []
for order_cart_line_rec in order_cart_line_rec_li_curr:
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())
order_cart_line_obj_li_curr.append(order_cart_line_obj)
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_line_obj_li_curr)
else:
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_line_rec_li_curr)
order_cart_line_obj_li_curr = []
# Loop through the line list that was sent and compare with what was pulled from the DB
# Only insert if a product ID does not match
# Only update if a product ID does match
for order_cart_line_obj_new in order_cart_obj_new.order_cart_line_li:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if not any(order_cart_line_obj_curr.product_id_random == order_cart_line_obj_new.product_id_random for order_cart_line_obj_curr in order_cart_line_obj_li_curr):
# Need to append to current list
log.info('Need to append to current list')
order_cart_line_obj_li_curr.append(order_cart_line_obj_new)
else:
# Need to update a current list item ... loop through to find
log.info('Need to update a current list item ... loop through to find')
for index, order_cart_line_obj_curr in enumerate(order_cart_line_obj_li_curr):
log.info(index)
if order_cart_line_obj_new.product_id_random == order_cart_line_obj_curr.product_id_random:
log.info(f'Match: {order_cart_line_obj_curr.product_id_random}')
order_cart_line_obj_new.id_random = order_cart_line_obj_curr.id_random
order_cart_line_obj_li_curr[index] = order_cart_line_obj_new
else:
log.info(f'Not a match: {order_cart_line_obj_curr.product_id_random}')
# Save merged current and new list to the new order cart object
order_cart_obj_new.order_cart_line_li = order_cart_line_obj_li_curr
log.debug(order_cart_obj_new)
# Final loop through to get the new order totals
# Calculate totals
order_cart_total_amount = 0
order_cart_total_quantity = 0
for order_cart_line_obj_curr in order_cart_line_obj_li_curr:
order_cart_total_amount += order_cart_line_obj_curr.quantity * order_cart_line_obj_curr.amount
order_cart_total_quantity += order_cart_line_obj_curr.quantity
order_cart_obj_new.total_amount = order_cart_total_amount
order_cart_obj_new.total_quantity = order_cart_total_quantity
log.debug(order_cart_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'order_cart_id_random', 'order_cart_line_li', 'cfg', 'created_on', 'updated_on'}))
order_cart_obj_data = order_cart_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'order_cart_id_random', 'order_cart_line_li', 'cfg', 'created_on', 'updated_on'})
# SQL INSERT or UPDATE the order_cart record
log.info('SQL INSERT or UPDATE the order_cart record')
if order_cart_obj_resp := sql_insert_or_update(sql=None, data=order_cart_obj_data, table_name='order_cart', rm_id_random=True, id_random_length=8): pass
else: return False
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_obj_resp)
if isinstance(order_cart_obj_resp, bool) and order_cart_obj_resp:
if order_cart_id := order_cart_obj_new.id: pass
elif order_cart_id := order_cart_obj_new.id_random: pass
elif isinstance(order_cart_obj_resp, int):
order_cart_id = order_cart_obj_resp
else:
return False
# Loop through the order_cart_line list to SQL INSERT or UPDATE the records
log.info('Loop through the order_cart_line list to SQL INSERT or UPDATE the records')
for order_cart_line_obj in order_cart_obj_new.order_cart_line_li:
log.debug(f"--- {order_cart_line_obj}")
log.debug(order_cart_line_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=False, exclude={}))
order_cart_line_obj_data = order_cart_line_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'product_type_id', 'product_type', 'product_name', 'product_description', 'product_unit_price', 'product_max_quantity', 'order_cart_line_id_random', 'created_on', 'updated_on'})
order_cart_line_obj_data['order_cart_id'] = order_cart_id
if order_cart_line_obj_resp := sql_insert_or_update(sql=None, 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_resp)
return order_cart_id
# ### END ### API Order Cart Model ### save_order_cart_obj() ###
# IS THIS STILL NEEDED?
# ### BEGIN ### API Order Cart Model ### get_order_cart_obj() ###
def old_get_order_cart_obj(order_cart_id=None, inc_order_cart_line_li=None, inc_order_cart_cfg=None):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
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 inc_order_cart_line_li:
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_li'] = order_cart_line_rec_li
if inc_order_cart_cfg:
if order_cart_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_cart_cfg_rec
log.debug(order_cart_rec)
else:
return False
try:
order_cart_obj = Order_Cart_Base(**order_cart_rec)
log.debug(order_cart_obj)
except ValidationError as e:
log.error(e.json())
return order_cart_obj
# ### END ### API Order Cart Model ### get_order_cart_obj() ###

155
app/models/order_cart_model.py
View File

@@ -236,7 +236,7 @@ class Order_Cart_Base(BaseModel):
@validator('account_id', always=True) @validator('account_id', always=True)
def account_id_lookup(cls, v, values, **kwargs): def account_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) log.setLevel(logging.DEBUG)
log.debug(locals()) log.debug(locals())
if values['account_id_random']: if values['account_id_random']:
@@ -245,20 +245,20 @@ class Order_Cart_Base(BaseModel):
@validator('person_id', always=True) @validator('person_id', always=True)
def person_id_lookup(cls, v, values, **kwargs): def person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) log.setLevel(logging.DEBUG)
log.debug(locals()) log.debug(locals())
if values['person_id_random']: if person_id_random := values.get('person_id_random', None):
return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person') return redis_lookup_id_random(record_id_random=person_id_random, table_name='person')
return None return None
@validator('user_id', always=True) @validator('user_id', always=True)
def user_id_lookup(cls, v, values, **kwargs): def user_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) log.setLevel(logging.DEBUG)
log.debug(locals()) log.debug(locals())
if values['user_id_random']: if user_id_random := values.get('user_id_random', None):
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user') return redis_lookup_id_random(record_id_random=user_id_random, table_name='user')
return None return None
@validator('order_id', always=True) @validator('order_id', always=True)
@@ -273,144 +273,3 @@ class Order_Cart_Base(BaseModel):
class Config: class Config:
underscore_attrs_are_private = True underscore_attrs_are_private = True
fields = base_fields fields = base_fields
# ### BEGIN ### API Order Cart Model ### save_order_cart_obj() ###
def save_order_cart_obj(order_cart_obj_new=None):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if not order_cart_obj_new:
return False
#log.debug(order_cart_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True))
# Get the current order_cart_line li to compare with what was sent
data = {}
data['order_cart_id_random'] = order_cart_obj_new.id_random
if order_cart_line_rec_li_curr := sql_select(table_name='v_order_cart_line', data=data, rm_id_random=True, as_list=True):
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#log.debug(order_cart_line_rec_li_curr)
order_cart_line_obj_li_curr = []
for order_cart_line_rec in order_cart_line_rec_li_curr:
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())
order_cart_line_obj_li_curr.append(order_cart_line_obj)
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_line_obj_li_curr)
else:
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_line_rec_li_curr)
order_cart_line_obj_li_curr = []
# Loop through the line list that was sent and compare with what was pulled from the DB
# Only insert if a product ID does not match
# Only update if a product ID does match
for order_cart_line_obj_new in order_cart_obj_new.order_cart_line_li:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if not any(order_cart_line_obj_curr.product_id_random == order_cart_line_obj_new.product_id_random for order_cart_line_obj_curr in order_cart_line_obj_li_curr):
# Need to append to current list
log.info('Need to append to current list')
order_cart_line_obj_li_curr.append(order_cart_line_obj_new)
else:
# Need to update a current list item ... loop through to find
log.info('Need to update a current list item ... loop through to find')
for index, order_cart_line_obj_curr in enumerate(order_cart_line_obj_li_curr):
log.info(index)
if order_cart_line_obj_new.product_id_random == order_cart_line_obj_curr.product_id_random:
log.info(f'Match: {order_cart_line_obj_curr.product_id_random}')
order_cart_line_obj_new.id_random = order_cart_line_obj_curr.id_random
order_cart_line_obj_li_curr[index] = order_cart_line_obj_new
else:
log.info(f'Not a match: {order_cart_line_obj_curr.product_id_random}')
# Save merged current and new list to the new order cart object
order_cart_obj_new.order_cart_line_li = order_cart_line_obj_li_curr
log.debug(order_cart_obj_new)
# Final loop through to get the new order totals
# Calculate totals
order_cart_total_amount = 0
order_cart_total_quantity = 0
for order_cart_line_obj_curr in order_cart_line_obj_li_curr:
order_cart_total_amount += order_cart_line_obj_curr.quantity * order_cart_line_obj_curr.amount
order_cart_total_quantity += order_cart_line_obj_curr.quantity
order_cart_obj_new.total_amount = order_cart_total_amount
order_cart_obj_new.total_quantity = order_cart_total_quantity
log.debug(order_cart_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'order_cart_id_random', 'order_cart_line_li', 'cfg', 'created_on', 'updated_on'}))
order_cart_obj_data = order_cart_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'order_cart_id_random', 'order_cart_line_li', 'cfg', 'created_on', 'updated_on'})
# SQL INSERT or UPDATE the order_cart record
log.info('SQL INSERT or UPDATE the order_cart record')
if order_cart_obj_resp := sql_insert_or_update(sql=None, data=order_cart_obj_data, table_name='order_cart', rm_id_random=True, id_random_length=8): pass
else: return False
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_obj_resp)
if isinstance(order_cart_obj_resp, bool) and order_cart_obj_resp:
if order_cart_id := order_cart_obj_new.id: pass
elif order_cart_id := order_cart_obj_new.id_random: pass
elif isinstance(order_cart_obj_resp, int):
order_cart_id = order_cart_obj_resp
else:
return False
# Loop through the order_cart_line list to SQL INSERT or UPDATE the records
log.info('Loop through the order_cart_line list to SQL INSERT or UPDATE the records')
for order_cart_line_obj in order_cart_obj_new.order_cart_line_li:
log.debug(f"--- {order_cart_line_obj}")
log.debug(order_cart_line_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=False, exclude={}))
order_cart_line_obj_data = order_cart_line_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'product_type_id', 'product_type', 'product_name', 'product_description', 'product_unit_price', 'product_max_quantity', 'order_cart_line_id_random', 'created_on', 'updated_on'})
order_cart_line_obj_data['order_cart_id'] = order_cart_id
if order_cart_line_obj_resp := sql_insert_or_update(sql=None, 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_resp)
return order_cart_id
# ### END ### API Order Cart Model ### save_order_cart_obj() ###
# ### BEGIN ### API Order Cart Model ### get_order_cart_obj() ###
def get_order_cart_obj(order_cart_id=None, inc_order_cart_line_li=None, inc_order_cart_cfg=None):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
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 inc_order_cart_line_li:
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_li'] = order_cart_line_rec_li
if inc_order_cart_cfg:
if order_cart_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_cart_cfg_rec
log.debug(order_cart_rec)
else:
return False
try:
order_cart_obj = Order_Cart_Base(**order_cart_rec)
log.debug(order_cart_obj)
except ValidationError as e:
log.error(e.json())
return order_cart_obj
# ### END ### API Order Cart Model ### get_order_cart_obj() ###