Code clean up. Membership tables, views, routes, methods, and models renamed.
This commit is contained in:
Scott Idem
@@ -9,9 +9,9 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_insert_or_update,
|
||||
|
||||
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_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.membership_person_profile_methods import get_membership_person_profile_rec_list, load_membership_person_profile_obj
|
||||
from app.methods.membership_type_person_methods import create_membership_type_person_obj, update_membership_type_person_obj
|
||||
from app.methods.membership_person_type_methods import create_membership_person_type_obj, update_membership_person_type_obj
|
||||
from app.methods.person_methods import load_person_obj
|
||||
from app.methods.product_methods import load_product_obj
|
||||
from app.methods.user_methods import load_user_obj
|
||||
@@ -20,10 +20,10 @@ from app.models.membership_person_models import Membership_Person_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person Methods ### load_membership_person_obj() ###
|
||||
# Updated 2021-12-16
|
||||
# Updated 2022-01-11
|
||||
def load_membership_person_obj(
|
||||
membership_person_id:int|str,
|
||||
limit: int = 1000,
|
||||
limit: int = 100,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
@@ -31,22 +31,23 @@ def load_membership_person_obj(
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group: bool = False, # Their primary membership group
|
||||
inc_membership_group_list: bool = False, # The list of membership groups the person is a part of
|
||||
inc_membership_group_person: bool = False, # The person information for their primary membership group
|
||||
inc_membership_group_person_list: bool = False, # The person information for all of their membership groups
|
||||
inc_membership_person_profile: bool = False,
|
||||
inc_membership_person_profile_cust: bool = False, # Extended profile?
|
||||
inc_membership_type: bool = False, # Their primary membership type
|
||||
inc_membership_type_list: bool = False, # The list of membership types the person is a part of
|
||||
inc_membership_type_person: bool = False, # The person information for their primary membership type
|
||||
inc_membership_type_person_list: bool = False, # The person information for all of their membership types
|
||||
# inc_order: bool = False,
|
||||
inc_organization: bool = False,
|
||||
# inc_membership_group: bool = False, # Their primary membership group
|
||||
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
|
||||
# inc_membership_person_group: bool = False, # The person information for their primary membership group
|
||||
# inc_membership_person_group_list: bool = False, # The person information for all of their membership groups
|
||||
# inc_membership_person_profile: bool = False,
|
||||
# inc_membership_person_profile_cust: bool = False, # Extended profile?
|
||||
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
|
||||
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
|
||||
# inc_membership_type_list: bool = False, # The list of membership types the person is a part of
|
||||
# inc_membership_person_type: bool = False, # The person information for their primary membership type
|
||||
# inc_membership_person_type_list: bool = False, # The person information for all of their membership types
|
||||
inc_order: bool = False,
|
||||
# inc_organization: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_product: bool = False, # The product the person actually purchased for a member_type or member_group
|
||||
inc_product_list: bool = False, # The list of products that give access to a member_type or member_group
|
||||
inc_user: bool = False,
|
||||
# inc_user: bool = False,
|
||||
) -> Membership_Person_Base:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
@@ -111,38 +112,38 @@ def load_membership_person_obj(
|
||||
else: membership_person_obj.membership_group_list = []
|
||||
|
||||
# Updated 2021-07-09
|
||||
if inc_membership_group_person_list: # The person information for the list of groups the member is a part of
|
||||
if membership_group_person_rec_list_result := get_membership_group_person_rec_list(
|
||||
for_obj_type = 'membership_person',
|
||||
for_obj_id = membership_person_id,
|
||||
# membership_person_id = membership_person_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),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
# inc_membership_group_person_list = inc_membership_group_person_list,
|
||||
# inc_membership_person_profile = inc_membership_person_profile,
|
||||
# inc_organization = inc_organization,
|
||||
# inc_person = inc_person,
|
||||
inc_product = inc_product,
|
||||
# inc_product_list = inc_product_list,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
membership_group_person_result_list.append(load_membership_group_person_result)
|
||||
else: membership_group_person_result_list.append(None)
|
||||
membership_person_obj.membership_group_person_list = membership_group_person_result_list
|
||||
else: membership_person_obj.membership_group_person_list = []
|
||||
# if inc_membership_person_group_list: # The person information for the list of groups the member is a part of
|
||||
# if membership_person_group_rec_list_result := get_membership_person_group_rec_list(
|
||||
# for_obj_type = 'membership_person',
|
||||
# for_obj_id = membership_person_id,
|
||||
# # membership_person_id = membership_person_id,
|
||||
# limit = limit,
|
||||
# enabled = enabled,
|
||||
# ):
|
||||
# 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,
|
||||
# model_as_dict = model_as_dict,
|
||||
# enabled = enabled,
|
||||
# # inc_membership_person_group_list = inc_membership_person_group_list,
|
||||
# # inc_membership_person_profile = inc_membership_person_profile,
|
||||
# # inc_organization = inc_organization,
|
||||
# # inc_person = inc_person,
|
||||
# inc_product = inc_product,
|
||||
# # inc_product_list = inc_product_list,
|
||||
# # inc_user = inc_user,
|
||||
# ):
|
||||
# membership_person_group_result_list.append(load_membership_person_group_result)
|
||||
# else: membership_person_group_result_list.append(None)
|
||||
# membership_person_obj.membership_person_group_list = membership_person_group_result_list
|
||||
# else: membership_person_obj.membership_person_group_list = []
|
||||
|
||||
# Updated 2021-06-21
|
||||
if inc_membership_person_profile:
|
||||
if inc_membership_profile:
|
||||
membership_person_profile_id = membership_person_rec.get('membership_person_profile_id', None)
|
||||
log.debug(membership_person_profile_id)
|
||||
if membership_person_profile_result := load_membership_person_profile_obj(
|
||||
@@ -186,26 +187,26 @@ def load_membership_person_obj(
|
||||
if inc_membership_type_list: pass # All of the membership types the person is a part of
|
||||
|
||||
# Updated 2021-07-09
|
||||
if inc_membership_type_person: # The primary membership type person information for the person
|
||||
from app.methods.membership_type_person_methods import load_membership_type_person_obj
|
||||
membership_type_person_id = membership_person_rec.get('membership_type_person_id', None)
|
||||
log.debug(membership_type_person_id)
|
||||
if membership_type_person_result := load_membership_type_person_obj(
|
||||
membership_type_person_id = membership_type_person_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_membership_cfg = inc_membership_cfg,
|
||||
inc_membership_type = inc_membership_type,
|
||||
inc_product = inc_product,
|
||||
):
|
||||
membership_person_obj.membership_type_person = membership_type_person_result
|
||||
else: membership_person_obj.membership_type_person = {} # None
|
||||
log.debug(membership_type_person_result)
|
||||
# if inc_membership_person_type: # The primary membership type person information for the person
|
||||
# from app.methods.membership_person_type_methods import load_membership_person_type_obj
|
||||
# membership_person_type_id = membership_person_rec.get('membership_person_type_id', None)
|
||||
# log.debug(membership_person_type_id)
|
||||
# if membership_person_type_result := load_membership_person_type_obj(
|
||||
# membership_person_type_id = membership_person_type_id,
|
||||
# limit = limit,
|
||||
# by_alias = by_alias,
|
||||
# exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
# enabled = enabled,
|
||||
# inc_membership_cfg = inc_membership_cfg,
|
||||
# inc_membership_type = inc_membership_type,
|
||||
# inc_product = inc_product,
|
||||
# ):
|
||||
# membership_person_obj.membership_person_type = membership_person_type_result
|
||||
# else: membership_person_obj.membership_person_type = {} # None
|
||||
# log.debug(membership_person_type_result)
|
||||
|
||||
if inc_membership_type_person_list: pass # All of the membership type person records for a person
|
||||
# if inc_membership_person_type_list: pass # All of the membership type person records for a person
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_person:
|
||||
@@ -240,22 +241,22 @@ def load_membership_person_obj(
|
||||
log.debug(product_result)
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_user:
|
||||
log.warning(f'This is being deprecated? load_membership_person_obj() inc_user')
|
||||
user_id = membership_person_rec.get('user_id', None)
|
||||
if user_result := load_user_obj(
|
||||
user_id = user_id,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
# inc_address = inc_address,
|
||||
# inc_contact = inc_contact,
|
||||
# inc_organization = inc_organization,
|
||||
# inc_person = inc_person,
|
||||
):
|
||||
membership_person_obj.user = user_result
|
||||
else: membership_person_obj.user = {} # None
|
||||
log.debug(user_result)
|
||||
# if inc_user:
|
||||
# log.warning(f'This is being deprecated? load_membership_person_obj() inc_user')
|
||||
# user_id = membership_person_rec.get('user_id', None)
|
||||
# if user_result := load_user_obj(
|
||||
# user_id = user_id,
|
||||
# by_alias = by_alias,
|
||||
# exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
# # inc_address = inc_address,
|
||||
# # inc_contact = inc_contact,
|
||||
# # inc_organization = inc_organization,
|
||||
# # inc_person = inc_person,
|
||||
# ):
|
||||
# membership_person_obj.user = user_result
|
||||
# else: membership_person_obj.user = {} # None
|
||||
# log.debug(user_result)
|
||||
|
||||
if model_as_dict:
|
||||
return membership_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
@@ -416,7 +417,7 @@ def create_membership_person_obj(
|
||||
else:
|
||||
membership_person_obj = membership_person_dict_obj # Assume it is an object model
|
||||
|
||||
membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_group_person_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_type_person', 'person', 'product', 'user', 'created_on', 'updated_on'})
|
||||
membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_person_group_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_person_type', 'person', 'product', 'user', 'created_on', 'updated_on'})
|
||||
log.debug(membership_person_dict)
|
||||
membership_person_dict['account_id'] = account_id
|
||||
|
||||
@@ -478,7 +479,7 @@ def update_membership_person_obj(
|
||||
else:
|
||||
membership_person_obj = membership_person_dict_obj # Assume it is an object model
|
||||
|
||||
membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_group_person_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_type_person', 'person', 'product', 'user', 'created_on', 'updated_on'})
|
||||
membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_person_group_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_person_type', 'person', 'product', 'user', 'created_on', 'updated_on'})
|
||||
log.debug(membership_person_dict)
|
||||
|
||||
if membership_person_dict_up_result := sql_update(data=membership_person_dict, table_name='membership_person', rm_id_random=True, id_random_length=8): pass
|
||||
@@ -499,37 +500,37 @@ def update_membership_person_obj(
|
||||
membership_person_outline['membership_person_profile_id'] = None
|
||||
|
||||
# NOTE: Use object model version because of better type checking and validations
|
||||
if membership_person_obj.membership_type_person:
|
||||
membership_person_outline['membership_type_person_id'] = None
|
||||
membership_type_person_obj = membership_person_obj.membership_type_person
|
||||
if membership_type_person_id := membership_person_obj.membership_type_person_id: pass
|
||||
elif membership_type_person_id := membership_type_person_obj.id: pass
|
||||
else: membership_type_person_id = None
|
||||
if membership_person_obj.membership_person_type:
|
||||
membership_person_outline['membership_person_type_id'] = None
|
||||
membership_person_type_obj = membership_person_obj.membership_person_type
|
||||
if membership_person_type_id := membership_person_obj.membership_person_type_id: pass
|
||||
elif membership_person_type_id := membership_person_type_obj.id: pass
|
||||
else: membership_person_type_id = None
|
||||
|
||||
membership_type_person_obj.membership_type_id = 6
|
||||
membership_person_type_obj.membership_type_id = 6
|
||||
|
||||
if membership_type_person_id:
|
||||
update_membership_type_person_obj_result = update_membership_type_person_obj(
|
||||
membership_type_person_dict_obj = membership_type_person_obj,
|
||||
membership_type_person_id = membership_type_person_id,
|
||||
if membership_person_type_id:
|
||||
update_membership_person_type_obj_result = update_membership_person_type_obj(
|
||||
membership_person_type_dict_obj = membership_person_type_obj,
|
||||
membership_person_type_id = membership_person_type_id,
|
||||
fail_any = fail_any,
|
||||
return_outline = return_outline,
|
||||
)
|
||||
if update_membership_type_person_obj_result:
|
||||
membership_person_outline['membership_type_person_id'] = membership_type_person_id
|
||||
if update_membership_person_type_obj_result:
|
||||
membership_person_outline['membership_person_type_id'] = membership_person_type_id
|
||||
pass
|
||||
else:
|
||||
pass
|
||||
else:
|
||||
create_membership_type_person_obj_result = create_membership_type_person_obj(
|
||||
membership_type_person_dict_obj = membership_type_person_obj,
|
||||
create_membership_person_type_obj_result = create_membership_person_type_obj(
|
||||
membership_person_type_dict_obj = membership_person_type_obj,
|
||||
membership_person_id = membership_person_id,
|
||||
fail_any = fail_any,
|
||||
return_outline = return_outline,
|
||||
)
|
||||
if isinstance(create_membership_type_person_obj_result, int):
|
||||
membership_type_person_id = create_membership_type_person_obj_result
|
||||
membership_person_outline['membership_type_person_id'] = membership_type_person_id
|
||||
if isinstance(create_membership_person_type_obj_result, int):
|
||||
membership_person_type_id = create_membership_person_type_obj_result
|
||||
membership_person_outline['membership_person_type_id'] = membership_person_type_id
|
||||
else:
|
||||
pass
|
||||
|
||||
|
||||
Reference in New Issue
Block a user