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

Code clean up. Membership tables, views, routes, methods, and models renamed.

Browse Source
This commit is contained in:
Scott Idem
2022-01-11 14:12:51 -05:00
parent 253ed6c19b
commit 8953fc32d8
24 changed files with 485 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
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_person_methods import get_membership_group_person_rec_list, load_membership_group_person_obj
from app.methods.membership_person_group_methods import get_membership_person_group_rec_list, load_membership_person_group_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,7 +26,7 @@ def load_membership_group_obj(
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group_person_list: bool = False, # List of members that are a part of this group
inc_membership_person_group_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, # ???
@@ -67,18 +67,18 @@ def load_membership_group_obj(
else: membership_group_obj.cfg = None
# Updated 2021-06-23
if inc_membership_group_person_list:
if inc_membership_person_group_list:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if membership_group_person_rec_list_result := get_membership_group_person_rec_list(
if membership_person_group_rec_list_result := get_membership_person_group_rec_list(
for_obj_type = 'membership_group',
for_obj_id = membership_group_id,
limit = limit,
enabled = enabled,
):
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),
membership_person_group_result_list = []
for membership_person_group_rec in membership_person_group_rec_list_result:
if load_membership_person_group_result := load_membership_person_group_obj(
membership_person_group_id = membership_person_group_rec.get('membership_person_group_id', None),
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
@@ -92,10 +92,10 @@ def load_membership_group_obj(
# inc_product = inc_product,
inc_user = inc_user,
):
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 = []
membership_person_group_result_list.append(load_membership_person_group_result)
else: membership_person_group_result_list.append(None)
membership_group_obj.membership_person_group_list = membership_person_group_result_list
else: membership_group_obj.membership_person_group_list = []
# Updated 2021-06-18
# if inc_parent_membership_group:
@@ -191,15 +191,15 @@ def get_membership_group_rec_list(
"""
elif membership_person_id:
sql_membership_person_id = f'`membership_group_person`.membership_person_id = :membership_person_id'
sql_membership_person_id = f'`membership_person_group`.membership_person_id = :membership_person_id'
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `membership_group_person`.enable = :enable'
sql_enabled = f'AND `membership_person_group`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `membership_group_person`.enable = :enable'
sql_enabled = f'AND `membership_person_group`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
else: sql_enabled = ''
@@ -211,12 +211,12 @@ def get_membership_group_rec_list(
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`
SELECT `membership_person_group`.membership_group_id AS 'membership_group_id', `membership_person_group`.membership_group_id_random AS 'membership_group_id_random'
FROM `v_membership_person_group` AS `membership_person_group`
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
ORDER BY `membership_person_group`.sort ASC, `membership_person_group`.created_on DESC, `membership_person_group`.updated_on DESC
{sql_limit};
"""
else: return False