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

Clean up

Browse Source
This commit is contained in:
Scott Idem
2021-12-29 19:42:27 -05:00
parent e99be8070e
commit 0866fbbed6
18 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/routers/site_domain.py
View File

@@ -76,7 +76,7 @@ async def patch_site_domain_obj(
@router.get('/lookup_fqdn', response_model=Resp_Body_Base)
async def lookup_site_domain_obj(
fqdn: str,
access_key: Optional[str] = None,
access_key: Optional[str] = Query(None, min_length=4, max_length=50),
referrer: Optional[str] = None,
x_account_id: str = Header(...),
by_alias: bool = True,
@@ -84,7 +84,7 @@ async def lookup_site_domain_obj(
exclude_none: bool = True,
response: Response = Response,
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
data = {}
@@ -115,21 +115,25 @@ async def lookup_site_domain_obj(
# NOTE: This need to broken out into a methods function for site and or site_domain
if site_domain_obj_result := sql_select(data=data, sql=sql):
try:
site_obj = Site_Base(**site_domain_obj_result).dict(by_alias=by_alias, exclude_unset=exclude_unset, exclude_none=exclude_none)
log.debug(site_obj)
except ValidationError as e:
log.error(e.json())
try:
site_domain_obj = Site_Domain_Base(**site_domain_obj_result).dict(by_alias=by_alias, exclude_unset=exclude_unset, exclude_none=exclude_none)
if isinstance(site_domain_obj_result, dict):
try:
site_obj = Site_Base(**site_domain_obj_result).dict(by_alias=by_alias, exclude_unset=exclude_unset, exclude_none=exclude_none)
log.debug(site_obj)
except ValidationError as e:
log.error(e.json())
try:
site_domain_obj = Site_Domain_Base(**site_domain_obj_result).dict(by_alias=by_alias, exclude_unset=exclude_unset, exclude_none=exclude_none)
log.debug(site_domain_obj)
except ValidationError as e:
log.error(e.json())
site_domain_obj['site'] = site_obj
log.debug(site_domain_obj)
except ValidationError as e:
log.error(e.json())
site_domain_obj['site'] = site_obj
log.debug(site_domain_obj)
return mk_resp(data=site_domain_obj)
return mk_resp(data=site_domain_obj, response=response)
else:
log.error(f'More than one site domain records were returned. This was unexpected and needs to be corrected. FQDN: {fqdn}')
return mk_resp(data=False, status_code=500, status_message='More than one site domain was returned. This was unexpected and needs to be corrected.', response=response)
else:
log.debug(site_domain_obj_result)
return mk_resp(data=False, status_code=404, response=response)
@@ -199,7 +203,7 @@ async def get_site_domain_obj(
site_domain_obj['site'] = site_obj
log.debug(site_domain_obj)
return mk_resp(data=site_domain_obj)
return mk_resp(data=site_domain_obj, response=response)
else:
log.debug(site_domain_obj_result)
return mk_resp(data=False, status_code=404, response=response)