A lot of changes related to person and membership
This commit is contained in:
Scott Idem
@@ -16,7 +16,7 @@ from app.methods.hosted_file_methods import get_hosted_file_rec_list, load_hoste
|
||||
from app.methods.journal_methods import get_journal_rec_list, load_journal_obj
|
||||
from app.methods.membership_cfg_methods import load_membership_cfg_obj
|
||||
from app.methods.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj
|
||||
from app.methods.membership_member_methods import get_membership_member_rec_list, load_membership_member_obj
|
||||
from app.methods.membership_person_methods import get_membership_person_rec_list, load_membership_person_obj
|
||||
from app.methods.membership_type_methods import get_membership_type_rec_list, load_membership_type_obj
|
||||
from app.methods.order_methods import get_order_rec_list, load_order_obj
|
||||
# from app.methods.order_cart_methods import get_order_cart_rec_list, load_order_cart_obj
|
||||
@@ -86,10 +86,10 @@ def load_account_obj(
|
||||
inc_journal_entry_list: bool = False, # Priority l3
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group_list: bool = False, # List of groups for the account
|
||||
inc_membership_group_member_list: bool = False, # List of members of a group
|
||||
inc_membership_member: bool = False,
|
||||
inc_membership_member_list: bool = False, # Priority l1
|
||||
inc_membership_member_profile: bool = False,
|
||||
inc_membership_group_person_list: bool = False, # List of members of a group
|
||||
inc_membership_person: bool = False,
|
||||
inc_membership_person_list: bool = False, # Priority l1
|
||||
inc_membership_person_profile: bool = False,
|
||||
# inc_membership_type: bool = False,
|
||||
inc_membership_type_list: bool = False,
|
||||
inc_order: bool = False,
|
||||
@@ -316,8 +316,8 @@ def load_account_obj(
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_membership_member_list = inc_membership_member_list,
|
||||
# inc_membership_group_member_list = inc_membership_group_member_list,
|
||||
inc_membership_person_list = inc_membership_person_list,
|
||||
# inc_membership_group_person_list = inc_membership_group_person_list,
|
||||
inc_product_list = inc_product_list,
|
||||
)
|
||||
)
|
||||
@@ -325,33 +325,33 @@ def load_account_obj(
|
||||
else: account_obj.membership_group_list = []
|
||||
|
||||
# Updated 2021-06-21
|
||||
if inc_membership_member_list:
|
||||
if membership_member_rec_list_result := get_membership_member_rec_list(
|
||||
if inc_membership_person_list:
|
||||
if membership_person_rec_list_result := get_membership_person_rec_list(
|
||||
for_obj_type = 'account',
|
||||
for_obj_id = account_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
membership_member_result_list = []
|
||||
for membership_member_rec in membership_member_rec_list_result:
|
||||
membership_member_result_list.append(
|
||||
load_membership_member_obj(
|
||||
membership_member_id = membership_member_rec.get('membership_member_id', None),
|
||||
membership_person_result_list = []
|
||||
for membership_person_rec in membership_person_rec_list_result:
|
||||
membership_person_result_list.append(
|
||||
load_membership_person_obj(
|
||||
membership_person_id = membership_person_rec.get('membership_person_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_membership_group_list = inc_membership_group_list,
|
||||
inc_membership_member_profile = inc_membership_member_profile,
|
||||
# inc_membership_member_list = inc_membership_member_list,
|
||||
# inc_membership_member_list = inc_membership_member_list,
|
||||
inc_membership_person_profile = inc_membership_person_profile,
|
||||
# inc_membership_person_list = inc_membership_person_list,
|
||||
# inc_membership_person_list = inc_membership_person_list,
|
||||
# inc_product_list = inc_product_list,
|
||||
inc_person = inc_person,
|
||||
inc_user = inc_user,
|
||||
)
|
||||
)
|
||||
account_obj.membership_member_list = membership_member_result_list
|
||||
else: account_obj.membership_member_list = []
|
||||
account_obj.membership_person_list = membership_person_result_list
|
||||
else: account_obj.membership_person_list = []
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_membership_type_list:
|
||||
@@ -371,7 +371,7 @@ def load_account_obj(
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_membership_member_list = inc_membership_member_list,
|
||||
inc_membership_person_list = inc_membership_person_list,
|
||||
# inc_membership_type_member_list = inc_membership_type_member_list,
|
||||
inc_product_list = inc_product_list,
|
||||
)
|
||||
@@ -551,7 +551,7 @@ def load_account_obj(
|
||||
inc_contact = inc_contact,
|
||||
inc_event_list = inc_event_list,
|
||||
inc_journal_list = inc_journal_list,
|
||||
inc_membership_member = inc_membership_member,
|
||||
inc_membership_person = inc_membership_person,
|
||||
inc_order_list = inc_order_list,
|
||||
inc_order_cart_list = inc_order_cart_list,
|
||||
inc_organization = inc_organization,
|
||||
@@ -586,10 +586,10 @@ def load_account_obj_membership_type(
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group_list: bool = False, # List of groups for the account
|
||||
inc_membership_group_member_list: bool = False, # List of members of a group
|
||||
inc_membership_member: bool = False,
|
||||
inc_membership_member_list: bool = False, # Priority l1
|
||||
inc_membership_member_profile: bool = False,
|
||||
inc_membership_group_person_list: bool = False, # List of members of a group
|
||||
inc_membership_person: bool = False,
|
||||
inc_membership_person_list: bool = False, # Priority l1
|
||||
inc_membership_person_profile: bool = False,
|
||||
inc_membership_type: bool = False,
|
||||
inc_membership_type_list: bool = False,
|
||||
inc_order: bool = False,
|
||||
@@ -603,7 +603,7 @@ def load_account_obj_membership_type(
|
||||
inc_user: bool = False,
|
||||
inc_user_list: bool = False, # Priority l2
|
||||
) -> Account_Base|dict|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 account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
|
||||
@@ -658,8 +658,8 @@ def load_account_obj_membership_type(
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_group_list = inc_membership_group_list, # per member
|
||||
inc_membership_member_list = inc_membership_member_list,
|
||||
inc_membership_member_profile = inc_membership_member_profile,
|
||||
inc_membership_person_list = inc_membership_person_list,
|
||||
inc_membership_person_profile = inc_membership_person_profile,
|
||||
inc_product_list = inc_product_list,
|
||||
inc_person = inc_person,
|
||||
inc_user = inc_user,
|
||||
@@ -690,10 +690,10 @@ def load_account_obj_membership_group(
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
# inc_membership_group_list: bool = False, # List of groups for the account
|
||||
inc_membership_group_member_list: bool = False, # List of members of a group
|
||||
inc_membership_member: bool = False,
|
||||
# inc_membership_member_list: bool = False, # Priority l1
|
||||
inc_membership_member_profile: bool = False,
|
||||
inc_membership_group_person_list: bool = False, # List of members of a group
|
||||
inc_membership_person: bool = False,
|
||||
# inc_membership_person_list: bool = False, # Priority l1
|
||||
inc_membership_person_profile: bool = False,
|
||||
inc_membership_type: bool = False,
|
||||
# inc_membership_type_list: bool = False,
|
||||
# inc_order: bool = False,
|
||||
@@ -760,8 +760,8 @@ def load_account_obj_membership_group(
|
||||
model_as_dict = model_as_dict,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
# inc_membership_member_list = inc_membership_member_list,
|
||||
inc_membership_group_member_list = inc_membership_group_member_list,
|
||||
# inc_membership_person_list = inc_membership_person_list,
|
||||
inc_membership_group_person_list = inc_membership_group_person_list,
|
||||
inc_product_list = inc_product_list,
|
||||
inc_person = inc_person,
|
||||
inc_user = inc_user,
|
||||
@@ -771,18 +771,18 @@ def load_account_obj_membership_group(
|
||||
else: account_obj.membership_group_list = []
|
||||
|
||||
# Updated 2021-06-21
|
||||
if inc_membership_member_list:
|
||||
if membership_member_rec_list_result := get_membership_member_rec_list(
|
||||
if inc_membership_person_list:
|
||||
if membership_person_rec_list_result := get_membership_person_rec_list(
|
||||
for_obj_type = 'account',
|
||||
for_obj_id = account_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
membership_member_result_list = []
|
||||
for membership_member_rec in membership_member_rec_list_result:
|
||||
membership_member_result_list.append(
|
||||
load_membership_member_obj(
|
||||
membership_member_id = membership_member_rec.get('membership_member_id', None),
|
||||
membership_person_result_list = []
|
||||
for membership_person_rec in membership_person_rec_list_result:
|
||||
membership_person_result_list.append(
|
||||
load_membership_person_obj(
|
||||
membership_person_id = membership_person_rec.get('membership_person_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
@@ -790,14 +790,14 @@ def load_account_obj_membership_group(
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
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_membership_type = inc_membership_type,
|
||||
inc_person = inc_person,
|
||||
inc_user = inc_user,
|
||||
)
|
||||
)
|
||||
account_obj.membership_member_list = membership_member_result_list
|
||||
else: account_obj.membership_member_list = []
|
||||
account_obj.membership_person_list = membership_person_result_list
|
||||
else: account_obj.membership_person_list = []
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_membership_type_list:
|
||||
@@ -819,7 +819,7 @@ def load_account_obj_membership_group(
|
||||
model_as_dict = model_as_dict,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_member_list = inc_membership_member_list,
|
||||
inc_membership_person_list = inc_membership_person_list,
|
||||
# inc_membership_type_member_list = inc_membership_type_member_list,
|
||||
inc_product_list = inc_product_list,
|
||||
inc_person = inc_person,
|
||||
|
||||
Reference in New Issue
Block a user