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

10
app/methods/account_methods.py
View File

@@ -86,7 +86,7 @@ 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_person_list: bool = False, # List of members of a group
inc_membership_person_group_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,
@@ -318,7 +318,7 @@ def load_account_obj(
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
inc_membership_person_list = inc_membership_person_list,
# inc_membership_group_person_list = inc_membership_group_person_list,
# inc_membership_person_group_list = inc_membership_person_group_list,
inc_product_list = inc_product_list,
)
)
@@ -633,7 +633,7 @@ 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_person_list: bool = False, # List of members of a group
inc_membership_person_group_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,
@@ -737,7 +737,7 @@ 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_person_list: bool = False, # List of members of a group
inc_membership_person_group_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,
@@ -808,7 +808,7 @@ def load_account_obj_membership_group(
inc_address = inc_address,
inc_contact = inc_contact,
# inc_membership_person_list = inc_membership_person_list,
inc_membership_group_person_list = inc_membership_group_person_list,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_product_list = inc_product_list,
inc_person = inc_person,
inc_user = inc_user,

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

108
app/methods/membership_group_person_methods.py → app/methods/membership_person_group_methods.py
View File

@@ -8,12 +8,12 @@ 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_person_methods import get_membership_person_rec_list, load_membership_person_obj
from app.models.membership_group_person_models import Membership_Group_Person_Base
from app.models.membership_person_group_models import Membership_Person_Group_Base
# ### BEGIN ### API Membership Group Person Methods ### load_membership_group_person_obj() ###
def load_membership_group_person_obj(
membership_group_person_id: int|str,
# ### BEGIN ### API Membership Group Person Methods ### load_membership_person_group_obj() ###
def load_membership_person_group_obj(
membership_person_group_id: int|str,
limit: int = 1000,
by_alias: bool = True,
exclude_unset: bool = True,
@@ -30,29 +30,29 @@ def load_membership_group_person_obj(
inc_product: bool = False,
# inc_product_list: bool = False,
inc_user: bool = False,
) -> Membership_Group_Person_Base|bool:
) -> Membership_Person_Group_Base|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if membership_group_person_id := redis_lookup_id_random(record_id_random=membership_group_person_id, table_name='membership_group_person'): pass
if membership_person_group_id := redis_lookup_id_random(record_id_random=membership_person_group_id, table_name='membership_person_group'): pass
else: return False
log.debug(membership_group_person_id)
log.debug(membership_person_group_id)
if membership_group_person_rec := sql_select(table_name='v_membership_group_person', record_id=membership_group_person_id):
log.debug(membership_group_person_rec)
if membership_person_group_rec := sql_select(table_name='v_membership_person_group', record_id=membership_person_group_id):
log.debug(membership_person_group_rec)
else: return False
log.debug(membership_group_person_rec)
log.debug(membership_person_group_rec)
try:
membership_group_person_obj = Membership_Group_Person_Base(**membership_group_person_rec)
log.debug(membership_group_person_obj)
membership_person_group_obj = Membership_Person_Group_Base(**membership_person_group_rec)
log.debug(membership_person_group_obj)
except ValidationError as e:
log.error(e.json())
# Updated 2021-06-21
if inc_membership_person:
from app.methods.membership_person_methods import load_membership_person_obj
membership_person_id = membership_group_person_rec.get('membership_person_id', None)
membership_person_id = membership_person_group_rec.get('membership_person_id', None)
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_person_id)
if membership_person_result := load_membership_person_obj(
@@ -70,19 +70,19 @@ def load_membership_group_person_obj(
inc_person = inc_person,
inc_user = inc_user,
):
membership_group_person_obj.membership_person = membership_person_result
else: membership_group_person_obj.membership_person = None
membership_person_group_obj.membership_person = membership_person_result
else: membership_person_group_obj.membership_person = None
log.debug(membership_person_result)
if model_as_dict:
return membership_group_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
return membership_person_group_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
else:
return membership_group_person_obj
# ### END ### API Membership Group Person Methods ### load_membership_group_person_obj() ###
return membership_person_group_obj
# ### END ### API Membership Group Person Methods ### load_membership_person_group_obj() ###
# ### BEGIN ### API Membership Group Person Methods ### get_membership_group_person_rec_list() ###
def get_membership_group_person_rec_list(
# ### BEGIN ### API Membership Group Person Methods ### get_membership_person_group_rec_list() ###
def get_membership_person_group_rec_list(
for_obj_type: str,
for_obj_id: str,
limit: int = 1000,
@@ -115,8 +115,8 @@ def get_membership_group_person_rec_list(
sql_limit = ''
sql = f"""
SELECT `tbl`.id AS 'membership_group_person_id', `tbl`.id_random AS 'membership_group_person_id_random'
FROM `membership_group_person` AS `tbl`
SELECT `tbl`.id AS 'membership_person_group_id', `tbl`.id_random AS 'membership_person_group_id_random'
FROM `membership_person_group` AS `tbl`
WHERE
{sql_obj_type_id}
{sql_enabled}
@@ -126,66 +126,66 @@ def get_membership_group_person_rec_list(
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(sql)
if membership_group_person_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
membership_group_person_rec_li = membership_group_person_rec_li_result
if membership_person_group_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
membership_person_group_rec_li = membership_person_group_rec_li_result
else:
membership_group_person_rec_li = []
membership_person_group_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_group_person_rec_li_result)
log.debug(membership_person_group_rec_li_result)
return membership_group_person_rec_li
# ### END ### API Membership Group Person Methods ### get_membership_group_person_rec_list() ###
return membership_person_group_rec_li
# ### END ### API Membership Group Person Methods ### get_membership_person_group_rec_list() ###
# ### BEGIN ### API Membership Group Person Methods ### create_membership_group_person_obj() ###
def create_membership_group_person_obj(membership_group_person_obj_new:Membership_Group_Person_Base) -> bool|int:
# ### BEGIN ### API Membership Group Person Methods ### create_membership_person_group_obj() ###
def create_membership_person_group_obj(membership_person_group_obj_new:Membership_Person_Group_Base) -> bool|int:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
membership_group_person_obj_data = membership_group_person_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
membership_person_group_obj_data = membership_person_group_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
if membership_group_person_obj_in_result := sql_insert(
data=membership_group_person_obj_data,
table_name='membership_group_person',
if membership_person_group_obj_in_result := sql_insert(
data=membership_person_group_obj_data,
table_name='membership_person_group',
rm_id_random=True,
id_random_length=8
): pass
else: return False
log.debug(membership_group_person_obj_in_result)
log.debug(membership_person_group_obj_in_result)
membership_group_person_id = membership_group_person_obj_in_result
membership_person_group_id = membership_person_group_obj_in_result
log.debug(f'New membership_group_person_id: {membership_group_person_id}')
return membership_group_person_id
# ### END ### API Membership Group Person Methods ### create_membership_group_person_obj() ###
log.debug(f'New membership_person_group_id: {membership_person_group_id}')
return membership_person_group_id
# ### END ### API Membership Group Person Methods ### create_membership_person_group_obj() ###
# ### BEGIN ### API Membership Group Person Methods ### update_membership_group_person_obj() ###
def update_membership_group_person_obj(
membership_group_person_id: int|str, # This allows for updating of the id_random value.
membership_group_person_obj_up: Membership_Group_Person_Base,
# ### BEGIN ### API Membership Group Person Methods ### update_membership_person_group_obj() ###
def update_membership_person_group_obj(
membership_person_group_id: int|str, # This allows for updating of the id_random value.
membership_person_group_obj_up: Membership_Person_Group_Base,
create_sub_obj: bool = False,
) -> bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if membership_group_person_id := redis_lookup_id_random(record_id_random=membership_group_person_id, table_name='membership_group_person'): pass
if membership_person_group_id := redis_lookup_id_random(record_id_random=membership_person_group_id, table_name='membership_person_group'): pass
else: return False
membership_group_person_obj_up.id = membership_group_person_id
membership_person_group_obj_up.id = membership_person_group_id
log.debug(membership_group_person_obj_up)
log.debug(membership_group_person_obj_up.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_group_person_obj_up.dict(by_alias=False, exclude_unset=False))
log.debug(membership_person_group_obj_up)
log.debug(membership_person_group_obj_up.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_person_group_obj_up.dict(by_alias=False, exclude_unset=False))
membership_group_person_dict_up = membership_group_person_obj_up.dict(by_alias=False, exclude_unset=True)
log.debug(membership_group_person_dict_up)
membership_person_group_dict_up = membership_person_group_obj_up.dict(by_alias=False, exclude_unset=True)
log.debug(membership_person_group_dict_up)
if membership_group_person_obj_up_result := sql_update(data=membership_group_person_dict_up, table_name='membership_group_person', rm_id_random=True):
log.debug(membership_group_person_obj_up_result)
if membership_person_group_obj_up_result := sql_update(data=membership_person_group_dict_up, table_name='membership_person_group', rm_id_random=True):
log.debug(membership_person_group_obj_up_result)
return True
else:
log.debug(membership_group_person_obj_up_result)
log.debug(membership_person_group_obj_up_result)
return False
# ### END ### API Membership Group Person Methods ### update_membership_group_person_obj() ###
# ### END ### API Membership Group Person Methods ### update_membership_person_group_obj() ###

205
app/methods/membership_person_methods.py
View File

@@ -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

134
app/methods/membership_type_person_methods.py → app/methods/membership_person_type_methods.py
View File

@@ -10,13 +10,13 @@ from app.lib_general import log, logging
from app.methods.membership_cfg_methods import load_membership_cfg_obj
from app.methods.product_methods import get_product_rec_list, load_product_obj
from app.models.membership_type_person_models import Membership_Type_Person_Base
from app.models.membership_person_type_models import Membership_Person_Type_Base
# ### BEGIN ### API Membership Type Person Methods ### load_membership_type_person_obj() ###
# ### BEGIN ### API Membership Type Person Methods ### load_membership_person_type_obj() ###
# Updated 2021-07-09
def load_membership_type_person_obj(
membership_type_person_id: int|str,
def load_membership_person_type_obj(
membership_person_type_id: int|str,
limit: int = 1000,
by_alias: bool = True,
exclude_unset: bool = True,
@@ -33,40 +33,40 @@ def load_membership_type_person_obj(
inc_product_list: bool = False,
inc_person: bool = False,
inc_user: bool = False,
) -> Membership_Type_Person_Base|bool:
) -> Membership_Person_Type_Base|bool:
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if membership_type_person_id := redis_lookup_id_random(record_id_random=membership_type_person_id, table_name='membership_type_person'): pass
if membership_person_type_id := redis_lookup_id_random(record_id_random=membership_person_type_id, table_name='membership_person_type'): pass
else: return False
log.debug(membership_type_person_id)
log.debug(membership_person_type_id)
if membership_type_person_rec := sql_select(table_name='v_membership_type_person', record_id=membership_type_person_id):
log.debug(membership_type_person_rec)
if membership_person_type_rec := sql_select(table_name='v_membership_person_type', record_id=membership_person_type_id):
log.debug(membership_person_type_rec)
else: return False
log.debug(membership_type_person_rec)
log.debug(membership_person_type_rec)
try:
membership_type_person_obj = Membership_Type_Person_Base(**membership_type_person_rec)
log.debug(membership_type_person_obj)
membership_person_type_obj = Membership_Person_Type_Base(**membership_person_type_rec)
log.debug(membership_person_type_obj)
except ValidationError as e:
log.error(e.json())
# Updated 2021-06-24
if inc_membership_cfg:
if membership_cfg_obj_result := load_membership_cfg_obj(
account_id = membership_type_person_rec.get('account_id', None),
account_id = membership_person_type_rec.get('account_id', None),
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
):
membership_type_person_obj.membership_cfg = membership_cfg_obj_result
else: membership_type_person_obj.membership_cfg = None
membership_person_type_obj.membership_cfg = membership_cfg_obj_result
else: membership_person_type_obj.membership_cfg = None
# Updated 2021-06-21
if inc_membership_person:
from app.methods.membership_person_methods import load_membership_person_obj
membership_person_id = membership_type_person_rec.get('membership_person_id', None)
membership_person_id = membership_person_type_rec.get('membership_person_id', None)
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_person_id)
if membership_person_result := load_membership_person_obj(
@@ -84,14 +84,14 @@ def load_membership_type_person_obj(
inc_person = inc_person,
inc_user = inc_user,
):
membership_type_person_obj.membership_person = membership_person_result
else: membership_type_person_obj.membership_person = None
membership_person_type_obj.membership_person = membership_person_result
else: membership_person_type_obj.membership_person = None
log.debug(membership_person_result)
# Updated 2021-07-09
if inc_membership_type: # The primary membership type for the person
from app.methods.membership_type_methods import load_membership_type_obj
membership_type_id = membership_type_person_rec.get('membership_type_id', None)
membership_type_id = membership_person_type_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,
@@ -103,13 +103,13 @@ def load_membership_type_person_obj(
# inc_membership_cfg = inc_membership_cfg,
inc_product_list = inc_product_list,
):
membership_type_person_obj.membership_type = membership_type_result
else: membership_type_person_obj.membership_type = None
membership_person_type_obj.membership_type = membership_type_result
else: membership_person_type_obj.membership_type = None
log.debug(membership_type_result)
# Updated 2021-07-09
if inc_product:
product_id = membership_type_person_rec.get('product_id', None)
product_id = membership_person_type_rec.get('product_id', None)
log.debug(product_id)
if product_result := load_product_obj(
product_id = product_id,
@@ -117,19 +117,19 @@ def load_membership_type_person_obj(
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
):
membership_type_person_obj.product = product_result
else: membership_type_person_obj.product = None
membership_person_type_obj.product = product_result
else: membership_person_type_obj.product = None
log.debug(product_result)
if model_as_dict:
return membership_type_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
return membership_person_type_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
else:
return membership_type_person_obj
# ### END ### API Membership Type Person Methods ### load_membership_type_person_obj() ###
return membership_person_type_obj
# ### END ### API Membership Type Person Methods ### load_membership_person_type_obj() ###
# ### BEGIN ### API Membership Type Person Methods ### get_membership_type_person_rec_list() ###
def get_membership_type_person_rec_list(
# ### BEGIN ### API Membership Type Person Methods ### get_membership_person_type_rec_list() ###
def get_membership_person_type_rec_list(
for_obj_type: str,
for_obj_id: str,
limit: int = 1000,
@@ -162,8 +162,8 @@ def get_membership_type_person_rec_list(
sql_limit = ''
sql = f"""
SELECT `tbl`.id AS 'membership_type_person_id', `tbl`.id_random AS 'membership_type_person_id_random'
FROM `membership_type_person` AS `tbl`
SELECT `tbl`.id AS 'membership_person_type_id', `tbl`.id_random AS 'membership_person_type_id_random'
FROM `membership_person_type` AS `tbl`
WHERE
{sql_obj_type_id}
{sql_enabled}
@@ -173,21 +173,21 @@ def get_membership_type_person_rec_list(
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(sql)
if membership_type_person_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
membership_type_person_rec_li = membership_type_person_rec_li_result
if membership_person_type_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
membership_person_type_rec_li = membership_person_type_rec_li_result
else:
membership_type_person_rec_li = []
membership_person_type_rec_li = []
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_type_person_rec_li_result)
log.debug(membership_person_type_rec_li_result)
return membership_type_person_rec_li
# ### END ### API Membership Type Person Methods ### get_membership_type_person_rec_list() ###
return membership_person_type_rec_li
# ### END ### API Membership Type Person Methods ### get_membership_person_type_rec_list() ###
# ### BEGIN ### API Membership Type Person Methods ### create_membership_type_person_obj() ###
def create_membership_type_person_obj(
# ### BEGIN ### API Membership Type Person Methods ### create_membership_person_type_obj() ###
def create_membership_person_type_obj(
membership_person_id: int|str,
membership_type_person_dict_obj: Membership_Type_Person_Base,
membership_person_type_dict_obj: Membership_Person_Type_Base,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False,
) -> bool|int:
@@ -201,62 +201,62 @@ def create_membership_type_person_obj(
log.info(f'Membership Person ID: {membership_person_id}')
return False
membership_type_person_obj = membership_type_person_dict_obj
membership_person_type_obj = membership_person_type_dict_obj
# Stuff goes here
membership_type_person_obj_data = membership_type_person_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
membership_person_type_obj_data = membership_person_type_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
membership_type_person_obj_data['membership_person_id'] = membership_person_id
membership_person_type_obj_data['membership_person_id'] = membership_person_id
if membership_type_person_obj_in_result := sql_insert(
data = membership_type_person_obj_data,
table_name = 'membership_type_person',
if membership_person_type_obj_in_result := sql_insert(
data = membership_person_type_obj_data,
table_name = 'membership_person_type',
rm_id_random = True,
id_random_length = 8
): pass
else: return False
log.debug(membership_type_person_obj_in_result)
log.debug(membership_person_type_obj_in_result)
membership_type_person_id = membership_type_person_obj_in_result
membership_person_type_id = membership_person_type_obj_in_result
log.debug(f'New membership_type_person_id: {membership_type_person_id}')
return membership_type_person_id
# ### END ### API Membership Type Person Methods ### create_membership_type_person_obj() ###
log.debug(f'New membership_person_type_id: {membership_person_type_id}')
return membership_person_type_id
# ### END ### API Membership Type Person Methods ### create_membership_person_type_obj() ###
# ### BEGIN ### API Membership Type Person Methods ### update_membership_type_person_obj() ###
def update_membership_type_person_obj(
membership_type_person_id: int|str, # This allows for updating of the id_random value.
membership_type_person_dict_obj: Membership_Type_Person_Base,
# ### BEGIN ### API Membership Type Person Methods ### update_membership_person_type_obj() ###
def update_membership_person_type_obj(
membership_person_type_id: int|str, # This allows for updating of the id_random value.
membership_person_type_dict_obj: Membership_Person_Type_Base,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False,
) -> bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if membership_type_person_id := redis_lookup_id_random(record_id_random=membership_type_person_id, table_name='membership_type_person'): pass
if membership_person_type_id := redis_lookup_id_random(record_id_random=membership_person_type_id, table_name='membership_person_type'): pass
else: return False
# Stuff goes here
membership_type_person_dict_obj.id = membership_type_person_id
membership_person_type_dict_obj.id = membership_person_type_id
membership_type_person_obj = membership_type_person_dict_obj
membership_person_type_obj = membership_person_type_dict_obj
log.debug(membership_type_person_obj)
log.debug(membership_type_person_obj.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_type_person_obj.dict(by_alias=False, exclude_unset=False))
log.debug(membership_person_type_obj)
log.debug(membership_person_type_obj.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_person_type_obj.dict(by_alias=False, exclude_unset=False))
membership_type_person_dict = membership_type_person_obj.dict(by_alias=False, exclude_unset=True)
log.debug(membership_type_person_dict)
membership_person_type_dict = membership_person_type_obj.dict(by_alias=False, exclude_unset=True)
log.debug(membership_person_type_dict)
if membership_type_person_obj_up_result := sql_update(data=membership_type_person_dict, table_name='membership_type_person', rm_id_random=True):
log.debug(membership_type_person_obj_up_result)
if membership_person_type_obj_up_result := sql_update(data=membership_person_type_dict, table_name='membership_person_type', rm_id_random=True):
log.debug(membership_person_type_obj_up_result)
return True
else:
log.debug(membership_type_person_obj_up_result)
log.debug(membership_person_type_obj_up_result)
return False
# ### END ### API Membership Type Person Methods ### update_membership_type_person_obj() ###
# ### END ### API Membership Type Person Methods ### update_membership_person_type_obj() ###

2
app/methods/membership_type_methods.py
View File

@@ -26,7 +26,7 @@ def load_membership_type_obj(
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # under membership_person
inc_membership_group_person_list: bool = False,
inc_membership_person_group_list: bool = False,
inc_membership_person_list: bool = False,
inc_membership_person_profile: bool = False, # under membership_person
inc_organization: bool = False,

6
app/methods/person_methods.py
View File

@@ -38,15 +38,15 @@ def load_person_obj(
inc_membership_group: bool = False,
inc_membership_person_group: bool = False,
inc_membership_group_list: bool = False,
inc_membership_group_person_list: bool = False,
inc_membership_person_group_list: bool = False,
inc_membership_person: bool = False, # NOTE: Same as inc_membership_person_list
inc_membership_person_list: bool = False, # NOTE: Same as inc_membership_person
inc_membership_person_profile: bool = False,
inc_membership_person_profile_cust: bool = False,
inc_membership_type: bool = False,
inc_membership_type_person: bool = False,
inc_membership_person_type: bool = False,
inc_membership_type_list: bool = False,
inc_membership_type_person_list: bool = False,
inc_membership_person_type_list: bool = False,
inc_order_cfg: bool = False,
inc_order_closed_count: bool = False,
inc_order_line_list: bool = False,