Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A lot of changes related to person and membership

Browse Source
This commit is contained in:
Scott Idem
2021-07-09 17:34:02 -04:00
parent 2b8d00551c
commit 49805f48c9
49 changed files with 1389 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/routers/account.py
View File

@@ -13,7 +13,7 @@ from app.methods.account_methods import load_account_obj, load_account_obj_membe
from app.methods.account_cfg_methods import load_account_cfg_obj
from app.methods.event_methods import get_event_rec_list, load_event_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.post_methods import get_post_rec_list, load_post_obj
@@ -149,9 +149,9 @@ async def get_account_obj_new(
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False,
inc_membership_group_list: bool = False,
inc_membership_member: bool = False,
inc_membership_member_list: bool = False,
inc_membership_member_profile: bool = False,
inc_membership_person: bool = False,
inc_membership_person_list: bool = False,
inc_membership_person_profile: bool = False,
# inc_membership_type: bool = False,
inc_membership_type_list: bool = False,
# inc_order: bool = False,
@@ -223,9 +223,9 @@ async def get_account_obj_new(
inc_journal_entry_list = inc_journal_entry_list,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_member = inc_membership_member,
inc_membership_member_list = inc_membership_member_list,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_person = inc_membership_person,
inc_membership_person_list = inc_membership_person_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_type_list = inc_membership_type_list,
# inc_order = inc_order,
inc_order_list = inc_order_list,

17
app/routers/api_crud.py
View File

@@ -34,9 +34,11 @@ from app.models.journal_entry_models import *
from app.models.log_client_viewing_models import Log_Client_Viewing_Base
from app.models.membership_cfg_models import *
from app.models.membership_group_models import *
from app.models.membership_group_member_models import *
from app.models.membership_member_models import *
from app.models.membership_group_person_models import *
from app.models.membership_person_models import *
from app.models.membership_person_profile_models import *
from app.models.membership_type_models import *
from app.models.membership_type_person_models import *
from app.models.order_models import *
from app.models.order_cart_models import *
from app.models.organization_models import *
@@ -89,10 +91,11 @@ obj_type_li['journal_entry'] = {'table_name': 'v_journal_entry', 'base_name': Jo
obj_type_li['log_client_viewing'] = {'table_name': 'log_client_viewing', 'base_name': Log_Client_Viewing_Base}
obj_type_li['membership_cfg'] = {'table_name': 'v_membership_cfg', 'base_name': Membership_Cfg_Base}
obj_type_li['membership_group'] = {'table_name': 'v_membership_group', 'base_name': Membership_Group_Base}
obj_type_li['membership_group_member'] = {'table_name': 'v_membership_group_member', 'base_name': Membership_Group_Member_Base}
obj_type_li['membership_member'] = {'table_name': 'v_membership_member', 'base_name': Membership_Member_Base}
obj_type_li['membership_member_profile'] = {'table_name': 'v_membership_member_profile', 'base_name': Membership_Member_Profile_Base}
obj_type_li['membership_group_person'] = {'table_name': 'v_membership_group_person', 'base_name': Membership_Group_Person_Base}
obj_type_li['membership_person'] = {'table_name': 'v_membership_person', 'base_name': Membership_Person_Base}
obj_type_li['membership_person_profile'] = {'table_name': 'v_membership_person_profile', 'base_name': Membership_Person_Profile_Base}
obj_type_li['membership_type'] = {'table_name': 'v_membership_type', 'base_name': Membership_Type_Base}
obj_type_li['membership_type_person'] = {'table_name': 'v_membership_type_person', 'base_name': Membership_Type_Person_Base}
#obj_type_li['message'] = {'table_name': 'message', 'base_name': Message_Base} #'v_message'
obj_type_li['order'] = {'table_name': 'v_order', 'base_name': Order_Base}
obj_type_li['order_cart'] = {'table_name': 'v_order_cart', 'base_name': Order_Cart_Base}
@@ -133,8 +136,8 @@ obj_type_li['user_role'] = {'table_name': 'v_user_role', 'base_name': User_Role_
#obj_type_li['stripe_customer'] = {'table_name': 'stripe_customer', 'base_name': Stripe_Customer_Base}
#obj_type_li['stripe_log'] = {'table_name': 'stripe_log', 'base_name': Stipe_Log_Base}
# obj_type_li['c_idda_membership_member_profile'] = {'table_name': 'c_idda_membership_member_profile', 'base_name': C_Idda_membership_member_profile_Base}
# obj_type_li['c_osit_demo_membership_member_profile'] = {'table_name': 'c_osit_demo_membership_member_profile', 'base_name': C_Osit_Demo_membership_member_profile_Base}
# obj_type_li['c_idda_membership_person_profile'] = {'table_name': 'c_idda_membership_person_profile', 'base_name': C_Idda_membership_person_profile_Base}
# obj_type_li['c_osit_demo_membership_person_profile'] = {'table_name': 'c_osit_demo_membership_person_profile', 'base_name': C_Osit_Demo_membership_person_profile_Base}
router = APIRouter()

2
app/routers/lookup.py
View File

@@ -30,7 +30,7 @@ async def get_lookup_li(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
allowed_lookup_tables = ['country', 'country_subdivision', 'event_session_type', 'file_purpose', 'membership_member_status', 'order_status', 'post_topic', 'time_zone', 'user_status']
allowed_lookup_tables = ['country', 'country_subdivision', 'event_session_type', 'file_purpose', 'membership_group_status', 'membership_person_status', 'membership_type_status', 'order_status', 'post_topic', 'time_zone', 'user_status']
if for_lookup_name in allowed_lookup_tables: pass
else:

18
app/routers/membership_group.py
View File

@@ -102,7 +102,7 @@ async def get_account_membership_group_obj_li(
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group_member_list: bool = False,
inc_membership_group_person_list: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
inc_product_list: bool = False,
@@ -134,7 +134,7 @@ async def get_account_membership_group_obj_li(
inc_address = inc_address,
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_member_list = inc_membership_group_member_list,
inc_membership_group_person_list = inc_membership_group_person_list,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product_list = inc_product_list,
@@ -160,7 +160,7 @@ async def lookup_membership_group_obj(
for_obj_id: Union[int,str],
for_obj_type: str = Query(..., min_length=2, max_length=50),
x_account_id: str = Header(...),
inc_membership_member_profile: bool = True,
inc_membership_person_profile: bool = True,
inc_membership_cfg: bool = True,
inc_extended_profile: bool = True,
inc_person: bool = True,
@@ -214,7 +214,7 @@ async def lookup_membership_group_obj(
membership_group_id = membership_group_obj_result.get('membership_group_id', None)
membership_group_obj = load_membership_group_obj(
membership_group_id = membership_group_id,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
@@ -228,7 +228,7 @@ async def lookup_membership_group_obj(
membership_group_obj_li.append(
load_membership_group_obj(
membership_group_id = membership_group_id,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
@@ -253,8 +253,8 @@ async def get_membership_group_obj(
inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of groups per member
inc_membership_group_member_list: bool = False, # List of members belonging to this group
inc_membership_member_profile: bool = False, # Per member
inc_membership_group_person_list: bool = False, # List of members belonging to this group
inc_membership_person_profile: bool = False, # Per member
inc_organization: bool = False, # Per member
inc_person: bool = False, # Per member
inc_product: bool = False, # Per member
@@ -282,8 +282,8 @@ async def get_membership_group_obj(
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
# inc_membership_group_list = inc_membership_group_list,
inc_membership_group_member_list = inc_membership_group_member_list,
inc_membership_member_profile = inc_membership_member_profile,
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,

229
app/routers/membership_member.py → app/routers/membership_person.py
View File

@@ -9,18 +9,18 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select,
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
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.models.membership_member_models import Membership_Member_Base
from app.models.membership_person_models import Membership_Person_Base
from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter()
@router.post('/membership/member', response_model=Resp_Body_Base)
async def post_membership_member_obj(
obj: Membership_Member_Base,
@router.post('/membership/person', response_model=Resp_Body_Base)
async def post_membership_person_obj(
obj: Membership_Person_Base,
x_account_id: str = Header(...),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
@@ -29,7 +29,7 @@ async def post_membership_member_obj(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
obj_type = 'membership_person'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
result = post_obj_template(
obj_type=obj_type,
@@ -41,10 +41,10 @@ async def post_membership_member_obj(
return result
@router.patch('/membership/member/{obj_id}', response_model=Resp_Body_Base)
async def patch_membership_member_obj(
@router.patch('/membership/person/{obj_id}', response_model=Resp_Body_Base)
async def patch_membership_person_obj(
obj_id: str = Query(..., min_length=1, max_length=22),
obj: Membership_Member_Base = None,
obj: Membership_Person_Base = None,
#x_account_id: Optional[str] = Header(..., ),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
@@ -53,7 +53,7 @@ async def patch_membership_member_obj(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
obj_type = 'membership_person'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type)
obj_data_dict['id_random'] = obj_id
@@ -68,8 +68,8 @@ async def patch_membership_member_obj(
return result
@router.get('/membership/member/list', response_model=Resp_Body_Base)
async def get_membership_member_obj_li(
@router.get('/membership/person/list', response_model=Resp_Body_Base)
async def get_membership_person_obj_li(
for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50),
for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22),
x_account_id: str = Header(...),
@@ -79,7 +79,7 @@ async def get_membership_member_obj_li(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
obj_type = 'membership_person'
result = get_obj_li_template(
obj_type=obj_type,
for_obj_type=for_obj_type,
@@ -91,10 +91,10 @@ async def get_membership_member_obj_li(
# ### BEGIN ### API Membership Member ### get_account_obj_membership_member_list() ###
# ### BEGIN ### API Membership Person ### get_account_obj_membership_person_list() ###
# Working well as of 2021-06-24. Using as a template for other routes.
@router.get('/account/{account_id}/membership/member/list', response_model=Resp_Body_Base)
async def get_account_obj_membership_member_list(
@router.get('/account/{account_id}/membership/person/list', response_model=Resp_Body_Base)
async def get_account_obj_membership_person_list(
account_id: str = Query(..., min_length=1, max_length=22),
limit: int = 500, # For now this covers any included objects or object lists
enabled: str = 'enabled', # For now this covers any included objects or object lists
@@ -104,10 +104,10 @@ async def get_account_obj_membership_member_list(
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False,
inc_membership_group_list: bool = False,
# inc_membership_member: bool = False,
# inc_membership_member_list: bool = False,
inc_membership_member_profile: bool = False,
inc_membership_member_profile_cust: bool = False,
# inc_membership_person: bool = False,
# inc_membership_person_list: bool = False,
inc_membership_person_profile: bool = False,
inc_membership_person_profile_cust: bool = False,
inc_membership_type: bool = False,
# inc_membership_type_list: bool = False,
# inc_order: bool = False,
@@ -130,16 +130,16 @@ async def get_account_obj_membership_member_list(
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# Updated 2021-06-23
if membership_member_rec_list_result := get_membership_member_rec_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:
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,
@@ -149,10 +149,10 @@ async def get_account_obj_membership_member_list(
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
# inc_membership_group_member_list = inc_membership_group_member_list,
# inc_membership_member = inc_membership_member,
# inc_membership_member_list = inc_membership_member_list,
inc_membership_member_profile = inc_membership_member_profile,
# inc_membership_group_person_list = inc_membership_group_person_list,
# inc_membership_person = inc_membership_person,
# inc_membership_person_list = inc_membership_person_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_type = inc_membership_type,
# inc_order = inc_order,
inc_organization = inc_organization,
@@ -161,29 +161,98 @@ async def get_account_obj_membership_member_list(
# inc_product_list = inc_product_list,
inc_user = inc_user,
):
membership_member_result_list.append(load_membership_member_result)
membership_person_result_list.append(load_membership_person_result)
else:
membership_member_result_list.append(None)
response_data = membership_member_result_list
membership_person_result_list.append(None)
response_data = membership_person_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Member ### get_account_obj_membership_member_list() ###
# ### END ### API Membership Person ### get_account_obj_membership_person_list() ###
# ### BEGIN ### API Membership Person ### get_person_obj_membership_person() ###
# Working well as of 2021-07-09. Using as a template for other routes.
@router.get('/person/{person_id}/membership_person', response_model=Resp_Body_Base)
async def get_person_obj_membership_person(
person_id: str = Query(..., min_length=1, max_length=22),
limit: int = 500, # For now this covers any included objects or object lists
enabled: str = 'enabled', # For now this covers any included objects or object lists
from_datetime: datetime.datetime = None,
to_datetime: datetime.datetime = None,
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False, # The primary membership group
inc_membership_group_list: bool = False, # The list of all membership groups a person is a part of
inc_membership_group_person_list: bool = False,
# inc_membership_person: bool = False, # Priority l2
inc_membership_person_profile: bool = False, # Profile?
inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_type: bool = False, # The primary membership type
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
inc_membership_type_person: bool = False,
# inc_order: bool = False,
inc_organization: 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,
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.DEBUG) # 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
else: return mk_resp(data=None, status_code=404)
if membership_person_rec := sql_select(table_name='v_membership_person', field_name='person_id', field_value=person_id): pass
else: return False
membership_person_id = membership_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 = True,
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_group_person_list = inc_membership_group_person_list,
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_membership_type_person = inc_membership_type_person,
# inc_membership_type_person_list = inc_membership_type_list,
# inc_person = inc_person,
inc_product = inc_product,
# inc_product_list = inc_product_list,
# inc_user = inc_user,
):
response_data = membership_person_result
else: return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Membership Person ### get_person_obj_membership_person() ###
# Look up is only for account, person, or user records
@router.get('/membership/member/lookup', response_model=Resp_Body_Base)
async def lookup_membership_member_obj(
@router.get('/membership/person/lookup', response_model=Resp_Body_Base)
async def lookup_membership_person_obj(
for_obj_id: Union[int,str],
for_obj_type: str = Query(..., min_length=2, max_length=50),
x_account_id: str = Header(...),
inc_membership_cfg: bool = True,
inc_membership_member_profile: bool = True,
inc_membership_member_profile_cust: bool = True,
inc_membership_person_profile: bool = True,
inc_membership_person_profile_cust: bool = True,
inc_person: bool = True,
inc_user: bool = True,
by_alias: bool = True,
@@ -192,8 +261,8 @@ async def lookup_membership_member_obj(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
base_name = Membership_Member_Base
obj_type = 'membership_person'
base_name = Membership_Person_Base
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
else: return mk_resp(data=False, status_code=404) # Not Found
@@ -203,78 +272,78 @@ async def lookup_membership_member_obj(
as_list = False
if for_obj_type == 'account' and for_obj_id:
data['account_id'] = for_obj_id
sql_where_for_obj_type = """`membership_member`.account_id = :account_id"""
sql_where_for_obj_type = """`membership_person`.account_id = :account_id"""
sql_limit = ''
as_list = True
elif for_obj_type == 'person' and for_obj_id:
data['person_id'] = for_obj_id
sql_where_for_obj_type = """`membership_member`.person_id = :person_id"""
sql_where_for_obj_type = """`membership_person`.person_id = :person_id"""
sql_limit = 'LIMIT 1'
elif for_obj_type == 'user' and for_obj_id:
data['user_id'] = for_obj_id
sql_where_for_obj_type = """`membership_member`.user_id = :user_id"""
sql_where_for_obj_type = """`membership_person`.user_id = :user_id"""
sql_limit = 'LIMIT 1'
elif for_obj_type == 'membership_member' and for_obj_id:
data['membership_member_id'] = for_obj_id
sql_where_for_obj_type = """`membership_member`.id = :membership_member_id"""
elif for_obj_type == 'membership_person' and for_obj_id:
data['membership_person_id'] = for_obj_id
sql_where_for_obj_type = """`membership_person`.id = :membership_person_id"""
sql_limit = 'LIMIT 1'
else:
log.debug(f'Object type={for_obj_type}; Object ID={for_obj_id}')
return mk_resp(data=False, status_code=400) # Bad Request
sql = f"""
SELECT id AS 'membership_member_id', id_random AS 'membership_member_id_random'
FROM `membership_member` AS `membership_member`
SELECT id AS 'membership_person_id', id_random AS 'membership_person_id_random'
FROM `membership_person` AS `membership_person`
WHERE {sql_where_for_obj_type}
{sql_limit}
"""
# This will return a list if selecting by account ID
membership_member_obj_result = sql_select(data=data, sql=sql, as_list=as_list)
if isinstance(membership_member_obj_result, dict):
membership_member_id = membership_member_obj_result.get('membership_member_id', None)
membership_member_obj = load_membership_member_obj(
membership_member_id = membership_member_id,
membership_person_obj_result = sql_select(data=data, sql=sql, as_list=as_list)
if isinstance(membership_person_obj_result, dict):
membership_person_id = membership_person_obj_result.get('membership_person_id', None)
membership_person_obj = load_membership_person_obj(
membership_person_id = membership_person_id,
inc_membership_cfg = inc_membership_cfg,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_member_profile_cust = inc_membership_member_profile_cust,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_profile_cust = inc_membership_person_profile_cust,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = membership_member_obj
elif isinstance(membership_member_obj_result, list):
membership_member_obj_li = []
for membership_member_obj in membership_member_obj_result:
membership_member_id = membership_member_obj.get('membership_member_id', None)
membership_member_obj_li.append(
load_membership_member_obj(
membership_member_id = membership_member_id,
data = membership_person_obj
elif isinstance(membership_person_obj_result, list):
membership_person_obj_li = []
for membership_person_obj in membership_person_obj_result:
membership_person_id = membership_person_obj.get('membership_person_id', None)
membership_person_obj_li.append(
load_membership_person_obj(
membership_person_id = membership_person_id,
inc_membership_cfg = inc_membership_cfg,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_member_profile_cust = inc_membership_member_profile_cust,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_profile_cust = inc_membership_person_profile_cust,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
)
data = membership_member_obj_li
data = membership_person_obj_li
else:
log.debug(membership_member_obj_result)
log.debug(membership_person_obj_result)
return mk_resp(data=None, status_code=404) # Not Found
return mk_resp(data=data)
# ### BEGIN ### API Membership Group ### get_membership_member_obj() ###
# ### BEGIN ### API Membership Group ### get_membership_person_obj() ###
# Working well as of 2021-06-24. Using as a template for other routes.
@router.get('/membership/member/{membership_member_id}', response_model=Resp_Body_Base)
async def get_membership_member_obj(
membership_member_id: str = Query(..., min_length=1, max_length=22),
@router.get('/membership/person/{membership_person_id}', response_model=Resp_Body_Base)
async def get_membership_person_obj(
membership_person_id: str = Query(..., min_length=1, max_length=22),
enabled: str = 'enabled', # For now this covers any included objects or object lists
limit: int = 500, # For now this covers any included objects or object lists
inc_address: bool = False, # Per member
inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of groups per member
inc_membership_member_profile: bool = False,
inc_membership_person_profile: bool = False,
inc_membership_type: bool = False,
# inc_order: bool = False,
inc_organization: bool = False,
@@ -289,11 +358,11 @@ async def get_membership_member_obj(
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 mk_resp(data=None, status_code=404)
if membership_member_result := load_membership_member_obj(
membership_member_id = membership_member_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,
@@ -303,7 +372,7 @@ async def get_membership_member_obj(
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
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_order = inc_order,
inc_organization = inc_organization,
@@ -316,19 +385,19 @@ async def get_membership_member_obj(
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=membership_member_result)
# ### END ### API Membership ### get_membership_member_obj() ###
return mk_resp(data=membership_person_result)
# ### END ### API Membership ### get_membership_person_obj() ###
@router.delete('/membership/member/{obj_id}', response_model=Resp_Body_Base)
async def delete_membership_member_obj(
@router.delete('/membership/person/{obj_id}', response_model=Resp_Body_Base)
async def delete_membership_person_obj(
obj_id: str = Query(..., min_length=1, max_length=22),
x_account_id: str = Header(...),
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
obj_type = 'membership_person'
result = delete_obj_template(
obj_type=obj_type,
obj_id=obj_id,

24
app/routers/membership_type.py
View File

@@ -102,7 +102,7 @@ async def get_account_membership_type_obj_li(
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_member_list: bool = False,
inc_membership_person_list: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
inc_product_list: bool = False,
@@ -134,7 +134,7 @@ async def get_account_membership_type_obj_li(
inc_address = inc_address,
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_member_list = inc_membership_member_list,
inc_membership_person_list = inc_membership_person_list,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product_list = inc_product_list,
@@ -160,7 +160,7 @@ async def lookup_membership_type_obj(
for_obj_id: Union[int,str],
for_obj_type: str = Query(..., min_length=2, max_length=50),
x_account_id: str = Header(...),
inc_membership_member_profile: bool = True,
inc_membership_person_profile: bool = True,
inc_membership_cfg: bool = True,
inc_extended_profile: bool = True,
inc_person: bool = True,
@@ -168,7 +168,7 @@ async def lookup_membership_type_obj(
by_alias: bool = True,
exclude_unset: bool = True,
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_type'
@@ -176,7 +176,7 @@ async def lookup_membership_type_obj(
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
else: return mk_resp(data=False, status_code=404) # Not Found
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
data = {}
as_list = False
@@ -214,7 +214,7 @@ async def lookup_membership_type_obj(
membership_type_id = membership_type_obj_result.get('membership_type_id', None)
membership_type_obj = load_membership_type_obj(
membership_type_id = membership_type_id,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
@@ -228,7 +228,7 @@ async def lookup_membership_type_obj(
membership_type_obj_li.append(
load_membership_type_obj(
membership_type_id = membership_type_id,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
@@ -253,8 +253,8 @@ async def get_membership_type_obj(
inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # Per member
inc_membership_member_list: bool = False,
inc_membership_member_profile: bool = False, # Per member
inc_membership_person_list: bool = False,
inc_membership_person_profile: bool = False, # Per member
inc_organization: bool = False, # Per member
inc_person: bool = False, # Per member
inc_product: bool = False, # Per member
@@ -264,7 +264,7 @@ async def get_membership_type_obj(
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.WARNING) # 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
@@ -282,8 +282,8 @@ async def get_membership_type_obj(
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
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_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,

117
app/routers/person.py
View File

@@ -9,7 +9,7 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select,
from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
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.order_methods import get_order_rec_list, load_order_obj
from app.methods.person_methods import create_update_person_obj, load_person_obj, update_person_obj
@@ -20,7 +20,7 @@ from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter()
@router.post('', response_model=Resp_Body_Base)
@router.post('/person', response_model=Resp_Body_Base)
async def post_person_obj(
obj: Person_Base,
x_account_id: str = Header(...),
@@ -43,7 +43,7 @@ async def post_person_obj(
return result
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
@router.patch('/person/{obj_id}', response_model=Resp_Body_Base)
async def patch_person_obj(
obj: Person_Base,
obj_id: str = Query(..., min_length=1, max_length=22),
@@ -72,7 +72,7 @@ async def patch_person_obj(
# ### BEGIN ### API Person ### post_person_json() ###
# Updated 2021-06-25
@router.post('/json', response_model=Resp_Body_Base)
@router.post('/person/json', response_model=Resp_Body_Base)
async def post_person_json(
person_obj: Person_Base,
# person_id: str = Query(..., min_length=1, max_length=22),
@@ -113,7 +113,7 @@ async def post_person_json(
# ### BEGIN ### API Person ### patch_person_json() ###
# Updated 2021-06-25
@router.patch('/{person_id}/json', response_model=Resp_Body_Base)
@router.patch('/person/{person_id}/json', response_model=Resp_Body_Base)
async def patch_person_json(
person_obj: Person_Base,
person_id: str = Query(..., min_length=1, max_length=22),
@@ -152,7 +152,7 @@ async def patch_person_json(
@router.get('/list', response_model=Resp_Body_Base)
@router.get('/person/list', response_model=Resp_Body_Base)
async def get_person_obj_li(
for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50),
for_obj_id: Optional[str] = Query(None, min_length=1, max_length=22),
@@ -176,7 +176,7 @@ async def get_person_obj_li(
# ### BEGIN ### API Person ### get_person_obj() ###
# Working well as of 2021-06-25. Using as a template for other routes.
@router.get('/{person_id}', response_model=Resp_Body_Base)
@router.get('/person/{person_id}', response_model=Resp_Body_Base)
async def get_person_obj(
person_id: str = Query(..., min_length=1, max_length=22),
limit: int = 500, # For now this covers any included objects or object lists
@@ -188,8 +188,16 @@ async def get_person_obj(
# inc_hosted_file_list: bool = False, # Priority l3
inc_journal_list: bool = False, # Priority l2
# inc_journal_entry_list: bool = False, # Priority l3
inc_membership_member: bool = False, # Priority l2
# inc_membership_list: bool = False, # ???
# inc_membership_group: bool = False, # The primary membership group
# inc_membership_group_person: bool = False,
inc_membership_group_list: bool = False, # The list of all membership groups a person is a part of
inc_membership_group_person_list: bool = False,
inc_membership_person: bool = False, # Priority l2
inc_membership_person_profile: bool = False, # Priority l2
inc_membership_type: bool = False, # The primary membership type
inc_membership_type_person: bool = False,
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_type_person_list: bool = False,
inc_order_line_list: bool = False, # Priority l1
inc_order_list: bool = False, # Priority l1
inc_order_cart_list: bool = False, # Priority l1
@@ -206,8 +214,7 @@ async def get_person_obj(
log.debug(locals())
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
else:
return mk_resp(data=None, status_code=404)
else: return mk_resp(data=None, status_code=404)
if person_dict := load_person_obj(
person_id = person_id,
@@ -221,8 +228,12 @@ async def get_person_obj(
# inc_hosted_file_list = inc_hosted_file_list,
inc_journal_list = inc_journal_list,
# inc_journal_entry_list = inc_journal_entry_list,
inc_membership_member = inc_membership_member,
# inc_membership_list = inc_membership_list, # ???
inc_membership_group_list = inc_membership_group_list,
inc_membership_group_person_list = inc_membership_group_person_list,
inc_membership_person = inc_membership_person,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_type = inc_membership_type,
inc_membership_type_person = inc_membership_type_person,
inc_order_line_list = inc_order_line_list,
inc_order_list = inc_order_list,
inc_order_cart_list = inc_order_cart_list,
@@ -245,81 +256,7 @@ async def get_person_obj(
# ### BEGIN ### API Person ### get_person_obj_order_list() ###
# Working well as of 2021-06-28. Using as a template for other routes.
@router.get('/{person_id}/membership_member', response_model=Resp_Body_Base)
async def get_person_obj_membership_member(
person_id: str = Query(..., min_length=1, max_length=22),
limit: int = 500, # For now this covers any included objects or object lists
enabled: str = 'enabled', # For now this covers any included objects or object lists
from_datetime: datetime.datetime = None,
to_datetime: datetime.datetime = None,
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # Per member
inc_membership_member_list: bool = False,
inc_membership_member_profile: bool = False, # Per member
inc_membership_member_profile_cust: bool = False, # Extended profile?
inc_membership_type: bool = False, # The member_type the member is
# inc_order: bool = False,
inc_organization: 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,
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.DEBUG) # 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
else:
return mk_resp(data=None, status_code=404)
# Updated 2021-06-28
if membership_member_rec_list_result := get_membership_member_rec_list(
for_obj_type = 'person',
for_obj_id = person_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),
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_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_member_profile_cust = inc_membership_member_profile_cust,
inc_membership_type = inc_membership_type,
# inc_order = inc_order,
inc_organization = inc_organization,
# inc_person = inc_person,
inc_product = inc_product,
inc_product_list = inc_product_list,
inc_user = inc_user,
):
membership_member_result_list.append(load_membership_member_result)
else:
membership_member_result_list.append(None)
response_data = membership_member_result_list
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=response_data)
# ### END ### API Person ### get_person_obj_order_list() ###
# ### BEGIN ### API Person ### get_person_obj_order_list() ###
# Working well as of 2021-06-28. Using as a template for other routes.
@router.get('/{person_id}/order_list', response_model=Resp_Body_Base)
@router.get('/person/{person_id}/order_list', response_model=Resp_Body_Base)
async def get_person_obj_order_list(
person_id: str = Query(..., min_length=1, max_length=22),
limit: int = 500, # For now this covers any included objects or object lists
@@ -378,7 +315,7 @@ async def get_person_obj_order_list(
# ### END ### API Person ### get_person_obj_order_list() ###
@router.delete('/{obj_id}', response_model=Resp_Body_Base)
@router.delete('/person/{obj_id}', response_model=Resp_Body_Base)
async def delete_person_obj(
obj_id: str = Query(..., min_length=1, max_length=22),
x_account_id: str = Header(...),
@@ -391,4 +328,4 @@ async def delete_person_obj(
obj_type=obj_type,
obj_id=obj_id,
)
return result
return result

4
app/routers/user.py
View File

@@ -576,7 +576,7 @@ async def get_user_obj(
# inc_hosted_file_list: bool = False, # Priority l3
inc_journal_list: bool = False, # Priority l2
# inc_journal_entry_list: bool = False, # Priority l3
inc_membership_member: bool = False, # Priority l2
inc_membership_person: bool = False, # Priority l2
# inc_membership_list: bool = False, # ???
inc_order_line_list: bool = False, # Priority l1
inc_order_list: bool = False, # Priority l1
@@ -611,7 +611,7 @@ async def get_user_obj(
# inc_hosted_file_list = inc_hosted_file_list,
inc_journal_list = inc_journal_list,
# inc_journal_entry_list = inc_journal_entry_list,
inc_membership_member = inc_membership_member,
inc_membership_person = inc_membership_person,
# inc_membership_list = inc_membership_list, # ???
inc_order_line_list = inc_order_line_list,
inc_order_list = inc_order_list,