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

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: