A lot of changes related to person and membership
This commit is contained in:
@@ -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,
|
||||
|
||||
@@ -53,7 +53,7 @@ def get_address_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -55,7 +55,7 @@ def get_archive_content_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -78,7 +78,7 @@ def get_archive_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -15,7 +15,7 @@ from app.models.contact_models import Contact_Base
|
||||
|
||||
# ### BEGIN ### API Contact Methods ### load_contact_obj() ###
|
||||
def load_contact_obj(
|
||||
contact_id:int|str,
|
||||
contact_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
@@ -23,7 +23,7 @@ def load_contact_obj(
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_address:bool=False
|
||||
) -> Contact_Base|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 contact_id := redis_lookup_id_random(record_id_random=contact_id, table_name='contact'): pass
|
||||
@@ -67,10 +67,10 @@ def get_contact_rec_list(
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|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 for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
@@ -108,7 +108,7 @@ def get_contact_rec_list(
|
||||
contact_rec_li = contact_rec_li_result
|
||||
else:
|
||||
contact_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(contact_rec_li_result)
|
||||
|
||||
return contact_rec_li
|
||||
|
||||
@@ -258,7 +258,7 @@ def get_event_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -261,7 +261,7 @@ def get_hosted_file_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -113,7 +113,7 @@ def get_journal_entry_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -143,7 +143,7 @@ def get_journal_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -31,9 +31,9 @@ def load_membership_cfg_obj(
|
||||
): pass
|
||||
else: return False
|
||||
# log.debug(membership_cfg_rec)
|
||||
log.debug(type(membership_cfg_rec['extended_membership_member_profile']))
|
||||
log.debug(membership_cfg_rec['extended_membership_member_profile'])
|
||||
membership_cfg_rec['extended_membership_member_profile'] = str(membership_cfg_rec['extended_membership_member_profile'], )
|
||||
log.debug(type(membership_cfg_rec['extended_membership_person_profile']))
|
||||
log.debug(membership_cfg_rec['extended_membership_person_profile'])
|
||||
membership_cfg_rec['extended_membership_person_profile'] = str(membership_cfg_rec['extended_membership_person_profile'], )
|
||||
|
||||
try:
|
||||
membership_cfg_obj = Membership_Cfg_Base(**membership_cfg_rec)
|
||||
|
||||
@@ -1,189 +0,0 @@
|
||||
from __future__ import annotations
|
||||
import datetime
|
||||
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
from app.lib_general import log, logging
|
||||
# from app.methods.membership_member_methods import get_membership_member_rec_list, load_membership_member_obj
|
||||
|
||||
from app.models.membership_group_member_models import Membership_Group_Member_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Group Member Methods ### load_membership_group_member_obj() ###
|
||||
def load_membership_group_member_obj(
|
||||
membership_group_member_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_group: bool = False,
|
||||
inc_membership_member: bool = False,
|
||||
inc_membership_member_profile: bool = False,
|
||||
inc_membership_type: bool = False,
|
||||
inc_organization: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_user: bool = False,
|
||||
) -> Membership_Group_Member_Base|bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_group_member_id := redis_lookup_id_random(record_id_random=membership_group_member_id, table_name='membership_group_member'): pass
|
||||
else: return False
|
||||
log.debug(membership_group_member_id)
|
||||
|
||||
if membership_group_member_rec := sql_select(table_name='v_membership_group_member', record_id=membership_group_member_id):
|
||||
log.debug(membership_group_member_rec)
|
||||
else: return False
|
||||
log.debug(membership_group_member_rec)
|
||||
|
||||
try:
|
||||
membership_group_member_obj = Membership_Group_Member_Base(**membership_group_member_rec)
|
||||
log.debug(membership_group_member_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
# Updated 2021-06-21
|
||||
if inc_membership_member:
|
||||
from app.methods.membership_member_methods import load_membership_member_obj
|
||||
membership_member_id = membership_group_member_rec.get('membership_member_id', None)
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_member_id)
|
||||
if membership_member_result := load_membership_member_obj(
|
||||
membership_member_id = membership_member_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_member_profile = inc_membership_member_profile,
|
||||
inc_membership_type = inc_membership_type,
|
||||
inc_organization = inc_organization,
|
||||
inc_person = inc_person,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
membership_group_member_obj.membership_member = membership_member_result
|
||||
else: membership_group_member_obj.membership_member = None
|
||||
log.debug(membership_member_result)
|
||||
|
||||
if model_as_dict:
|
||||
return membership_group_member_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return membership_group_member_obj
|
||||
# ### END ### API Membership Group Member Methods ### load_membership_group_member_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Group Member Methods ### get_membership_group_member_rec_list() ###
|
||||
def get_membership_group_member_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
# data['for_obj_type'] = for_obj_type
|
||||
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'membership_group_member_id', `tbl`.id_random AS 'membership_group_member_id_random'
|
||||
FROM `membership_group_member` AS `tbl`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(sql)
|
||||
|
||||
if membership_group_member_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
membership_group_member_rec_li = membership_group_member_rec_li_result
|
||||
else:
|
||||
membership_group_member_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_group_member_rec_li_result)
|
||||
|
||||
return membership_group_member_rec_li
|
||||
# ### END ### API Membership Group Member Methods ### get_membership_group_member_rec_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Group Member Methods ### create_membership_group_member_obj() ###
|
||||
def create_membership_group_member_obj(membership_group_member_obj_new:Membership_Group_Member_Base) -> bool|int:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
membership_group_member_obj_data = membership_group_member_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
|
||||
|
||||
if membership_group_member_obj_in_result := sql_insert(
|
||||
data=membership_group_member_obj_data,
|
||||
table_name='membership_group_member',
|
||||
rm_id_random=True,
|
||||
id_random_length=8
|
||||
): pass
|
||||
else: return False
|
||||
|
||||
log.debug(membership_group_member_obj_in_result)
|
||||
|
||||
membership_group_member_id = membership_group_member_obj_in_result
|
||||
|
||||
log.debug(f'New membership_group_member_id: {membership_group_member_id}')
|
||||
return membership_group_member_id
|
||||
# ### END ### API Membership Group Member Methods ### create_membership_group_member_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Group Member Methods ### update_membership_group_member_obj() ###
|
||||
def update_membership_group_member_obj(
|
||||
membership_group_member_id: int|str, # This allows for updating of the id_random value.
|
||||
membership_group_member_obj_up: Membership_Group_Member_Base,
|
||||
create_missing_obj: bool = False,
|
||||
) -> bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_group_member_id := redis_lookup_id_random(record_id_random=membership_group_member_id, table_name='membership_group_member'): pass
|
||||
else: return False
|
||||
|
||||
membership_group_member_obj_up.id = membership_group_member_id
|
||||
|
||||
log.debug(membership_group_member_obj_up)
|
||||
log.debug(membership_group_member_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(membership_group_member_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
membership_group_member_dict_up = membership_group_member_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
log.debug(membership_group_member_dict_up)
|
||||
|
||||
if membership_group_member_obj_up_result := sql_update(data=membership_group_member_dict_up, table_name='membership_group_member', rm_id_random=True):
|
||||
log.debug(membership_group_member_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.debug(membership_group_member_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Membership Group Member Methods ### update_membership_group_member_obj() ###
|
||||
@@ -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_member_methods import get_membership_group_member_rec_list, load_membership_group_member_obj
|
||||
from app.methods.membership_group_person_methods import get_membership_group_person_rec_list, load_membership_group_person_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,9 +26,9 @@ def load_membership_group_obj(
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group_member_list: bool = False, # List of members that are a part of this group
|
||||
inc_membership_member: bool = False,
|
||||
inc_membership_member_profile: bool = False, # under membership_member
|
||||
inc_membership_group_person_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, # ???
|
||||
inc_organization: bool = False,
|
||||
inc_parent_membership_group: bool = False,
|
||||
@@ -37,7 +37,7 @@ def load_membership_group_obj(
|
||||
inc_product_list: bool = False, # List of products that give access to this group
|
||||
inc_user: bool = False,
|
||||
) -> Membership_Group_Base|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_group_id := redis_lookup_id_random(record_id_random=membership_group_id, table_name='membership_group'): pass
|
||||
@@ -67,35 +67,35 @@ def load_membership_group_obj(
|
||||
else: membership_group_obj.cfg = None
|
||||
|
||||
# Updated 2021-06-23
|
||||
if inc_membership_group_member_list:
|
||||
if inc_membership_group_person_list:
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
if membership_group_member_rec_list_result := get_membership_group_member_rec_list(
|
||||
if membership_group_person_rec_list_result := get_membership_group_person_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:
|
||||
if load_membership_group_member_result := load_membership_group_member_obj(
|
||||
membership_group_member_id = membership_group_member_rec.get('membership_group_member_id', None),
|
||||
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_member = inc_membership_member,
|
||||
inc_membership_person = inc_membership_person,
|
||||
# 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_organization = inc_organization,
|
||||
inc_person = inc_person,
|
||||
# inc_product = inc_product,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
membership_group_member_result_list.append(load_membership_group_member_result)
|
||||
else: membership_group_member_result_list.append(None)
|
||||
membership_group_obj.membership_group_member_list = membership_group_member_result_list
|
||||
else: membership_group_obj.membership_group_member_list = []
|
||||
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 = []
|
||||
|
||||
# Updated 2021-06-18
|
||||
# if inc_parent_membership_group:
|
||||
@@ -142,6 +142,7 @@ def load_membership_group_obj(
|
||||
# ### BEGIN ### API Membership Group Methods ### get_membership_group_rec_list() ###
|
||||
def get_membership_group_rec_list(
|
||||
account_id: str = None,
|
||||
membership_person_id: str = None,
|
||||
# product_id: str = None,
|
||||
# type_level: int = None,
|
||||
limit: int = 1000,
|
||||
@@ -155,47 +156,70 @@ def get_membership_group_rec_list(
|
||||
|
||||
data = {}
|
||||
data['account_id'] = account_id
|
||||
data['membership_person_id'] = membership_person_id
|
||||
# data['product_id'] = product_id
|
||||
# data['level'] = type_level
|
||||
|
||||
if account_id:
|
||||
sql_account_id = f'`membership_group`.account_id = :account_id'
|
||||
else: sql_account_id = ''
|
||||
|
||||
# if product_id:
|
||||
# sql_product_id = f'`membership_group`.product_id = :product_id'
|
||||
# else: sql_product_id = ''
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `membership_group`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `membership_group`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
else: sql_enabled = ''
|
||||
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `membership_group`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `membership_group`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
else: sql_enabled = ''
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
# if type_level:
|
||||
# sql_type_level = f"""AND membership_group.level = :level"""
|
||||
# else: sql_type_level = ''
|
||||
sql = f"""
|
||||
SELECT `membership_group`.id AS 'membership_group_id', `membership_group`.id_random AS 'membership_group_id_random'
|
||||
FROM `v_membership_group` AS `membership_group`
|
||||
WHERE
|
||||
{sql_account_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `membership_group`.sort ASC, `membership_group`.created_on DESC, `membership_group`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
elif membership_person_id:
|
||||
sql_membership_person_id = f'`membership_group_person`.membership_person_id = :membership_person_id'
|
||||
|
||||
sql = f"""
|
||||
SELECT `membership_group`.id AS 'membership_group_id', `membership_group`.id_random AS 'membership_group_id_random'
|
||||
FROM `v_membership_group` AS `membership_group`
|
||||
WHERE
|
||||
{sql_account_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `membership_group`.sort ASC, `membership_group`.created_on DESC, `membership_group`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `membership_group_person`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `membership_group_person`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
else: sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
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`
|
||||
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
|
||||
{sql_limit};
|
||||
"""
|
||||
else: return False
|
||||
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(sql)
|
||||
@@ -204,7 +228,7 @@ def get_membership_group_rec_list(
|
||||
membership_group_rec_li = membership_group_rec_li_result
|
||||
else:
|
||||
membership_group_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_group_rec_li_result)
|
||||
|
||||
return membership_group_rec_li
|
||||
|
||||
191
app/methods/membership_group_person_methods.py
Normal file
191
app/methods/membership_group_person_methods.py
Normal file
@@ -0,0 +1,191 @@
|
||||
from __future__ import annotations
|
||||
import datetime
|
||||
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
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
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Group Person Methods ### load_membership_group_person_obj() ###
|
||||
def load_membership_group_person_obj(
|
||||
membership_group_person_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_group: bool = False,
|
||||
inc_membership_person: bool = False,
|
||||
inc_membership_person_profile: bool = False,
|
||||
inc_membership_type: bool = False,
|
||||
inc_organization: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_product: bool = False,
|
||||
# inc_product_list: bool = False,
|
||||
inc_user: bool = False,
|
||||
) -> Membership_Group_Person_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
|
||||
else: return False
|
||||
log.debug(membership_group_person_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)
|
||||
else: return False
|
||||
log.debug(membership_group_person_rec)
|
||||
|
||||
try:
|
||||
membership_group_person_obj = Membership_Group_Person_Base(**membership_group_person_rec)
|
||||
log.debug(membership_group_person_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)
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_person_id)
|
||||
if membership_person_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_person_profile = inc_membership_person_profile,
|
||||
inc_membership_type = inc_membership_type,
|
||||
inc_organization = inc_organization,
|
||||
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
|
||||
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
|
||||
else:
|
||||
return membership_group_person_obj
|
||||
# ### END ### API Membership Group Person Methods ### load_membership_group_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Group Person Methods ### get_membership_group_person_rec_list() ###
|
||||
def get_membership_group_person_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
# data['for_obj_type'] = for_obj_type
|
||||
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
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`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
# 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
|
||||
else:
|
||||
membership_group_person_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_group_person_rec_li_result)
|
||||
|
||||
return membership_group_person_rec_li
|
||||
# ### END ### API Membership Group Person Methods ### get_membership_group_person_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:
|
||||
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'})
|
||||
|
||||
if membership_group_person_obj_in_result := sql_insert(
|
||||
data=membership_group_person_obj_data,
|
||||
table_name='membership_group_person',
|
||||
rm_id_random=True,
|
||||
id_random_length=8
|
||||
): pass
|
||||
else: return False
|
||||
|
||||
log.debug(membership_group_person_obj_in_result)
|
||||
|
||||
membership_group_person_id = membership_group_person_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() ###
|
||||
|
||||
|
||||
# ### 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,
|
||||
create_missing_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
|
||||
else: return False
|
||||
|
||||
membership_group_person_obj_up.id = membership_group_person_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))
|
||||
|
||||
membership_group_person_dict_up = membership_group_person_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
log.debug(membership_group_person_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)
|
||||
return True
|
||||
else:
|
||||
log.debug(membership_group_person_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Membership Group Person Methods ### update_membership_group_person_obj() ###
|
||||
@@ -8,20 +8,19 @@ 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_cfg_methods import load_membership_cfg_obj
|
||||
from app.methods.membership_group_member_methods import get_membership_group_member_rec_list, load_membership_group_member_obj
|
||||
from app.methods.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj
|
||||
from app.methods.membership_member_profile_methods import get_membership_member_profile_rec_list, load_membership_member_profile_obj
|
||||
# from app.methods.membership_type_methods import load_membership_type_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_profile_methods import get_membership_person_profile_rec_list, load_membership_person_profile_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
|
||||
|
||||
from app.models.membership_member_models import Membership_Member_Base
|
||||
from app.models.membership_person_models import Membership_Person_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Member Methods ### load_membership_member_obj() ###
|
||||
def load_membership_member_obj(
|
||||
membership_member_id:int|str,
|
||||
# ### BEGIN ### API Membership Person Methods ### load_membership_person_obj() ###
|
||||
def load_membership_person_obj(
|
||||
membership_person_id:int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
@@ -30,52 +29,61 @@ def load_membership_member_obj(
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group_list: bool = False, # The list of groups the member is a part of
|
||||
inc_membership_member_profile: bool = False,
|
||||
inc_membership_member_profile_cust: bool = False, # Extended profile?
|
||||
inc_membership_type: bool = False, # The member_type the member is
|
||||
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_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,
|
||||
) -> Membership_Member_Base:
|
||||
) -> Membership_Person_Base:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_member_id := redis_lookup_id_random(record_id_random=membership_member_id, table_name='membership_member'): pass
|
||||
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass
|
||||
else: return False
|
||||
|
||||
if membership_member_rec := sql_select(table_name='v_membership_member', record_id=membership_member_id): pass
|
||||
if membership_person_rec := sql_select(table_name='v_membership_person', record_id=membership_person_id): pass
|
||||
else: return False
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_member_rec)
|
||||
log.debug(membership_person_rec)
|
||||
|
||||
try:
|
||||
membership_member_obj = Membership_Member_Base(**membership_member_rec)
|
||||
log.debug(membership_member_obj)
|
||||
membership_person_obj = Membership_Person_Base(**membership_person_rec)
|
||||
log.debug(membership_person_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_member_obj)
|
||||
log.debug(membership_person_obj)
|
||||
|
||||
# Updated 2021-06-24
|
||||
if inc_membership_cfg:
|
||||
if membership_cfg_obj_result := load_membership_cfg_obj(
|
||||
account_id = membership_member_rec.get('account_id', None),
|
||||
account_id = membership_person_rec.get('account_id', None),
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
membership_member_obj.membership_cfg = membership_cfg_obj_result
|
||||
else: membership_member_obj.membership_cfg = None
|
||||
membership_person_obj.membership_cfg = membership_cfg_obj_result
|
||||
else: membership_person_obj.membership_cfg = None
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_membership_group: pass # The primary membership group the person is a part of. Not used at this time.
|
||||
|
||||
# Updated 2021-07-09
|
||||
if inc_membership_group_list: # The list of groups the member is a part of
|
||||
if membership_group_rec_list_result := get_membership_group_rec_list(
|
||||
for_obj_type = 'membership_member',
|
||||
for_obj_id = membership_member_id,
|
||||
# for_obj_type = 'membership_person',
|
||||
# for_obj_id = membership_person_id,
|
||||
membership_person_id = membership_person_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
@@ -89,24 +97,55 @@ def load_membership_member_obj(
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
# 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_organization = inc_organization,
|
||||
# inc_person = inc_person,
|
||||
# inc_product = inc_product,
|
||||
inc_product_list = inc_product_list,
|
||||
# inc_product_list = inc_product_list,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
membership_group_result_list.append(load_membership_group_result)
|
||||
else: membership_group_result_list.append(None)
|
||||
membership_member_obj.membership_group_list = membership_group_result_list
|
||||
else: membership_member_obj.membership_group_list = []
|
||||
membership_person_obj.membership_group_list = membership_group_result_list
|
||||
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 = []
|
||||
|
||||
# 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,
|
||||
if inc_membership_person_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(
|
||||
membership_person_profile_id = membership_person_profile_id,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
@@ -116,14 +155,14 @@ def load_membership_member_obj(
|
||||
# inc_membership_cfg = inc_membership_cfg,
|
||||
inc_organization = inc_organization,
|
||||
):
|
||||
membership_member_obj.membership_member_profile = membership_member_profile_result
|
||||
else: membership_member_obj.membership_member_profile = None
|
||||
log.debug(membership_member_profile_result)
|
||||
membership_person_obj.membership_person_profile = membership_person_profile_result
|
||||
else: membership_person_obj.membership_person_profile = None
|
||||
log.debug(membership_person_profile_result)
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_membership_type:
|
||||
# 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_member_rec.get('membership_type_id', None)
|
||||
membership_type_id = membership_person_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,
|
||||
@@ -139,13 +178,37 @@ def load_membership_member_obj(
|
||||
# inc_organization = inc_organization,
|
||||
inc_product_list = inc_product_list,
|
||||
):
|
||||
membership_member_obj.membership_type = membership_type_result
|
||||
else: membership_member_obj.membership_type = None
|
||||
membership_person_obj.membership_type = membership_type_result
|
||||
else: membership_person_obj.membership_type = None
|
||||
log.debug(membership_type_result)
|
||||
|
||||
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_type_person_list: pass # All of the membership type person records for a person
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_person:
|
||||
person_id = membership_member_rec.get('person_id', None)
|
||||
person_id = membership_person_rec.get('person_id', None)
|
||||
log.debug(person_id)
|
||||
if person_result := load_person_obj(
|
||||
person_id = person_id,
|
||||
@@ -157,13 +220,13 @@ def load_membership_member_obj(
|
||||
# inc_organization = inc_organization,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
membership_member_obj.person = person_result
|
||||
else: membership_member_obj.person = None
|
||||
membership_person_obj.person = person_result
|
||||
else: membership_person_obj.person = None
|
||||
log.debug(person_result)
|
||||
|
||||
# Updated 2021-06-24
|
||||
if inc_product:
|
||||
product_id = membership_member_rec.get('product_id', None)
|
||||
product_id = membership_person_rec.get('product_id', None)
|
||||
log.debug(product_id)
|
||||
if product_result := load_product_obj(
|
||||
product_id = product_id,
|
||||
@@ -171,13 +234,13 @@ def load_membership_member_obj(
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
membership_member_obj.product = product_result
|
||||
else: membership_member_obj.product = None
|
||||
membership_person_obj.product = product_result
|
||||
else: membership_person_obj.product = None
|
||||
log.debug(product_result)
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_user:
|
||||
user_id = membership_member_rec.get('user_id', None)
|
||||
user_id = membership_person_rec.get('user_id', None)
|
||||
if user_result := load_user_obj(
|
||||
user_id = user_id,
|
||||
by_alias = by_alias,
|
||||
@@ -188,28 +251,28 @@ def load_membership_member_obj(
|
||||
# inc_organization = inc_organization,
|
||||
# inc_person = inc_person,
|
||||
):
|
||||
membership_member_obj.user = user_result
|
||||
else: membership_member_obj.user = None
|
||||
membership_person_obj.user = user_result
|
||||
else: membership_person_obj.user = None
|
||||
log.debug(user_result)
|
||||
|
||||
if model_as_dict:
|
||||
return membership_member_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
return membership_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return membership_member_obj
|
||||
# ### END ### API Membership Member Methods ### load_membership_member_obj() ###
|
||||
return membership_person_obj
|
||||
# ### END ### API Membership Person Methods ### load_membership_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Member Methods ### get_membership_member_rec_list() ###
|
||||
def get_membership_member_rec_list(
|
||||
# ### BEGIN ### API Membership Person Methods ### get_membership_person_rec_list() ###
|
||||
def get_membership_person_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
@@ -236,8 +299,8 @@ def get_membership_member_rec_list(
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'membership_member_id', `tbl`.id_random AS 'membership_member_id_random'
|
||||
FROM `membership_member` AS `tbl`
|
||||
SELECT `tbl`.id AS 'membership_person_id', `tbl`.id_random AS 'membership_person_id_random'
|
||||
FROM `membership_person` AS `tbl`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
@@ -246,15 +309,15 @@ def get_membership_member_rec_list(
|
||||
"""
|
||||
elif for_obj_type == 'unknown':
|
||||
log.info(f'Query using joined table: {for_obj_type} {for_obj_id}')
|
||||
# sql_obj_type_id = f'`membership_member`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
# sql_obj_type_id = f'`membership_person`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
|
||||
# if enabled in ['enabled', 'disabled', 'all']:
|
||||
# if enabled == 'enabled':
|
||||
# data['enable'] = True
|
||||
# sql_enabled = f'AND `membership_member`.enable = :enable'
|
||||
# sql_enabled = f'AND `membership_person`.enable = :enable'
|
||||
# elif enabled == 'disabled':
|
||||
# data['enable'] = False
|
||||
# sql_enabled = f'AND `membership_member`.enable = :enable'
|
||||
# sql_enabled = f'AND `membership_person`.enable = :enable'
|
||||
# elif enabled == 'all':
|
||||
# sql_enabled = ''
|
||||
|
||||
@@ -265,17 +328,17 @@ def get_membership_member_rec_list(
|
||||
# sql_limit = ''
|
||||
|
||||
# sql = f"""
|
||||
# SELECT `membership_member`.id AS 'membership_type_id', `membership_member`.id_random AS 'membership_type_id_random'
|
||||
# FROM `membership_member`
|
||||
# INNER JOIN membership_type ON membership_member.membership_type_id = membership_type.id
|
||||
# SELECT `membership_person`.id AS 'membership_type_id', `membership_person`.id_random AS 'membership_type_id_random'
|
||||
# FROM `membership_person`
|
||||
# INNER JOIN membership_type ON membership_person.membership_type_id = membership_type.id
|
||||
# WHERE
|
||||
# {sql_obj_type_id}
|
||||
# {sql_enabled}
|
||||
|
||||
# ORDER BY `membership_member`.created_on DESC, `membership_member`.updated_on DESC
|
||||
# ORDER BY `membership_person`.created_on DESC, `membership_person`.updated_on DESC
|
||||
# {sql_limit};
|
||||
# """
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(sql)
|
||||
|
||||
# sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
@@ -297,8 +360,8 @@ def get_membership_member_rec_list(
|
||||
# sql_limit = ''
|
||||
|
||||
# sql = f"""
|
||||
# SELECT `tbl`.id AS 'membership_member_id', `tbl`.id_random AS 'membership_member_id_random'
|
||||
# FROM `membership_member` AS `tbl`
|
||||
# SELECT `tbl`.id AS 'membership_person_id', `tbl`.id_random AS 'membership_person_id_random'
|
||||
# FROM `membership_person` AS `tbl`
|
||||
# WHERE
|
||||
# {sql_obj_type_id}
|
||||
# {sql_enabled}
|
||||
@@ -306,19 +369,19 @@ def get_membership_member_rec_list(
|
||||
# {sql_limit};
|
||||
# """
|
||||
|
||||
if membership_member_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
membership_member_rec_li = membership_member_rec_li_result
|
||||
if membership_person_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
membership_person_rec_li = membership_person_rec_li_result
|
||||
else:
|
||||
membership_member_rec_li = []
|
||||
membership_person_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_member_rec_li_result)
|
||||
log.debug(membership_person_rec_li_result)
|
||||
|
||||
return membership_member_rec_li
|
||||
# ### END ### API Membership Member Methods ### get_membership_member_rec_list() ###
|
||||
return membership_person_rec_li
|
||||
# ### END ### API Membership Person Methods ### get_membership_person_rec_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Member Methods ### save_membership_member_obj() ###
|
||||
def save_membership_member_obj(order_obj_new:Membership_Member_Base=None):
|
||||
# ### BEGIN ### API Membership Person Methods ### save_membership_person_obj() ###
|
||||
def save_membership_person_obj(order_obj_new:Membership_Person_Base=None):
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
@@ -461,4 +524,4 @@ def save_membership_member_obj(order_obj_new:Membership_Member_Base=None):
|
||||
else: return False
|
||||
log.debug(order_line_obj_resp)
|
||||
return order_id
|
||||
# ### END ### API Membership Member Methods ### save_membership_member_obj() ###
|
||||
# ### END ### API Membership Person Methods ### save_membership_person_obj() ###
|
||||
@@ -7,46 +7,46 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
|
||||
from app.db_sql import redis_lookup_id_random, sql_select
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from app.models.membership_member_profile_models import Membership_Member_Profile_Base
|
||||
from app.models.membership_person_profile_models import Membership_Person_Profile_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Member Profile Methods ### load_membership_member_profile_obj() ###
|
||||
def load_membership_member_profile_obj(
|
||||
membership_member_profile_id: int|str,
|
||||
# ### BEGIN ### API Membership Person Profile Methods ### load_membership_person_profile_obj() ###
|
||||
def load_membership_person_profile_obj(
|
||||
membership_person_profile_id: int|str,
|
||||
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:
|
||||
) -> Membership_Person_Profile_Base|dict|bool:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_member_profile_id := redis_lookup_id_random(record_id_random=membership_member_profile_id, table_name='membership_member_profile'): pass
|
||||
if membership_person_profile_id := redis_lookup_id_random(record_id_random=membership_person_profile_id, table_name='membership_person_profile'): pass
|
||||
else: return False
|
||||
|
||||
if membership_member_profile_rec := sql_select(
|
||||
table_name='v_membership_member_profile',
|
||||
record_id=membership_member_profile_id,
|
||||
if membership_person_profile_rec := sql_select(
|
||||
table_name='v_membership_person_profile',
|
||||
record_id=membership_person_profile_id,
|
||||
): pass
|
||||
else: return False
|
||||
log.debug(membership_member_profile_rec)
|
||||
log.debug(membership_person_profile_rec)
|
||||
try:
|
||||
membership_member_profile_obj = Membership_Member_Profile_Base(**membership_member_profile_rec)
|
||||
log.debug(membership_member_profile_obj)
|
||||
membership_person_profile_obj = Membership_Person_Profile_Base(**membership_person_profile_rec)
|
||||
log.debug(membership_person_profile_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
if model_as_dict:
|
||||
return membership_member_profile_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
return membership_person_profile_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return membership_member_profile_obj
|
||||
# ### END ### API Membership Member Profile Methods ### load_membership_member_profile_obj() ###
|
||||
return membership_person_profile_obj
|
||||
# ### END ### API Membership Person Profile Methods ### load_membership_person_profile_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Member Profile Methods ### get_membership_member_profile_rec_list() ###
|
||||
def get_membership_member_profile_rec_list(
|
||||
# ### BEGIN ### API Membership Person Profile Methods ### get_membership_person_profile_rec_list() ###
|
||||
def get_membership_person_profile_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
@@ -55,7 +55,7 @@ def get_membership_member_profile_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
@@ -79,8 +79,8 @@ def get_membership_member_profile_rec_list(
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'membership_member_profile_id', `tbl`.id_random AS 'membership_member_profile_id_random'
|
||||
FROM `membership_member_profile` AS `tbl`
|
||||
SELECT `tbl`.id AS 'membership_person_profile_id', `tbl`.id_random AS 'membership_person_profile_id_random'
|
||||
FROM `membership_person_profile` AS `tbl`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
@@ -88,12 +88,12 @@ def get_membership_member_profile_rec_list(
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
if membership_member_profile_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
membership_member_profile_rec_li = membership_member_profile_rec_li_result
|
||||
if membership_person_profile_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
membership_person_profile_rec_li = membership_person_profile_rec_li_result
|
||||
else:
|
||||
membership_member_profile_rec_li = []
|
||||
membership_person_profile_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_member_profile_rec_li_result)
|
||||
log.debug(membership_person_profile_rec_li_result)
|
||||
|
||||
return membership_member_profile_rec_li
|
||||
# ### END ### API Membership Member Profile Methods ### get_membership_member_profile_rec_list() ###
|
||||
return membership_person_profile_rec_li
|
||||
# ### END ### API Membership Person Profile Methods ### get_membership_person_profile_rec_list() ###
|
||||
@@ -8,7 +8,7 @@ from app.lib_general import log, logging
|
||||
from app.db_sql import redis_lookup_id_random, sql_select
|
||||
|
||||
from app.methods.membership_cfg_methods import load_membership_cfg_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.product_methods import get_product_rec_list, load_product_obj
|
||||
|
||||
from app.models.membership_type_models import Membership_Type_Base
|
||||
@@ -25,17 +25,17 @@ def load_membership_type_obj(
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_group_list: bool = False, # under membership_member
|
||||
inc_membership_group_member_list: bool = False,
|
||||
inc_membership_member_list: bool = False,
|
||||
inc_membership_member_profile: bool = False, # under membership_member
|
||||
inc_membership_group_list: bool = False, # under membership_person
|
||||
inc_membership_group_person_list: bool = False,
|
||||
inc_membership_person_list: bool = False,
|
||||
inc_membership_person_profile: bool = False, # under membership_person
|
||||
inc_organization: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_product: bool = False, # Per membership member
|
||||
inc_product_list: bool = False, # One or more er membership type
|
||||
inc_user: bool = False,
|
||||
) -> Membership_Type_Base:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if membership_type_id := redis_lookup_id_random(record_id_random=membership_type_id, table_name='membership_type'): pass
|
||||
@@ -65,33 +65,33 @@ def load_membership_type_obj(
|
||||
else: membership_type_obj.cfg = None
|
||||
|
||||
# Updated 2021-06-23
|
||||
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 = 'membership_type',
|
||||
for_obj_id = membership_type_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
membership_member_result_list = []
|
||||
for membership_member_rec in membership_member_rec_list_result:
|
||||
if load_membership_member_result := 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:
|
||||
if load_membership_person_result := 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,
|
||||
enabled = enabled,
|
||||
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_organization = inc_organization,
|
||||
inc_person = inc_person,
|
||||
# inc_product = inc_product,
|
||||
inc_user = inc_user,
|
||||
):
|
||||
membership_member_result_list.append(load_membership_member_result)
|
||||
else: membership_member_result_list.append(None)
|
||||
membership_type_obj.membership_member_list = membership_member_result_list
|
||||
else: membership_type_obj.membership_member_list = []
|
||||
membership_person_result_list.append(load_membership_person_result)
|
||||
else: membership_person_result_list.append(None)
|
||||
membership_type_obj.membership_person_list = membership_person_result_list
|
||||
else: membership_type_obj.membership_person_list = []
|
||||
|
||||
# Updated 2021-06-23
|
||||
if inc_product_list:
|
||||
@@ -188,7 +188,7 @@ def get_membership_type_rec_list(
|
||||
membership_type_rec_li = membership_type_rec_li_result
|
||||
else:
|
||||
membership_type_rec_li = []
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_type_rec_li_result)
|
||||
|
||||
return membership_type_rec_li
|
||||
@@ -214,7 +214,7 @@ def save_membership_type_obj(membership_type_obj_new:Membership_Type_Base):
|
||||
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.debug(locals())
|
||||
|
||||
# if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
# if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
# else: return False
|
||||
# data = {}
|
||||
# data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
238
app/methods/membership_type_person_methods.py
Normal file
238
app/methods/membership_type_person_methods.py
Normal file
@@ -0,0 +1,238 @@
|
||||
from __future__ import annotations
|
||||
import datetime
|
||||
|
||||
from typing import Dict, List, Optional, Set, Union
|
||||
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
|
||||
|
||||
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
|
||||
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.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
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Type Person Methods ### load_membership_type_person_obj() ###
|
||||
# Updated 2021-07-09
|
||||
def load_membership_type_person_obj(
|
||||
membership_type_person_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_address: bool = False,
|
||||
inc_contact: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_membership_person: bool = False,
|
||||
inc_membership_person_profile: bool = False,
|
||||
inc_membership_type: bool = False,
|
||||
inc_organization: bool = False,
|
||||
inc_product: bool = False,
|
||||
inc_product_list: bool = False,
|
||||
inc_person: bool = False,
|
||||
inc_user: bool = False,
|
||||
) -> Membership_Type_Person_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
|
||||
else: return False
|
||||
log.debug(membership_type_person_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)
|
||||
else: return False
|
||||
log.debug(membership_type_person_rec)
|
||||
|
||||
try:
|
||||
membership_type_person_obj = Membership_Type_Person_Base(**membership_type_person_rec)
|
||||
log.debug(membership_type_person_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),
|
||||
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
|
||||
|
||||
# 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)
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_person_id)
|
||||
if membership_person_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_person_profile = inc_membership_person_profile,
|
||||
inc_membership_type = inc_membership_type,
|
||||
inc_organization = inc_organization,
|
||||
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
|
||||
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)
|
||||
log.debug(membership_type_id)
|
||||
if membership_type_result := load_membership_type_obj(
|
||||
membership_type_id = membership_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_product_list = inc_product_list,
|
||||
):
|
||||
membership_type_person_obj.membership_type = membership_type_result
|
||||
else: membership_type_person_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)
|
||||
log.debug(product_id)
|
||||
if product_result := load_product_obj(
|
||||
product_id = product_id,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
membership_type_person_obj.product = product_result
|
||||
else: membership_type_person_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
|
||||
else:
|
||||
return membership_type_person_obj
|
||||
# ### END ### API Membership Type Person Methods ### load_membership_type_person_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Type Person Methods ### get_membership_type_person_rec_list() ###
|
||||
def get_membership_type_person_rec_list(
|
||||
for_obj_type: str,
|
||||
for_obj_id: str,
|
||||
limit: int = 1000,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
) -> list|bool:
|
||||
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
# data['for_obj_type'] = for_obj_type
|
||||
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
|
||||
|
||||
if enabled in ['enabled', 'disabled', 'all']:
|
||||
if enabled == 'enabled':
|
||||
data['enable'] = True
|
||||
sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
elif enabled == 'disabled':
|
||||
data['enable'] = False
|
||||
sql_enabled = f'AND `tbl`.enable = :enable'
|
||||
elif enabled == 'all':
|
||||
sql_enabled = ''
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
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`
|
||||
WHERE
|
||||
{sql_obj_type_id}
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
# 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
|
||||
else:
|
||||
membership_type_person_rec_li = []
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(membership_type_person_rec_li_result)
|
||||
|
||||
return membership_type_person_rec_li
|
||||
# ### END ### API Membership Type Person Methods ### get_membership_type_person_rec_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Type Person Methods ### create_membership_type_person_obj() ###
|
||||
def create_membership_type_person_obj(membership_type_person_obj_new:Membership_Type_Person_Base) -> bool|int:
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
membership_type_person_obj_data = membership_type_person_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
|
||||
|
||||
if membership_type_person_obj_in_result := sql_insert(
|
||||
data=membership_type_person_obj_data,
|
||||
table_name='membership_type_person',
|
||||
rm_id_random=True,
|
||||
id_random_length=8
|
||||
): pass
|
||||
else: return False
|
||||
|
||||
log.debug(membership_type_person_obj_in_result)
|
||||
|
||||
membership_type_person_id = membership_type_person_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() ###
|
||||
|
||||
|
||||
# ### 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_obj_up: Membership_Type_Person_Base,
|
||||
create_missing_obj: 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
|
||||
else: return False
|
||||
|
||||
membership_type_person_obj_up.id = membership_type_person_id
|
||||
|
||||
log.debug(membership_type_person_obj_up)
|
||||
log.debug(membership_type_person_obj_up.dict(by_alias=False, exclude_unset=True))
|
||||
# log.debug(membership_type_person_obj_up.dict(by_alias=False, exclude_unset=False))
|
||||
|
||||
membership_type_person_dict_up = membership_type_person_obj_up.dict(by_alias=False, exclude_unset=True)
|
||||
log.debug(membership_type_person_dict_up)
|
||||
|
||||
if membership_type_person_obj_up_result := sql_update(data=membership_type_person_dict_up, table_name='membership_type_person', rm_id_random=True):
|
||||
log.debug(membership_type_person_obj_up_result)
|
||||
return True
|
||||
else:
|
||||
log.debug(membership_type_person_obj_up_result)
|
||||
return False
|
||||
# ### END ### API Membership Type Person Methods ### update_membership_type_person_obj() ###
|
||||
@@ -140,7 +140,7 @@ def get_order_line_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -284,7 +284,7 @@ def get_order_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -76,7 +76,7 @@ def get_organization_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -30,7 +30,19 @@ def load_person_obj(
|
||||
inc_event_list: bool = False,
|
||||
inc_journal_list: bool = False,
|
||||
inc_journal_entry_list: bool = False,
|
||||
inc_membership_member: bool = False,
|
||||
inc_membership_cfg: bool = False,
|
||||
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: 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_type_list: bool = False,
|
||||
inc_membership_type_person_list: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
inc_order_line_list: bool = False,
|
||||
inc_order_list: bool = False,
|
||||
@@ -38,9 +50,10 @@ def load_person_obj(
|
||||
inc_organization: bool = False,
|
||||
inc_post_list: bool = False,
|
||||
inc_post_comment_list: bool = False,
|
||||
inc_product: bool = False,
|
||||
inc_user: bool = False,
|
||||
) -> Person_Base|bool:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
|
||||
@@ -55,7 +68,7 @@ def load_person_obj(
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
# Updated 2021-06-18
|
||||
# Updated 2021-07-09
|
||||
if inc_contact:
|
||||
contact_id = person_rec.get('contact_id', None)
|
||||
log.debug(contact_id)
|
||||
@@ -71,6 +84,93 @@ def load_person_obj(
|
||||
person_obj.contact = contact_result
|
||||
else: person_obj.contact = None
|
||||
|
||||
# Updated 2021-07-09
|
||||
# if inc_membership_group_list:
|
||||
# from app.methods.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj
|
||||
# if membership_group_rec_list_result := get_membership_group_rec_list(
|
||||
# for_obj_type = 'person',
|
||||
# for_obj_id = person_id,
|
||||
# limit = limit,
|
||||
# enabled = enabled,
|
||||
# ):
|
||||
# membership_group_result_list = []
|
||||
# for membership_group_rec in membership_group_rec_list_result:
|
||||
# if membership_group_result := load_membership_group_obj(
|
||||
# membership_group_id = membership_group_rec.get('membership_group_id', None),
|
||||
# limit = limit,
|
||||
# by_alias = by_alias,
|
||||
# exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
# enabled = enabled,
|
||||
# inc_membership_group_profile = inc_membership_group_profile,
|
||||
# inc_membership_group_profile_cust = inc_membership_group_profile_cust,
|
||||
# inc_membership_type = inc_membership_type,
|
||||
# inc_product = inc_product,
|
||||
# ):
|
||||
# membership_group_result_list.append(membership_group_result)
|
||||
# else:
|
||||
# membership_group_result_list.append(None)
|
||||
# person_obj.membership_group_list = membership_group_result_list
|
||||
# else: person_obj.membership_group_list = []
|
||||
|
||||
# Updated 2021-07-09
|
||||
if inc_membership_person:
|
||||
from app.methods.membership_person_methods import load_membership_person_obj
|
||||
membership_person_id = person_rec.get('membership_person_id', None)
|
||||
log.debug(membership_person_id)
|
||||
if membership_person_result := load_membership_person_obj(
|
||||
membership_person_id = membership_person_id,
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_address = inc_address,
|
||||
inc_contact = inc_contact,
|
||||
inc_membership_cfg = inc_membership_cfg,
|
||||
inc_membership_group = inc_membership_group, # The primary membership group, if there is one.
|
||||
inc_membership_group_list = inc_membership_group_list, # All membership groups they are a part of.
|
||||
inc_membership_person_profile = inc_membership_person_profile,
|
||||
inc_membership_person_profile_cust = inc_membership_person_profile_cust,
|
||||
inc_membership_type = inc_membership_type, # The primary membership type, if there is one.
|
||||
inc_membership_type_list = inc_membership_type_list, # All the membership types they are a part of.
|
||||
# inc_person = inc_person,
|
||||
inc_product = inc_product,
|
||||
# inc_product_list = inc_product_list,
|
||||
# inc_user = inc_user,
|
||||
):
|
||||
person_obj.membership_person = membership_person_result
|
||||
else: person_obj.membership_person = None
|
||||
|
||||
# Updated 2021-07-09
|
||||
# if inc_membership_type or inc_membership_type_list: # Technically should this be inc_membership_type_list???
|
||||
# from app.methods.membership_type_methods import get_membership_type_rec_list, load_membership_type_obj
|
||||
# if membership_type_rec_list_result := get_membership_type_rec_list(
|
||||
# for_obj_type = 'person',
|
||||
# for_obj_id = person_id,
|
||||
# limit = limit,
|
||||
# enabled = enabled,
|
||||
# ):
|
||||
# membership_type_result_list = []
|
||||
# for membership_type_rec in membership_type_rec_list_result:
|
||||
# if membership_type_result := load_membership_type_obj(
|
||||
# membership_type_id = membership_type_rec.get('membership_type_id', None),
|
||||
# limit = limit,
|
||||
# by_alias = by_alias,
|
||||
# exclude_unset = exclude_unset,
|
||||
# model_as_dict = model_as_dict,
|
||||
# enabled = enabled,
|
||||
# inc_membership_type_profile = inc_membership_type_profile,
|
||||
# inc_membership_type_profile_cust = inc_membership_type_profile_cust,
|
||||
# inc_membership_type = inc_membership_type,
|
||||
# inc_product = inc_product,
|
||||
# ):
|
||||
# membership_type_result_list.append(membership_type_result)
|
||||
# else:
|
||||
# membership_type_result_list.append(None)
|
||||
# type_obj.membership_type_list = membership_type_result_list
|
||||
# else: type_obj.membership_type_list = []
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_order_list:
|
||||
if order_rec_list_result := get_order_rec_list(
|
||||
@@ -147,7 +247,7 @@ def get_person_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -176,7 +176,7 @@ def get_post_comment_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -204,7 +204,7 @@ def get_post_rec_list(
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -112,7 +112,7 @@ def get_site_domain_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -134,7 +134,7 @@ def get_site_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -87,7 +87,7 @@ def load_user_obj(
|
||||
# inc_hosted_file_list: bool = False,
|
||||
inc_journal_list: bool = False,
|
||||
inc_journal_entry_list: bool = False,
|
||||
inc_membership_member: bool = False,
|
||||
inc_membership_person: bool = False,
|
||||
inc_order_cfg: bool = False,
|
||||
inc_order_line_list: bool = False,
|
||||
inc_order_list: bool = False,
|
||||
@@ -377,7 +377,7 @@ def get_user_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
@@ -55,7 +55,7 @@ def get_user_role_rec_list(
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(locals())
|
||||
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name='for_obj_type'): pass
|
||||
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
|
||||
else: return False
|
||||
data = {}
|
||||
data[f'{for_obj_type}_id'] = for_obj_id
|
||||
|
||||
Reference in New Issue
Block a user