Working on membership module routes, methods, and models

This commit is contained in:
Scott Idem
2021-06-21 17:53:04 -04:00
parent ce44e93b4d
commit 728682a07f
22 changed files with 1184 additions and 267 deletions

View File

@@ -8,7 +8,7 @@ from app.lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_insert_or_update, sql_select
from app.methods.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj
from app.methods.membership_profile_methods import get_membership_profile_rec_list, load_membership_profile_obj
from app.methods.membership_member_profile_methods import get_membership_member_profile_rec_list, load_membership_member_profile_obj
from app.methods.person_methods import load_person_obj
from app.methods.user_methods import load_user_obj
@@ -174,8 +174,9 @@ def load_membership_member_obj(
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False,
inc_membership_profile: bool = False,
# inc_membership_profile_cust: bool = False,
inc_membership_member_profile: bool = False,
inc_membership_type: bool = False,
# inc_membership_member_profile_cust: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
inc_user: bool = False,
@@ -218,12 +219,12 @@ def load_membership_member_obj(
membership_member_obj.membership_group_list = membership_group_result_list
else: membership_member_obj.membership_group_list = []
# Updated 2021-06-18
if inc_membership_profile:
membership_profile_id = membership_member_rec.get('membership_profile_id', None)
log.debug(membership_profile_id)
if membership_profile_result := load_membership_profile_obj(
membership_profile_id = membership_profile_id,
# Updated 2021-06-21
if inc_membership_member_profile:
membership_member_profile_id = membership_member_rec.get('membership_member_profile_id', None)
log.debug(membership_member_profile_id)
if membership_member_profile_result := load_membership_member_profile_obj(
membership_member_profile_id = membership_member_profile_id,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
@@ -232,9 +233,27 @@ def load_membership_member_obj(
# inc_membership = inc_membership,
# inc_organization = inc_organization,
):
membership_member_obj.membership_profile = membership_profile_result
else: membership_member_obj.membership_profile = None
log.debug(membership_profile_result)
membership_member_obj.membership_member_profile = membership_member_profile_result
else: membership_member_obj.membership_member_profile = None
log.debug(membership_member_profile_result)
# Updated 2021-06-18
if inc_membership_type:
membership_type_id = membership_member_rec.get('membership_type_id', None)
log.debug(membership_type_id)
if membership_type_result := load_membership_type_obj(
membership_type_id = membership_type_id,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
inc_address = inc_address,
inc_contact = inc_contact,
# inc_membership = inc_membership,
# inc_organization = inc_organization,
):
membership_member_obj.membership_type = membership_type_result
else: membership_member_obj.membership_type = None
log.debug(membership_type_result)
# Updated 2021-06-18
if inc_person: