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

A lot of changes related to person and membership

Browse Source
This commit is contained in:
Scott Idem
2021-07-09 17:34:02 -04:00
parent 2b8d00551c
commit 49805f48c9
49 changed files with 1389 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

122
app/methods/membership_group_methods.py
View File

@@ -8,7 +8,7 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_updat
from app.lib_general import log, logging
from app.methods.membership_cfg_methods import load_membership_cfg_obj
from app.methods.membership_group_member_methods import get_membership_group_member_rec_list, load_membership_group_member_obj
from app.methods.membership_group_person_methods import get_membership_group_person_rec_list, load_membership_group_person_obj
from app.methods.product_methods import get_product_rec_list, load_product_obj
from app.models.membership_group_models import Membership_Group_Base
@@ -26,9 +26,9 @@ def load_membership_group_obj(
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group_member_list: bool = False, # List of members that are a part of this group
inc_membership_member: bool = False,
inc_membership_member_profile: bool = False, # under membership_member
inc_membership_group_person_list: bool = False, # List of members that are a part of this group
inc_membership_person: bool = False,
inc_membership_person_profile: bool = False, # under membership_person
# inc_membership_type_list: bool = False, # ???
inc_organization: bool = False,
inc_parent_membership_group: bool = False,
@@ -37,7 +37,7 @@ def load_membership_group_obj(
inc_product_list: bool = False, # List of products that give access to this group
inc_user: bool = False,
) -> Membership_Group_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if membership_group_id := redis_lookup_id_random(record_id_random=membership_group_id, table_name='membership_group'): pass
@@ -67,35 +67,35 @@ def load_membership_group_obj(
else: membership_group_obj.cfg = None
# Updated 2021-06-23
if inc_membership_group_member_list:
if inc_membership_group_person_list:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if membership_group_member_rec_list_result := get_membership_group_member_rec_list(
if membership_group_person_rec_list_result := get_membership_group_person_rec_list(
for_obj_type = 'membership_group',
for_obj_id = membership_group_id,
limit = limit,
enabled = enabled,
):
membership_group_member_result_list = []
for membership_group_member_rec in membership_group_member_rec_list_result:
if load_membership_group_member_result := load_membership_group_member_obj(
membership_group_member_id = membership_group_member_rec.get('membership_group_member_id', None),
membership_group_person_result_list = []
for membership_group_person_rec in membership_group_person_rec_list_result:
if load_membership_group_person_result := load_membership_group_person_obj(
membership_group_person_id = membership_group_person_rec.get('membership_group_person_id', None),
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
enabled = enabled,
inc_membership_member = inc_membership_member,
inc_membership_person = inc_membership_person,
# inc_membership_group_list = inc_membership_group_list,
# inc_membership_member_profile = inc_membership_member_profile,
# inc_membership_person_profile = inc_membership_person_profile,
# inc_organization = inc_organization,
inc_person = inc_person,
# inc_product = inc_product,
inc_user = inc_user,
):
membership_group_member_result_list.append(load_membership_group_member_result)
else: membership_group_member_result_list.append(None)
membership_group_obj.membership_group_member_list = membership_group_member_result_list
else: membership_group_obj.membership_group_member_list = []
membership_group_person_result_list.append(load_membership_group_person_result)
else: membership_group_person_result_list.append(None)
membership_group_obj.membership_group_person_list = membership_group_person_result_list
else: membership_group_obj.membership_group_person_list = []
# Updated 2021-06-18
# if inc_parent_membership_group:
@@ -142,6 +142,7 @@ def load_membership_group_obj(
# ### BEGIN ### API Membership Group Methods ### get_membership_group_rec_list() ###
def get_membership_group_rec_list(
account_id: str = None,
membership_person_id: str = None,
# product_id: str = None,
# type_level: int = None,
limit: int = 1000,
@@ -155,47 +156,70 @@ def get_membership_group_rec_list(
data = {}
data['account_id'] = account_id
data['membership_person_id'] = membership_person_id
# data['product_id'] = product_id
# data['level'] = type_level
if account_id:
sql_account_id = f'`membership_group`.account_id = :account_id'
else: sql_account_id = ''
# if product_id:
# sql_product_id = f'`membership_group`.product_id = :product_id'
# else: sql_product_id = ''
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `membership_group`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `membership_group`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else: sql_enabled = ''
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `membership_group`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `membership_group`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else: sql_enabled = ''
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
# if type_level:
# sql_type_level = f"""AND membership_group.level = :level"""
# else: sql_type_level = ''
sql = f"""
SELECT `membership_group`.id AS 'membership_group_id', `membership_group`.id_random AS 'membership_group_id_random'
FROM `v_membership_group` AS `membership_group`
WHERE
{sql_account_id}
{sql_enabled}
ORDER BY `membership_group`.sort ASC, `membership_group`.created_on DESC, `membership_group`.updated_on DESC
{sql_limit};
"""
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
elif membership_person_id:
sql_membership_person_id = f'`membership_group_person`.membership_person_id = :membership_person_id'
sql = f"""
SELECT `membership_group`.id AS 'membership_group_id', `membership_group`.id_random AS 'membership_group_id_random'
FROM `v_membership_group` AS `membership_group`
WHERE
{sql_account_id}
{sql_enabled}
ORDER BY `membership_group`.sort ASC, `membership_group`.created_on DESC, `membership_group`.updated_on DESC
{sql_limit};
"""
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `membership_group_person`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `membership_group_person`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else: sql_enabled = ''
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
sql = f"""
SELECT `membership_group_person`.membership_group_id AS 'membership_group_id', `membership_group_person`.membership_group_id_random AS 'membership_group_id_random'
FROM `v_membership_group_person` AS `membership_group_person`
WHERE
{sql_membership_person_id}
{sql_enabled}
ORDER BY `membership_group_person`.sort ASC, `membership_group_person`.created_on DESC, `membership_group_person`.updated_on DESC
{sql_limit};
"""
else: return False
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(sql)
@@ -204,7 +228,7 @@ def get_membership_group_rec_list(
membership_group_rec_li = membership_group_rec_li_result
else:
membership_group_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_group_rec_li_result)
return membership_group_rec_li