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

A lot of general clean up of everything.

Browse Source
This commit is contained in:
Scott Idem
2021-05-28 04:01:42 -04:00
parent 443d2bab77
commit 207ce8a960
4 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/db_sql.py
View File

@@ -26,7 +26,7 @@ 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, rm_id_random=None, id_random_length:int=8): def sql_insert(sql:str|None=None, data:dict|None=None, table_name:str|None=None, rm_id_random:bool=False, id_random_length:int=8):
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -108,7 +108,7 @@ def sql_insert(sql:str=None, data:dict=None, table_name:str=None, rm_id_random=N
# ### BEGIN ### Core Help CRUD ### sql_update() ### # ### BEGIN ### Core Help CRUD ### sql_update() ###
def sql_update(sql:str=None, data:dict=None, table_name:str=None, record_id:int=None, record_id_random:str=None, rm_id_random=None, id_random_length:None|int=8): def sql_update(sql:str|None=None, data:dict|None=None, table_name:str|None=None, record_id:int|None=None, record_id_random:str|None=None, rm_id_random:bool=False, id_random_length:None|int=8):
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
@@ -190,7 +190,7 @@ def sql_update(sql:str=None, data:dict=None, table_name:str=None, record_id:int=
# ### BEGIN ### Core Help CRUD ### sql_insert_or_update() ### # ### BEGIN ### Core Help CRUD ### sql_insert_or_update() ###
# The catch all SQL INSERT or UPDATE function - STI 2021-02-17 # The catch all SQL INSERT or UPDATE function - STI 2021-02-17
# This one does it all for SQL INSERT and UPDATE queries # This one does it all for SQL INSERT and UPDATE queries
def sql_insert_or_update(sql:str|None=None, data:dict|None=None, table_name:str|None=None, rm_id_random:bool|None=None, id_random_length:int|None=None): def sql_insert_or_update(sql:str|None=None, data:dict|None=None, table_name:str|None=None, rm_id_random:bool=False, id_random_length:int|None=None):
#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())
@@ -286,7 +286,7 @@ def sql_select(
field_value=None, field_value=None,
sql:str|None=None, sql:str|None=None,
data:dict|None=None, data:dict|None=None,
rm_id_random:bool|None=None, rm_id_random:bool=False,
as_dict:bool|None=True, as_dict:bool|None=True,
as_list:bool|None=False as_list:bool|None=False
): ):
@@ -495,13 +495,13 @@ def sql_select(
# The catch all SQL DELETE function - STI 2021-02-17 # The catch all SQL DELETE function - STI 2021-02-17
# This one does it all for SQL DELETE queries # This one does it all for SQL DELETE queries
def sql_delete( def sql_delete(
table_name:str=None, table_name:str|None=None,
record_id:int=None, record_id:int|None=None,
record_id_random:str=None, record_id_random:str|None=None,
field_name:str=None, field_name:str|None=None,
field_value=None, field_value=None,
sql:str=None, sql:str|None=None,
data:dict=None data:dict|None=None
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())

20
app/methods/order_cart_methods.py
View File

@@ -11,7 +11,7 @@ from app.models.order_cart_models import Order_Cart_Base
def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_li:bool=False): def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_li:bool=False):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
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):
@@ -26,13 +26,13 @@ def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_l
#else: return False #else: return False
order_cart_id_random = order_cart_obj.id_random # id_random because can't ref the alias order_cart_id_random = order_cart_obj.id_random # id_random because can't ref the alias
log.setLevel(logging.DEBUG) #log.setLevel(logging.DEBUG)
log.debug(order_cart_obj.id) log.debug(order_cart_obj.id)
log.debug(order_cart_id_random) log.debug(order_cart_id_random)
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
else: return False else: return False
log.setLevel(logging.DEBUG) #log.setLevel(logging.DEBUG)
log.info('Loop through lines to update and calculate totals') log.info('Loop through lines to update and calculate totals')
# Calculate totals # Calculate totals
@@ -46,7 +46,7 @@ def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_l
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', 'created_on', 'updated_on'}) 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', 'created_on', 'updated_on'})
log.setLevel(logging.DEBUG) #log.setLevel(logging.DEBUG)
log.debug(order_cart_line_obj_data) log.debug(order_cart_line_obj_data)
data = {} data = {}
@@ -54,7 +54,7 @@ def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_l
data['product_id_random'] = order_cart_line_obj.product_id_random data['product_id_random'] = order_cart_line_obj.product_id_random
sql_select_result = sql_select(table_name='order_cart_line', data=data, rm_id_random=True) sql_select_result = sql_select(table_name='order_cart_line', data=data, rm_id_random=True)
log.setLevel(logging.DEBUG) #log.setLevel(logging.DEBUG)
log.debug(sql_select_result) log.debug(sql_select_result)
if sql_select_result: if sql_select_result:
@@ -96,7 +96,7 @@ def update_order_cart_obj(order_cart_obj:Order_Cart_Base, repl_order_cart_line_l
# ### BEGIN ### API Order Cart Methods ### load_order_cart_obj() ### # ### BEGIN ### API Order Cart Methods ### load_order_cart_obj() ###
def load_order_cart_obj(order_cart_id:int|str, inc_order_cart_line_li:bool=False, inc_order_cart_cfg:bool=False) -> Order_Cart_Base: def load_order_cart_obj(order_cart_id:int|str, inc_order_cart_line_li:bool=False, inc_order_cart_cfg:bool=False) -> Order_Cart_Base:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id, table_name='order_cart'): pass if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id, table_name='order_cart'): pass
@@ -135,7 +135,7 @@ def load_order_cart_obj(order_cart_id:int|str, inc_order_cart_line_li:bool=False
# IS THIS STILL NEEDED? # IS THIS STILL NEEDED?
# ### BEGIN ### API Order Cart Model ### save_order_cart_obj() ### # ### BEGIN ### API Order Cart Model ### save_order_cart_obj() ###
def old_save_order_cart_obj(order_cart_obj_new=None): def old_save_order_cart_obj(order_cart_obj_new=None):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if not order_cart_obj_new: if not order_cart_obj_new:
@@ -170,7 +170,7 @@ def old_save_order_cart_obj(order_cart_obj_new=None):
# Only insert if a product ID does not match # Only insert if a product ID does not match
# Only update if a product ID does match # Only update if a product ID does match
for order_cart_line_obj_new in order_cart_obj_new.order_cart_line_li: 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 #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): 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 # Need to append to current list
log.info('Need to append to current list') log.info('Need to append to current list')
@@ -209,7 +209,7 @@ def old_save_order_cart_obj(order_cart_obj_new=None):
log.info('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 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 else: return False
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(order_cart_obj_resp) log.debug(order_cart_obj_resp)
if isinstance(order_cart_obj_resp, bool) and order_cart_obj_resp: if isinstance(order_cart_obj_resp, bool) and order_cart_obj_resp:
@@ -240,7 +240,7 @@ def old_save_order_cart_obj(order_cart_obj_new=None):
# IS THIS STILL NEEDED? # IS THIS STILL NEEDED?
# ### BEGIN ### API Order Cart Model ### get_order_cart_obj() ### # ### 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): 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.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id, table_name='order_cart'): pass if order_cart_id := redis_lookup_id_random(record_id_random=order_cart_id, table_name='order_cart'): pass

12
app/models/order_cart_models.py
View File

@@ -218,7 +218,7 @@ class Order_Cart_Base(BaseModel):
#@validator('order_cart_id_random', always=True) #@validator('order_cart_id_random', always=True)
def order_cart_id_random_copy(cls, v, values, **kwargs): def order_cart_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) #log.setLevel(logging.WARNING)
log.debug(locals()) log.debug(locals())
if values['id_random']: if values['id_random']:
@@ -227,7 +227,7 @@ class Order_Cart_Base(BaseModel):
@validator('id', always=True) @validator('id', always=True)
def order_cart_id_lookup(cls, v, values, **kwargs): def order_cart_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) #log.setLevel(logging.WARNING)
log.debug(locals()) log.debug(locals())
if values['id_random']: if values['id_random']:
@@ -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.DEBUG) #log.setLevel(logging.DEBUG)
log.debug(locals()) log.debug(locals())
if values['account_id_random']: if values['account_id_random']:
@@ -245,7 +245,7 @@ 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.DEBUG) #log.setLevel(logging.DEBUG)
log.debug(locals()) log.debug(locals())
if person_id_random := values.get('person_id_random', None): if person_id_random := values.get('person_id_random', None):
@@ -254,7 +254,7 @@ class Order_Cart_Base(BaseModel):
@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.DEBUG) #log.setLevel(logging.DEBUG)
log.debug(locals()) log.debug(locals())
if user_id_random := values.get('user_id_random', None): if user_id_random := values.get('user_id_random', None):
@@ -263,7 +263,7 @@ class Order_Cart_Base(BaseModel):
@validator('order_id', always=True) @validator('order_id', always=True)
def order_id_lookup(cls, v, values, **kwargs): def order_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) #log.setLevel(logging.WARNING)
log.debug(locals()) log.debug(locals())
if 'order_id_random' in values and values['order_id_random']: if 'order_id_random' in values and values['order_id_random']:

4
app/routers/product.py
View File

@@ -77,7 +77,7 @@ async def get_product_obj_li(
by_alias: Optional[bool] = True, by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
): ):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
obj_type = 'product' obj_type = 'product'
@@ -117,7 +117,7 @@ async def get_product_obj_li(
{sql_product_type} {sql_product_type}
""" """
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(data) log.debug(data)
log.debug(sql) log.debug(sql)