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

Working on membership still...

Browse Source
This commit is contained in:
Scott Idem
2021-06-24 14:17:29 -04:00
parent 6f21a567a7
commit ea254c584f
11 changed files with 133 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/routers/account.py
View File

@@ -282,18 +282,19 @@ async def get_account_obj_membership_member_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
inc_account_cfg: bool = False,
# inc_account_cfg: bool = False,
inc_address: bool = False, # Under contact
inc_contact: bool = False,
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False,
inc_membership_group_list: bool = False,
inc_membership_member: 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_type: bool = False,
# inc_membership_type_list: bool = False,
inc_order: bool = False,
# inc_order: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
inc_product: bool = False,
@@ -307,8 +308,7 @@ async def get_account_obj_membership_member_list(
log.debug(locals())
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
else:
return mk_resp(data=None, status_code=404)
else: return mk_resp(data=None, status_code=404)
response_data = None
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -325,20 +325,20 @@ async def get_account_obj_membership_member_list(
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,
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 = inc_membership_member,
# 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 = inc_membership_type,
inc_order = inc_order,
# inc_order = inc_order,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,

1
app/routers/api.py
View File

@@ -17,7 +17,6 @@ from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter()
@router.get('/temp_token', response_model=Resp_Body_Base)
async def get_api_temp_token(
x_aether_api_key: Optional[str] = Header(None),

8
app/routers/membership_group.py
View File

@@ -208,22 +208,22 @@ async def get_membership_group_obj(
else:
return mk_resp(data=None, status_code=404)
if membership_group_result := load_membership_group_result(
if membership_group_result := load_membership_group_obj(
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
# 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_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 = inc_product,
inc_product_list = inc_product_list,
inc_user = inc_user,
):

59
app/routers/membership_member.py
View File

@@ -96,9 +96,9 @@ 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_membership_member_profile: bool = True,
inc_membership_member_profile_cust: bool = True,
inc_person: bool = True,
inc_user: bool = True,
by_alias: bool = True,
@@ -150,9 +150,9 @@ async def lookup_membership_member_obj(
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_membership_member_profile = inc_membership_member_profile,
inc_membership_member_profile_cust = inc_membership_member_profile_cust,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
@@ -164,9 +164,9 @@ async def lookup_membership_member_obj(
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_membership_member_profile = inc_membership_member_profile,
inc_membership_member_profile_cust = inc_membership_member_profile_cust,
inc_person = inc_person,
inc_user = inc_user,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
@@ -189,13 +189,14 @@ async def get_membership_member_obj(
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_group_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_membership_type: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
# inc_product: bool = False,
# inc_product_list: bool = False,
inc_product: bool = False, # Per member or group member belongs to
inc_product_list: bool = False,
inc_user: bool = False, # Per member
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
@@ -205,22 +206,25 @@ async def get_membership_member_obj(
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)
else: return mk_resp(data=None, status_code=404)
if membership_member_result := load_membership_member_result(
if membership_member_result := load_membership_member_obj(
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
# model_as_dict = model_as_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_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_type = inc_membership_type,
# inc_order = inc_order,
inc_organization = inc_organization,
inc_person = inc_person,
inc_product = inc_product,
@@ -231,6 +235,29 @@ async def get_membership_member_obj(
else:
return mk_resp(data=False, status_code=400) # Bad Request
# 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() ###