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

Moving things to use the common_route_params and unified functions for SQL enable and SQL LIMIT OFFSET

Browse Source
This commit is contained in:
Scott Idem
2022-01-17 18:57:31 -05:00
parent 9efaa2bf61
commit 6b21a33625
9 changed files with 139 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
app/routers/account.py
View File

@@ -3,7 +3,7 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Resp
from pydantic import BaseModel, EmailStr, Field
from typing import Dict, List, Optional, Set, Union
from app.lib_general import log, logging
from app.lib_general import log, logging, common_route_params, Common_Route_Params
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
@@ -98,31 +98,27 @@ async def get_account_obj_li(
inc_site_list: bool = False,
inc_site_domain_list: bool = False,
inc_user_list: bool = False,
x_account_id: str = Header(...),
return_obj: bool = True,
limit: int = 25,
enabled: str = 'enabled',
by_alias: bool = True,
exclude_unset: Optional[bool] = True,
response: Response = Response,
commons: Common_Route_Params = Depends(common_route_params),
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
# Updated 2021-09-28
if account_rec_list_result := get_account_rec_list(
limit = limit,
enabled = enabled,
limit = commons.limit,
enabled = commons.enabled,
):
account_result_list = []
for account_rec in account_rec_list_result:
if load_account_result := load_account_obj(
account_id = account_rec.get('account_id', None),
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
limit = commons.limit,
by_alias = commons.by_alias,
exclude_unset = commons.exclude_unset,
# model_as_dict = model_as_dict,
enabled = enabled,
enabled = commons.enabled,
# inc_address = inc_address,
# inc_address_list = inc_address_list,
# inc_archive_list = inc_archive_list,
@@ -147,9 +143,9 @@ async def get_account_obj_li(
account_result_list.append(None)
response_data = account_result_list
else:
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
return mk_resp(data=response_data, response=response)
return mk_resp(data=response_data, response=commons.response)
# ### BEGIN ### API Account ### get_account_obj_new() ###
@@ -157,8 +153,6 @@ async def get_account_obj_li(
@router.get('/{account_id}', response_model=Resp_Body_Base)
async def get_account_obj_new(
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, # Priority l1
inc_address: bool = False, # Under contact
inc_address_list: bool = False,
@@ -229,23 +223,21 @@ async def get_account_obj_new(
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,
response: Response = Response,
commons: Common_Route_Params = Depends(common_route_params),
):
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, response=response)
else: return mk_resp(data=None, status_code=404, response=commons.response)
if account_result := load_account_obj(
account_id = account_id,
enabled = enabled,
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
enabled = commons.enabled,
limit = commons.limit,
by_alias = commons.by_alias,
exclude_unset = commons.exclude_unset,
model_as_dict = False, # NOTE: returning model as a dict
inc_account_cfg = inc_account_cfg,
inc_address = inc_address,
@@ -327,9 +319,9 @@ async def get_account_obj_new(
# 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, response=response) # Bad Request
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
return mk_resp(data=response_data, response=response)
return mk_resp(data=response_data, response=commons.response)
# ### END ### API Account ### get_account_obj_new() ###
@@ -354,10 +346,8 @@ async def delete_account_obj(
async def get_account_cfg_obj(
account_id: str = Query(..., min_length=11, max_length=22),
sys_module: Optional[str] = None, # event, fundraising, membership
x_account_id: str = Header(...),
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
response: Response = Response,
commons: Common_Route_Params = Depends(common_route_params),
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -365,19 +355,19 @@ async def get_account_cfg_obj(
# print(x_account_id)
if account_id := redis_lookup_id_random(record_id_random=x_account_id, table_name='account'): pass
else: return mk_resp(data=None, status_code=404, status_message=f'The Account ID was not found. Account ID: {account_id}', response=response)
else: return mk_resp(data=None, status_code=404, status_message=f'The Account ID was not found. Account ID: {account_id}', response=commons.response)
if sys_module:
if sys_module == 'membership':
membership_cfg_obj = load_account_cfg_obj(account_id=account_id, inc_membership_cfg=True).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = membership_cfg_obj
return mk_resp(data=data, response=response)
return mk_resp(data=data, response=commons.response)
else:
if account_cfg_obj := load_account_cfg_obj(account_id=account_id).dict(by_alias=by_alias, exclude_unset=exclude_unset):
data = account_cfg_obj
return mk_resp(data=data, response=response)
return mk_resp(data=data, response=commons.response)
else:
return mk_resp(data=False, status_code=404, response=response)
return mk_resp(data=False, status_code=404, response=commons.response)
# obj_type = 'account_cfg'
# result = get_obj_template(

10
app/routers/person.py
View File

@@ -446,6 +446,7 @@ async def lookup_email(
email = email,
enabled = commons.enabled,
limit = commons.limit,
offset = commons.offset,
):
person_result_list = []
for person_rec in person_rec_list_result:
@@ -614,7 +615,7 @@ async def get_account_obj_person_list(
inc_user: bool = False,
commons: Common_Route_Params = Depends(common_route_params),
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.INFO) # 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
@@ -623,11 +624,12 @@ async def get_account_obj_person_list(
response_data = None
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
# Updated 2021-06-30
# Updated 2022-01-17
if person_rec_list_result := get_person_rec_list(
for_obj_type = 'account',
for_obj_id = account_id,
limit = commons.limit,
offset = commons.offset,
enabled = commons.enabled,
):
person_result_list = []
@@ -648,7 +650,11 @@ async def get_account_obj_person_list(
else:
person_result_list.append(None)
response_data = person_result_list
elif isinstance(person_rec_list_result, list) or person_rec_list_result is None: # Empty list or None
log.info('No results')
return mk_resp(data=None, status_code=404, response=commons.response) # Not Found
else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
return mk_resp(data=response_data, response=commons.response)

10
app/routers/user.py
View File

@@ -32,11 +32,11 @@ async def post_user_obj(
obj_type = 'user'
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,
obj_type = obj_type,
data = obj_data_dict,
return_obj = True,
by_alias = True,
exclude_unset = True,
)
return result