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

Work on user endpoints

Browse Source
This commit is contained in:
Scott Idem
2021-11-18 15:25:06 -05:00
parent 30693cd629
commit dee958aa2b
4 changed files with 89 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/methods/account_methods.py
View File

@@ -532,8 +532,7 @@ def load_account_obj(
# Updated 2021-06-17
if inc_user_list:
if user_rec_list_result := get_user_rec_list(
for_obj_type = 'account',
for_obj_id = account_id,
account_id = account_id,
limit = limit,
enabled = enabled,
):

28
app/methods/user_methods.py
View File

@@ -428,28 +428,32 @@ def load_user_obj(
# ### BEGIN ### API User Methods ### get_user_rec_list() ###
def get_user_rec_list(
for_obj_type: str,
for_obj_id: str,
limit: int = 1000,
account_id: int|str,
hidden: str = 'not_hidden', # hidden, not_hidden, all
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 1000,
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
else: return False
data = {}
data[f'{for_obj_type}_id'] = for_obj_id
data['account_id'] = account_id
sql_where_account_id = f'`user`.account_id = :account_id'
# data[f'{for_obj_type}_id'] = for_obj_id
# data['for_obj_type'] = for_obj_type
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
# sql_obj_type_id = f'`user`.{for_obj_type}_id = :{for_obj_type}_id'
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `tbl`.enable = :enable'
sql_enabled = f'AND `user`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `tbl`.enable = :enable'
sql_enabled = f'AND `user`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
@@ -460,12 +464,12 @@ def get_user_rec_list(
sql_limit = ''
sql = f"""
SELECT `tbl`.id AS 'user_id', `tbl`.id_random AS 'user_id_random'
FROM `user` AS `tbl`
SELECT `user`.id AS 'user_id', `user`.id_random AS 'user_id_random'
FROM `user` AS `user`
WHERE
{sql_obj_type_id}
{sql_where_account_id}
{sql_enabled}
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
ORDER BY user.name, user.email, user.username, `user`.created_on DESC, `user`.updated_on DESC
{sql_limit};
"""