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

Working on membership and users

Browse Source
This commit is contained in:
Scott Idem
2021-06-25 11:15:58 -04:00
parent d85ab35812
commit ca43cc4dce
9 changed files with 270 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/methods/user_methods.py
View File

@@ -13,9 +13,9 @@ from app.methods.order_methods import load_order_obj, get_order_rec_list
from app.methods.organization_methods import load_organization_obj, update_organization_obj
from app.methods.person_methods import load_person_obj, update_person_obj
from app.methods.post_methods import get_post_rec_list, load_post_obj
from app.methods.user_role_methods import get_user_role_rec_list, load_user_role_obj
from app.models.user_models import User_Base, User_New_Base, User_Out_Base
from app.models.user_role_models import User_Role_Base
# ### BEGIN ### API User Methods ### create_user_obj() ###
@@ -99,7 +99,7 @@ def load_user_obj(
inc_post_comment_list: bool = False,
inc_user_role_list: bool = False,
) -> User_Out_Base|bool:
#log.setLevel(logging.WARNING) # 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
@@ -108,7 +108,7 @@ def load_user_obj(
if user_rec := sql_select(table_name='v_user', record_id=user_id): pass
else: return False
#log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(user_rec)
try:
@@ -155,8 +155,7 @@ def load_user_obj(
):
order_result_list = []
for order_rec in order_rec_list_result:
order_result_list.append(
load_order_obj(
if load_order_result := load_order_obj(
order_id = order_rec.get('order_id', None),
limit = limit,
by_alias = by_alias,
@@ -167,8 +166,9 @@ def load_user_obj(
inc_order_line_list = inc_order_line_list,
inc_person = inc_person,
# inc_user = inc_user,
)
)
):
order_result_list.append(load_order_result)
else: order_result_list.append(None)
user_obj.order_list = order_result_list
else: user_obj.order_list = []
@@ -216,8 +216,7 @@ def load_user_obj(
):
post_result_list = []
for post_rec in post_rec_list_result:
post_result_list.append(
load_post_obj(
if load_post_result := load_post_obj(
post_id = post_rec.get('post_id', None),
limit = limit,
by_alias = by_alias,
@@ -227,20 +226,42 @@ def load_user_obj(
inc_post_comment_list = inc_post_comment_list,
inc_person = inc_person,
# inc_user = inc_user,
)
)
):
post_result_list.append(load_post_result)
else: post_result_list.append(None)
user_obj.post_list = post_result_list
else: user_obj.post_list = []
# NOTE: Including user roles should probably be reviewed
# Updated 2021-06-25
if inc_user_role_list:
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
user_obj.role_list = role_rec_li
else:
# user_rec['role_list'] = None
user_obj.role_list = None
log.debug(user_rec)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if user_role_rec_list_result := get_user_role_rec_list(
for_obj_type = 'user',
for_obj_id = user_id,
limit = limit,
enabled = enabled,
):
user_role_result_list = []
log.debug(user_role_rec_list_result)
for user_role_rec in user_role_rec_list_result:
if load_user_role_result := load_user_role_obj(
user_role_id = user_role_rec.get('user_role_id', None),
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
):
user_role_result_list.append(load_user_role_result)
else: user_role_result_list.append(None)
user_obj.user_role_list = user_role_result_list
else: user_obj.user_role_list = []
# 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['user_role_list'] = role_rec_li
# user_obj.user_role_list = role_rec_li
# else:
# # user_rec['user_role_list'] = None
# user_obj.user_role_list = None
# log.debug(user_rec)
log.debug(user_obj)
if model_as_dict: