Work on data store and related

This commit is contained in:
Scott Idem
2022-07-27 18:05:08 -04:00
parent c87531aff7
commit dd1b3c0b1b
10 changed files with 167 additions and 26 deletions

View File

@@ -4,14 +4,16 @@ 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, common_route_params_min, Common_Route_Params_Min
#from ..log import *
from app.config import settings
from app.db_sql import *
from app.db_sql import sql_enable_part, sql_insert, sql_update, sql_insert_or_update, sql_limit_offset_part, sql_select, sql_delete, redis_lookup_id_random
from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
from app.models.response_models import *
from app.methods.site_domain_methods import load_site_domain_obj, lookup_site_domain_fqdn
from app.models.response_models import Resp_Body_Base, mk_resp
from app.models.site_models import Site_Base
from app.models.site_domain_models import Site_Domain_Base
@@ -73,6 +75,93 @@ async def patch_site_domain_obj(
return result
@router.get('/site/domain/fqdn/{fqdn}', response_model=Resp_Body_Base)
async def lookup_site_domain_obj(
fqdn: str,
# x_account_id: str = Header(...),
# response: Response = Response,
commons: Common_Route_Params_Min = Depends(common_route_params_min),
):
log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
# Updated 2021-12-13
if site_domain_rec_list_result := lookup_site_domain_fqdn(
fqdn = fqdn,
enabled = commons.enabled,
limit = commons.limit,
offset = commons.offset
):
site_domain_result_list = []
for site_domain_rec in site_domain_rec_list_result:
if load_site_domain_result := load_site_domain_obj(
site_domain_id = site_domain_rec.get('site_domain_id', None),
enabled = commons.enabled,
limit = commons.limit,
# by_alias = commons.by_alias,
# exclude_unset = commons.exclude_unset,
# model_as_dict = commons.model_as_dict,
):
site_domain_result_list.append(load_site_domain_result)
else:
site_domain_result_list.append(None)
response_data = site_domain_result_list
elif isinstance(site_domain_rec_list_result, list) or site_domain_rec_list_result is None: # Empty list or None
log.info('No results')
return mk_resp(data=False, 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)
# data = {}
# data['fqdn'] = fqdn
# log.debug(data)
# sql = f"""
# SELECT *, site_enable_from AS 'enable_from', site_enable_to AS 'enable_to'
# FROM `v_site_domain` AS site_domain
# WHERE site_domain.fqdn = :fqdn;
# """
# log.debug(sql)
# # 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):
# if isinstance(site_domain_obj_result, dict):
# log.info('Got a site domain result')
# try:
# site_obj = Site_Base(**site_domain_obj_result).dict(by_alias=by_alias, exclude_unset=exclude_unset, exclude_none=exclude_none)
# except ValidationError as e:
# log.error(e.json())
# log.debug(site_obj)
# try:
# site_domain_obj = Site_Domain_Base(**site_domain_obj_result).dict(by_alias=by_alias, exclude_unset=exclude_unset, exclude_none=exclude_none)
# except ValidationError as e:
# log.error(e.json())
# log.debug(site_domain_obj)
# site_domain_obj['site'] = site_obj
# return mk_resp(data=site_domain_obj, response=response)
# elif isinstance(site_domain_obj_result, list):
# log.info('Got multiple site domain results')
# log.warning(f'More than one site domain records were returned. This was unexpected and needs to be corrected. FQDN: {fqdn}')
# site_domain_obj_li = site_domain_obj_result
# return mk_resp(data=site_domain_obj_li, response=response)
# else:
# log.error(f'Unexpected results for the site domain records was returned. FQDN: {fqdn}; Access Key {access_key}; Referrer: {referrer}')
# return mk_resp(data=False, status_code=500, status_message=f'Unexpected results for the site domain records was returned. FQDN: {fqdn}; Access Key {access_key}; Referrer: {referrer}', response=response)
# else:
# log.info('No site domain results')
# log.debug(site_domain_obj_result)
# return mk_resp(data=False, status_code=404, response=response)
@router.get('/site/domain/lookup_fqdn', response_model=Resp_Body_Base)
async def lookup_site_domain_obj(
fqdn: str,