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

Working on membership module routes, methods, and models

Browse Source
This commit is contained in:
Scott Idem
2021-06-21 17:53:04 -04:00
parent ce44e93b4d
commit 728682a07f
22 changed files with 1184 additions and 267 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/routers/account.py
View File

@@ -141,10 +141,14 @@ async def get_account_obj_new(
inc_hosted_file_link_list: bool = False,
inc_journal_list: bool = False,
inc_journal_entry_list: bool = False,
# inc_membership: bool = False,
inc_membership_cfg: bool = False,
inc_membership_list: 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_type: bool = False,
inc_membership_type_list: bool = False,
# inc_order: bool = False,
inc_order_list: bool = False,
# inc_order_cart: bool = False,
@@ -212,10 +216,12 @@ async def get_account_obj_new(
inc_hosted_file_link_list = inc_hosted_file_link_list,
inc_journal_list = inc_journal_list,
inc_journal_entry_list = inc_journal_entry_list,
# inc_membership = inc_membership,
inc_membership_cfg = inc_membership_cfg,
inc_membership_list = inc_membership_list,
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_type_list = inc_membership_type_list,
# inc_order = inc_order,
inc_order_list = inc_order_list,
# inc_order_cart = inc_order_cart,

16
app/routers/api_crud.py
View File

@@ -31,7 +31,11 @@ from app.models.event_track_models import *
from app.models.hosted_file_models import *
from app.models.journal_models import *
from app.models.journal_entry_models import *
from app.models.membership_models import *
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_type_models import *
from app.models.order_models import *
from app.models.order_cart_models import *
from app.models.organization_models import *
@@ -82,8 +86,12 @@ obj_type_li['journal'] = {'table_name': 'v_journal', 'base_name': Journal_Base}
obj_type_li['journal_entry'] = {'table_name': 'v_journal_entry', 'base_name': Journal_Entry_Base}
#obj_type_li['log'] = {'table_name': 'log', 'base_name': Log_Base} #'v_log'
#obj_type_li['log_client_viewing'] = {'table_name': 'log_client_viewing', 'base_name': Log_Client_Viewing_Base}
obj_type_li['membership'] = {'table_name': 'v_membership', 'base_name': Membership_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_type'] = {'table_name': 'v_membership_type', 'base_name': Membership_Type_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}
@@ -124,8 +132,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_profile'] = {'table_name': 'c_idda_membership_profile', 'base_name': C_Idda_Membership_Profile_Base}
# obj_type_li['c_osit_demo_membership_profile'] = {'table_name': 'c_osit_demo_membership_profile', 'base_name': C_Osit_Demo_Membership_Profile_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}
router = APIRouter()

251
app/routers/membership_group.py Normal file
View File

@@ -0,0 +1,251 @@
import datetime
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, status
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from app.lib_general import log, logging
from app.config import settings
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
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_group_methods import load_membership_group_obj
from app.models.membership_group_models import Membership_Group_Base
from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter()
@router.post('', response_model=Resp_Body_Base)
async def post_membership_group_obj(
obj: Membership_Group_Base,
x_account_id: str = Header(...),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_group'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
result = post_obj_template(
obj_type=obj_type,
data=obj_data_dict,
return_obj=True,
by_alias=True,
exclude_unset=True,
)
return result
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
async def patch_membership_group_obj(
obj_id: str = Query(..., min_length=1, max_length=22),
obj: Membership_Group_Base = None,
#x_account_id: Optional[str] = Header(..., ),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_group'
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
result = patch_obj_template(
obj_type=obj_type,
data=obj_data_dict,
obj_id=obj_id,
return_obj=True,
by_alias=True,
exclude_unset=True,
)
return result
@router.get('/list', response_model=Resp_Body_Base)
async def get_membership_group_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(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_group'
result = get_obj_li_template(
obj_type=obj_type,
for_obj_type=for_obj_type,
for_obj_id=for_obj_id,
by_alias=True,
exclude_unset=True,
)
return result
# Look up is only for account, person, or user records
@router.get('/lookup', response_model=Resp_Body_Base)
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_cfg: bool = True,
inc_extended_profile: bool = True,
inc_person: bool = True,
inc_user: bool = True,
by_alias: bool = True,
exclude_unset: bool = True,
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_group'
base_name = Membership_Group_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
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
data = {}
as_list = False
if for_obj_type == 'account' and for_obj_id:
data['account_id'] = for_obj_id
sql_where_for_obj_type = """`membership_group`.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_group`.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_group`.user_id = :user_id"""
sql_limit = 'LIMIT 1'
elif for_obj_type == 'membership_group' and for_obj_id:
data['membership_group_id'] = for_obj_id
sql_where_for_obj_type = """`membership_group`.id = :membership_group_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_group_id', id_random AS 'membership_group_id_random'
FROM `membership_group` AS `membership_group`
WHERE {sql_where_for_obj_type}
{sql_limit}
"""
# This will return a list if selecting by account ID
membership_group_obj_result = sql_select(data=data, sql=sql, as_list=as_list)
if isinstance(membership_group_obj_result, dict):
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_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = membership_group_obj
elif isinstance(membership_group_obj_result, list):
membership_group_obj_li = []
for membership_group_obj in membership_group_obj_result:
membership_group_id = membership_group_obj.get('membership_group_id', None)
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_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
)
data = membership_group_obj_li
else:
log.debug(membership_group_obj_result)
return mk_resp(data=None, status_code=404) # Not Found
return mk_resp(data=data)
# ### BEGIN ### API Membership Group ### get_membership_group_obj() ###
# Working well as of 2021-06-21. Using as a template for other routes.
@router.get('/{membership_group_id}', response_model=Resp_Body_Base)
async def get_membership_group_obj(
membership_group_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_group_member_list: bool = False, # List of members belonging to this group
inc_membership_member_profile: bool = False, # Per member
inc_organization: bool = False, # Per member
inc_person: bool = False, # Per member
inc_product: bool = False, # Per member
inc_product_list: bool = False,
inc_user: bool = False, # Per member
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 membership_group_id := redis_lookup_id_random(record_id_random=membership_group_id, table_name='membership_group'): pass
else:
return mk_resp(data=None, status_code=404)
if membership_group_result := load_membership_group_result(
membership_group_id = membership_group_id,
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict, # NOTE: returning model as a dict
enabled = enabled,
inc_address = inc_address,
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_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,
inc_product_list = inc_product_list,
inc_user = inc_user,
):
pass
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=membership_group_result)
# ### END ### API Membership ### get_membership_group_obj() ###
@router.delete('/{obj_id}', response_model=Resp_Body_Base)
async def delete_membership_group_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_group'
result = delete_obj_template(
obj_type=obj_type,
obj_id=obj_id,
)
return result

251
app/routers/membership_member.py Normal file
View File

@@ -0,0 +1,251 @@
import datetime
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, status
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from app.lib_general import log, logging
from app.config import settings
from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
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 load_membership_member_obj
from app.models.membership_member_models import Membership_Member_Base
from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter()
@router.post('', response_model=Resp_Body_Base)
async def post_membership_member_obj(
obj: Membership_Member_Base,
x_account_id: str = Header(...),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
result = post_obj_template(
obj_type=obj_type,
data=obj_data_dict,
return_obj=True,
by_alias=True,
exclude_unset=True,
)
return result
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
async def patch_membership_member_obj(
obj_id: str = Query(..., min_length=1, max_length=22),
obj: Membership_Member_Base = None,
#x_account_id: Optional[str] = Header(..., ),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
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
result = patch_obj_template(
obj_type=obj_type,
data=obj_data_dict,
obj_id=obj_id,
return_obj=True,
by_alias=True,
exclude_unset=True,
)
return result
@router.get('/list', response_model=Resp_Body_Base)
async def get_membership_member_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(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
result = get_obj_li_template(
obj_type=obj_type,
for_obj_type=for_obj_type,
for_obj_id=for_obj_id,
by_alias=True,
exclude_unset=True,
)
return result
# Look up is only for account, person, or user records
@router.get('/lookup', response_model=Resp_Body_Base)
async def lookup_membership_member_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_cfg: bool = True,
inc_extended_profile: bool = True,
inc_person: bool = True,
inc_user: bool = True,
by_alias: bool = True,
exclude_unset: bool = True,
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_member'
base_name = Membership_Member_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
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
data = {}
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_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_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_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"""
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`
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,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
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,
inc_membership_member_profile = inc_membership_member_profile,
inc_membership_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
)
data = membership_member_obj_li
else:
log.debug(membership_member_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() ###
# Working well as of 2021-06-21. Using as a template for other routes.
@router.get('/{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),
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_member_list: bool = False, # List of groups per member
inc_membership_type_list: bool = False, # List of membership types belonging to this member
inc_membership_member_profile: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
# inc_product: bool = False,
# inc_product_list: bool = False,
inc_user: bool = False, # Per member
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 membership_member_id := redis_lookup_id_random(record_id_random=membership_member_id, table_name='membership_member'): pass
else:
return mk_resp(data=None, status_code=404)
if membership_member_result := load_membership_member_result(
membership_member_id = membership_member_id,
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict, # NOTE: returning model as a dict
enabled = enabled,
inc_address = inc_address,
inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_member_list = inc_membership_member_list,
inc_membership_member_member_list = inc_membership_member_member_list,
inc_membership_member_profile = inc_membership_member_profile,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,
inc_product_list = inc_product_list,
inc_user = inc_user,
):
pass
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() ###
@router.delete('/{obj_id}', response_model=Resp_Body_Base)
async def delete_membership_member_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'
result = delete_obj_template(
obj_type=obj_type,
obj_id=obj_id,
)
return result

157
app/routers/membership.py → app/routers/membership_type.py
View File

@@ -9,9 +9,9 @@ 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_methods import load_membership_obj
from app.methods.membership_type_methods import load_membership_type_obj
from app.models.membership_models import Membership_Base
from app.models.membership_type_models import Membership_Type_Base
from app.models.response_models import Resp_Body_Base, mk_resp
@@ -19,8 +19,8 @@ router = APIRouter()
@router.post('', response_model=Resp_Body_Base)
async def post_membership_obj(
obj: Membership_Base,
async def post_membership_type_obj(
obj: Membership_Type_Base,
x_account_id: str = Header(...),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
@@ -29,7 +29,7 @@ async def post_membership_obj(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership'
obj_type = 'membership_type'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
result = post_obj_template(
obj_type=obj_type,
@@ -42,9 +42,9 @@ async def post_membership_obj(
@router.patch('/{obj_id}', response_model=Resp_Body_Base)
async def patch_membership_obj(
async def patch_membership_type_obj(
obj_id: str = Query(..., min_length=1, max_length=22),
obj: Membership_Base = None,
obj: Membership_Type_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_obj(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership'
obj_type = 'membership_type'
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
@@ -69,7 +69,7 @@ async def patch_membership_obj(
@router.get('/list', response_model=Resp_Body_Base)
async def get_membership_obj_li(
async def get_membership_type_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_obj_li(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership'
obj_type = 'membership_type'
result = get_obj_li_template(
obj_type=obj_type,
for_obj_type=for_obj_type,
@@ -92,11 +92,11 @@ async def get_membership_obj_li(
# Look up is only for account, person, or user records
@router.get('/lookup', response_model=Resp_Body_Base)
async def lookup_membership_obj(
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_profile: bool = True,
inc_membership_member_profile: bool = True,
inc_membership_cfg: bool = True,
inc_extended_profile: bool = True,
inc_person: bool = True,
@@ -107,8 +107,8 @@ async def lookup_membership_obj(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership'
base_name = Membership_Base
obj_type = 'membership_type'
base_name = Membership_Type_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
@@ -118,72 +118,72 @@ async def lookup_membership_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`.account_id = :account_id"""
sql_where_for_obj_type = """`membership_type`.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`.person_id = :person_id"""
sql_where_for_obj_type = """`membership_type`.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`.user_id = :user_id"""
sql_where_for_obj_type = """`membership_type`.user_id = :user_id"""
sql_limit = 'LIMIT 1'
elif for_obj_type == 'membership' and for_obj_id:
data['membership_id'] = for_obj_id
sql_where_for_obj_type = """`membership`.id = :membership_id"""
elif for_obj_type == 'membership_type' and for_obj_id:
data['membership_type_id'] = for_obj_id
sql_where_for_obj_type = """`membership_type`.id = :membership_type_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_id', id_random AS 'membership_id_random'
FROM `membership` AS `membership`
SELECT id AS 'membership_type_id', id_random AS 'membership_type_id_random'
FROM `membership_type` AS `membership_type`
WHERE {sql_where_for_obj_type}
{sql_limit}
"""
# This will return a list if selecting by account ID
membership_obj_result = sql_select(data=data, sql=sql, as_list=as_list)
if isinstance(membership_obj_result, dict):
membership_id = membership_obj_result.get('membership_id', None)
membership_obj = load_membership_obj(
membership_id=membership_id,
inc_membership_profile=inc_membership_profile,
inc_membership_cfg=inc_membership_cfg,
inc_extended_profile=inc_extended_profile,
inc_person=inc_person,
inc_user=inc_user,
membership_type_obj_result = sql_select(data=data, sql=sql, as_list=as_list)
if isinstance(membership_type_obj_result, dict):
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_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = membership_obj
elif isinstance(membership_obj_result, list):
membership_obj_li = []
for membership_obj in membership_obj_result:
membership_id = membership_obj.get('membership_id', None)
membership_obj_li.append(
load_membership_obj(
membership_id=membership_id,
inc_membership_profile=inc_membership_profile,
inc_membership_cfg=inc_membership_cfg,
inc_extended_profile=inc_extended_profile,
inc_person=inc_person,
inc_user=inc_user,
data = membership_type_obj
elif isinstance(membership_type_obj_result, list):
membership_type_obj_li = []
for membership_type_obj in membership_type_obj_result:
membership_type_id = membership_type_obj.get('membership_type_id', None)
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_cfg = inc_membership_cfg,
inc_extended_profile = inc_extended_profile,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
)
data = membership_obj_li
data = membership_type_obj_li
else:
log.debug(membership_obj_result)
log.debug(membership_type_obj_result)
return mk_resp(data=None, status_code=404) # Not Found
return mk_resp(data=data)
# ### BEGIN ### API Membership ### get_membership_obj() ###
# Working well as of 2021-06-04. Using as a template for other routes.
@router.get('/{membership_id}', response_model=Resp_Body_Base)
async def get_membership_obj(
membership_id: str = Query(..., min_length=1, max_length=22),
# ### BEGIN ### API Membership Type ### get_membership_type_obj() ###
# Working well as of 2021-06-21. Using as a template for other routes.
@router.get('/{membership_type_id}', response_model=Resp_Body_Base)
async def get_membership_type_obj(
membership_type_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
@@ -191,7 +191,7 @@ async def get_membership_obj(
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # Per member
inc_membership_member_list: bool = False,
inc_membership_profile: bool = False, # Per member
inc_membership_member_profile: bool = False, # Per member
inc_organization: bool = False, # Per member
inc_person: bool = False, # Per member
inc_product: bool = False, # Per member
@@ -204,38 +204,39 @@ async def get_membership_obj(
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if membership_id := redis_lookup_id_random(record_id_random=membership_id, table_name='membership'): pass
if membership_type_id := redis_lookup_id_random(record_id_random=membership_type_id, table_name='membership_type'): pass
else:
return mk_resp(data=None, status_code=404)
if membership_obj := load_membership_obj(
membership_id = membership_id,
enabled = enabled,
# model_as_dict = model_as_dict,
limit = limit,
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_list = inc_membership_member_list,
inc_membership_profile = inc_membership_profile,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,
inc_product_list = inc_product_list,
inc_user = inc_user,
):
# membership_dict = membership_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset)
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, # NOTE: returning model as a dict
enabled = enabled,
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_list = inc_membership_member_list,
inc_membership_member_profile = inc_membership_member_profile,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,
inc_product_list = inc_product_list,
inc_user = inc_user,
):
pass
else:
return mk_resp(data=False, status_code=400) # Bad Request
return mk_resp(data=membership_obj)
# ### END ### API Membership ### get_membership_obj() ###
return mk_resp(data=membership_type_result)
# ### END ### API Membership ### get_membership_type_obj() ###
@router.get('/{obj_id}', response_model=Resp_Body_Base)
async def get_membership_obj_old(
async def get_membership_type_obj_old(
obj_id: str = Query(..., min_length=1, max_length=22),
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
@@ -244,7 +245,7 @@ async def get_membership_obj_old(
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership'
obj_type = 'membership_type'
result = get_obj_template(
obj_type=obj_type,
obj_id=obj_id,
@@ -255,14 +256,14 @@ async def get_membership_obj_old(
@router.delete('/{obj_id}', response_model=Resp_Body_Base)
async def delete_membership_obj(
async def delete_membership_type_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'
obj_type = 'membership_type'
result = delete_obj_template(
obj_type=obj_type,
obj_id=obj_id,

2
app/routers/product.py
View File

@@ -104,7 +104,7 @@ async def get_product_obj_li(
sql_for_obj_type = f"""`product`.for_type = :for_obj_type AND `product`.for_id = :for_obj_id"""
else: sql_for_obj_type = ''
if prod_type in ['event', 'event_option', 'membership', 'fundraising']:
if prod_type in ['event', 'event_option', 'event_registration', 'fundraising', 'membership_group', 'membership_type']:
data['type_name'] = prod_type
sql_product_type = f"""AND product.type_name = :type_name"""