diff --git a/app/methods/account_methods.py b/app/methods/account_methods.py index 6b486f4..32f1f18 100644 --- a/app/methods/account_methods.py +++ b/app/methods/account_methods.py @@ -84,7 +84,8 @@ def load_account_obj( inc_journal_list: bool = False, # Priority l3 inc_journal_entry_list: bool = False, # Priority l3 inc_membership_cfg: bool = False, - inc_membership_group_list: 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, diff --git a/app/methods/membership_group_methods.py b/app/methods/membership_group_methods.py index c55e595..03604fe 100644 --- a/app/methods/membership_group_methods.py +++ b/app/methods/membership_group_methods.py @@ -45,7 +45,7 @@ def load_membership_group_obj( inc_address: bool = False, inc_contact: bool = False, inc_membership_cfg: bool = False, - inc_membership_member_list: bool = False, + inc_membership_group_member_list: bool = False, inc_membership_member_profile: bool = False, # under membership_member inc_membership_type_list: bool = False, # ??? # inc_parent_membership_group: bool = False, @@ -81,6 +81,36 @@ def load_membership_group_obj( ) membership_group_rec['cfg'] = membership_cfg_result + + # Updated 2021-06-18 + if inc_membership_group_member_list: + if membership_group_member_rec_list_result := get_membership_group_member_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: + membership_group_member_result_list.append( + load_membership_group_member_obj( + membership_group_member_id = membership_group_member_rec.get('membership_group_member_id', None), + limit = limit, + by_alias = by_alias, + exclude_unset = exclude_unset, + model_as_dict = model_as_dict, + enabled = enabled, + # inc_membership_group_list = inc_membership_group_list, + # inc_membership_group_member_profile = inc_membership_group_member_profile, + # inc_organization = inc_organization, + inc_person = inc_person, + # inc_product = inc_product, + inc_user = inc_user, + ) + ) + membership_type_obj.membership_group_member_list = membership_group_member_result_list + else: membership_type_obj.membership_group_member_list = [] + # Updated 2021-06-18 # if inc_parent_membership_group: # parent_membership_group_id = membership_group_rec.get('parent_membership_group_id', None) diff --git a/app/methods/membership_member_methods.py b/app/methods/membership_member_methods.py index 8f558e7..cdf6f94 100644 --- a/app/methods/membership_member_methods.py +++ b/app/methods/membership_member_methods.py @@ -231,7 +231,7 @@ def load_membership_member_obj( inc_address = inc_address, inc_contact = inc_contact, # inc_membership = inc_membership, - # inc_organization = inc_organization, + inc_organization = inc_organization, ): membership_member_obj.membership_member_profile = membership_member_profile_result else: membership_member_obj.membership_member_profile = None diff --git a/app/methods/membership_member_profile_methods.py b/app/methods/membership_member_profile_methods.py index f6abed5..126dbe6 100644 --- a/app/methods/membership_member_profile_methods.py +++ b/app/methods/membership_member_profile_methods.py @@ -16,6 +16,7 @@ def load_membership_member_profile_obj( by_alias: bool = True, exclude_unset: bool = True, model_as_dict: bool = False, + inc_address: bool = False, inc_contact: bool = False, inc_organization: bool = False, ) -> Membership_Member_Profile_Base|dict|bool: