Clean up of new Aether configs
This commit is contained in:
@@ -18,7 +18,7 @@ from . import config
|
|||||||
from app.log import log, logging
|
from app.log import log, logging
|
||||||
|
|
||||||
# Import the routers here first:
|
# Import the routers here first:
|
||||||
from app.routers import api_crud, api, importing, sql, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, data_store, event, event_badge, event_badge_template, event_device, event_exhibit, event_exhibit_tracking, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_person_group, membership_person, membership_person_profile, membership_type, membership_person_type, order, order_v3, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, qr, site, site_domain, user, websockets, e_cvent, c_idaa, e_impexium
|
from app.routers import aether_cfg, api_crud, api, importing, sql, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, data_store, event, event_badge, event_badge_template, event_device, event_exhibit, event_exhibit_tracking, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_person_group, membership_person, membership_person_profile, membership_type, membership_person_type, order, order_v3, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, qr, site, site_domain, user, websockets, e_cvent, c_idaa, e_impexium
|
||||||
|
|
||||||
from app.db_sql import db, sql_select # , sql_connect
|
from app.db_sql import db, sql_select # , sql_connect
|
||||||
|
|
||||||
@@ -48,7 +48,7 @@ if aether_cfg_sql_result := sql_select(
|
|||||||
table_name = 'cfg',
|
table_name = 'cfg',
|
||||||
record_id = config.settings.AETHER_CFG['id'],
|
record_id = config.settings.AETHER_CFG['id'],
|
||||||
as_list = False,
|
as_list = False,
|
||||||
max_count = 1
|
max_count = 1,
|
||||||
):
|
):
|
||||||
aether_cfg_sql = aether_cfg_sql_result
|
aether_cfg_sql = aether_cfg_sql_result
|
||||||
|
|
||||||
@@ -87,6 +87,10 @@ app.mount('/static', StaticFiles(directory='static'), name='static')
|
|||||||
|
|
||||||
|
|
||||||
# Set up each route once the router has been imported
|
# Set up each route once the router has been imported
|
||||||
|
app.include_router(
|
||||||
|
aether_cfg.router,
|
||||||
|
tags=['Aether Config'],
|
||||||
|
)
|
||||||
app.include_router(
|
app.include_router(
|
||||||
api_crud.router,
|
api_crud.router,
|
||||||
prefix='/crud',
|
prefix='/crud',
|
||||||
|
|||||||
63
app/routers/aether_cfg.py
Normal file
63
app/routers/aether_cfg.py
Normal file
@@ -0,0 +1,63 @@
|
|||||||
|
import datetime
|
||||||
|
#from datetime import datetime, time, timedelta
|
||||||
|
from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Response, status
|
||||||
|
from pydantic import BaseModel, EmailStr, Field
|
||||||
|
from typing import Dict, List, Optional, Set, Union
|
||||||
|
|
||||||
|
from app.lib_general import log, logging, common_route_params, Common_Route_Params
|
||||||
|
from app.config import settings
|
||||||
|
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 app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
|
||||||
|
|
||||||
|
# from app.models.aether_cfg_models import Aether_Cfg_Base
|
||||||
|
from app.models.response_models import Resp_Body_Base, mk_resp
|
||||||
|
|
||||||
|
|
||||||
|
router = APIRouter()
|
||||||
|
|
||||||
|
|
||||||
|
@router.get('/aether/cfg/{aether_cfg_id}', response_model=Resp_Body_Base)
|
||||||
|
async def get_aether_cfg_obj(
|
||||||
|
aether_cfg_id: int,
|
||||||
|
# aether_cfg_id: str = Query(..., min_length=1, max_length=22),
|
||||||
|
|
||||||
|
# commons: Common_Route_Params = Depends(common_route_params),
|
||||||
|
x_account_id: str = Header(None, min_length=11, max_length=22),
|
||||||
|
response: Response = Response,
|
||||||
|
):
|
||||||
|
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||||
|
log.debug(locals())
|
||||||
|
|
||||||
|
if sql_select_result := sql_select(
|
||||||
|
table_name = 'cfg',
|
||||||
|
record_id = aether_cfg_id,
|
||||||
|
as_list = False,
|
||||||
|
max_count = 1,
|
||||||
|
):
|
||||||
|
return mk_resp(data=sql_select_result)
|
||||||
|
else:
|
||||||
|
return mk_resp(data=None, status_code=404)
|
||||||
|
|
||||||
|
|
||||||
|
@router.get('/aether/flask/cfg/{aether_flask_cfg_id}', response_model=Resp_Body_Base)
|
||||||
|
async def get_aether_flask_cfg_obj(
|
||||||
|
aether_flask_cfg_id: int,
|
||||||
|
# aether_flask_cfg_id: str = Query(..., min_length=1, max_length=22),
|
||||||
|
|
||||||
|
# commons: Common_Route_Params = Depends(common_route_params),
|
||||||
|
x_account_id: str = Header(None, min_length=11, max_length=22),
|
||||||
|
response: Response = Response,
|
||||||
|
):
|
||||||
|
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||||
|
log.debug(locals())
|
||||||
|
|
||||||
|
if sql_select_result := sql_select(
|
||||||
|
table_name = 'flask_cfg',
|
||||||
|
record_id = aether_flask_cfg_id,
|
||||||
|
as_list = False,
|
||||||
|
max_count = 1,
|
||||||
|
):
|
||||||
|
return mk_resp(data=sql_select_result)
|
||||||
|
else:
|
||||||
|
return mk_resp(data=None, status_code=404)
|
||||||
Reference in New Issue
Block a user