Working on all the routes, methods, and models.

This commit is contained in:
Scott Idem
2021-06-18 14:09:07 -04:00
parent bb2f14b67c
commit 938aabb2a8
29 changed files with 941 additions and 335 deletions

View File

@@ -138,7 +138,9 @@ async def get_account_obj_new(
inc_event_track_list: bool = False,
inc_fundraising_cfg: bool = False,
inc_hosted_file_list: bool = False,
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,
@@ -158,24 +160,27 @@ async def get_account_obj_new(
inc_product_list: bool = False,
# inc_site: bool = False,
inc_site_list: bool = False,
inc_site_domain_list: bool = False,
inc_user: bool = False,
inc_user_list: 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.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
else:
return mk_resp(data=None, status_code=404)
if account_dict := load_account_obj(
if account_result := load_account_obj(
account_id = account_id,
enabled = enabled,
limit = limit,
model_as_dict = True, # NOTE: returning model as a dict
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = False, # NOTE: returning model as a dict
inc_account_cfg = inc_account_cfg,
inc_address = inc_address,
inc_address_list = inc_address_list,
@@ -203,7 +208,9 @@ async def get_account_obj_new(
inc_event_track_list = inc_event_track_list,
inc_fundraising_cfg = inc_fundraising_cfg,
inc_hosted_file_list = inc_hosted_file_list,
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,
@@ -223,13 +230,33 @@ async def get_account_obj_new(
inc_product_list = inc_product_list,
# inc_site = inc_site,
inc_site_list = inc_site_list,
inc_site_domain_list = inc_site_domain_list,
inc_user = inc_user,
inc_user_list = inc_user_list,
):
if isinstance(account_dict, dict):
response_data = account_dict
if isinstance(account_result, dict):
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.info('Result is a dict')
response_data = account_result
log.debug(response_data)
else:
response_data = account_dict
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# print('---------------------------')
log.info('Result is probably an object model')
response_data = account_result
# print('---------------------------')
log.debug(response_data)
# log.debug(response_data.__fields_set__)
# response_data.testing = 'this is a test'
# log.debug(response_data.__fields_set__)
# print('---------------------------')
# log.debug(account_result.dict())
# print('---------------------------')
# # log.debug(account_result.dict(by_alias=False, exclude_unset=True)) # pylint: disable=no-member
# log.debug(account_result.dict(by_alias=True, exclude_unset=False)) # pylint: disable=no-member
# print('---------------------------')
# log.debug(account_result.dict(by_alias=True, exclude_unset=True)) # pylint: disable=no-member
# print('---------------------------')
else:
return mk_resp(data=False, status_code=400) # Bad Request