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

General clean up of models and methods.

Browse Source
This commit is contained in:
Scott Idem
2021-05-28 01:40:18 -04:00
parent e46032a00b
commit 09c7b48223
61 changed files with 107 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/methods/contact_methods.py
View File

@@ -63,13 +63,13 @@ def load_contact_obj(contact_id:int|str, inc_address:bool=False) -> Contact_Base
else: return False
if contact_rec := sql_select(table_name='v_contact', record_id=contact_id):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(contact_rec)
if inc_address:
if address_rec := sql_select(table_name='v_address', field_name='address_id', field_value=contact_rec.get('address_id', None)):
contact_rec['address'] = address_rec
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(address_rec)
else:
return False

4
app/methods/event_person_methods.py
View File

@@ -28,7 +28,7 @@ def create_event_person_obj(event_person_obj_new:Event_Person_Base) -> int|bool:
else:
return False
log.setLevel(logging.DEBUG)
#log.setLevel(logging.DEBUG)
log.debug(event_person_obj_in_result)
event_person_id = event_person_obj_in_result
@@ -55,7 +55,7 @@ def load_event_person_obj(
else: return False
if event_person_rec := sql_select(table_name='v_event_person', record_id=event_person_id):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(event_person_rec)
person_id = event_person_rec.get('person_id', None)

10
app/methods/membership_methods.py
View File

@@ -7,12 +7,12 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_select
#from .address_model import Address_Base
#from .contact_model import Contact_Base
#from .address_models import Address_Base
#from .contact_models import Contact_Base
from ..models.membership_models import Membership_Base
#from .organization_model import Organization_Base
#from .person_model import Person_Base
#from .user_model import User_Base
#from .organization_models import Organization_Base
#from .person_models import Person_Base
#from .user_models import User_Base
# ### BEGIN ### API Membership Methods ### save_membership_obj() ###

2
app/methods/order_cart_methods.py
View File

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_insert_or_update, sql_insert, sql_update, sql_select
from ..models.order_cart_model import Order_Cart_Base
from ..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):

2
app/methods/order_methods.py
View File

@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
from ..lib_general import *
from ..db_sql import redis_lookup_id_random, sql_select
from ..models.order_model import Order_Base
from ..models.order_models import Order_Base
#from ..models.person_models import Person_Base
#from ..models.user_models import User_Base

2
app/methods/person_methods.py
View File

@@ -29,7 +29,7 @@ def create_person_obj(person_obj_new:Person_Base):
else:
return False
log.setLevel(logging.DEBUG)
#log.setLevel(logging.DEBUG)
log.debug(person_obj_in_result)
person_id = person_obj_in_result

10
app/methods/user_methods.py
View File

@@ -12,7 +12,7 @@ from ..methods.organization_methods import load_organization_obj
#from ..methods.person_methods import load_person_obj
from ..models.user_models import User_Base, User_New_Base, User_Out_Base
from ..models.user_role_model import User_Role_Base
from ..models.user_role_models import User_Role_Base
# ### BEGIN ### API User Methods ### create_user_obj() ###
@@ -50,7 +50,7 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
else:
return False
log.setLevel(logging.DEBUG)
#log.setLevel(logging.DEBUG)
log.debug(user_obj_up_result)
log.debug(f'Returning the existing user_id: {user_id}')
@@ -59,7 +59,7 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
else:
return False
log.setLevel(logging.DEBUG)
#log.setLevel(logging.DEBUG)
log.debug(user_obj_in_result)
user_id = user_obj_in_result
@@ -71,7 +71,7 @@ def create_user_obj(user_obj_new:User_New_Base) -> int|bool:
# ### BEGIN ### API User Methods ### load_user_obj() ###
def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_contact:bool=False, inc_organization:bool=False, inc_person:bool=False) -> User_Out_Base|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
@@ -84,7 +84,7 @@ def load_user_obj(user_id:int|str, inc_roles:bool=False, inc_contact:bool=False,
if inc_roles:
if role_rec_li := sql_select(table_name='v_user_role_detail', field_name='user_id', field_value=user_id, as_list=True):
user_rec['role_list'] = role_rec_li
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(role_rec_li)
if inc_contact: