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

Unknown

Browse Source
This commit is contained in:
Scott Idem
2022-07-15 13:09:07 -04:00
parent 8fa438336f
commit ed6ae8c93e
6 changed files with 108 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
app/methods/site_domain_methods.py
View File

@@ -1,11 +1,10 @@
from __future__ import annotations
import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update
from app.lib_general import log, logging, logger_reset
from app.models.site_domain_models import Site_Domain_Base
@@ -40,12 +39,13 @@ def create_site_domain_obj(site_domain_obj_new:Site_Domain_Base):
# ### BEGIN ### API Site Domain Methods ### load_site_domain_obj() ###
def load_site_domain_obj(
site_domain_id: int|str,
limit: int = 1000,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 100,
offset: int = 0,
by_alias: bool = True,
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_site_domain_list: bool = False,
# inc_site_domain_list: bool = False,
) -> Site_Domain_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -53,7 +53,11 @@ def load_site_domain_obj(
if site_domain_id := redis_lookup_id_random(record_id_random=site_domain_id, table_name='site_domain'): pass
else: return False
if site_domain_rec := sql_select(table_name='v_site_domain', record_id=site_domain_id):
# if site_domain_rec := sql_select(table_name='v_site_domain', record_id=site_domain_id):
# log.debug(site_domain_rec)
# else: return False
if site_domain_rec := sql_select(table_name='site_domain', record_id=site_domain_id):
log.debug(site_domain_rec)
else: return False
@@ -104,45 +108,30 @@ def update_site_domain_obj(
# ### BEGIN ### API Site Domain Methods ### get_site_domain_rec_list() ###
def get_site_domain_rec_list(
for_obj_type: str,
for_obj_id: str,
limit: int = 1000,
site_id: int,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 100,
offset: int = 0,
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
if site_id := redis_lookup_id_random(record_id_random=site_id, table_name='site'): pass
else: return False
data = {}
data[f'{for_obj_type}_id'] = for_obj_id
# data['for_obj_type'] = for_obj_type
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
data['site_id'] = site_id
# if enabled in ['enabled', 'disabled', 'all']:
# if enabled == 'enabled':
# data['enable'] = True
# sql_enabled = f'AND `tbl`.enable = :enable'
# elif enabled == 'disabled':
# data['enable'] = False
# sql_enabled = f'AND `tbl`.enable = :enable'
# elif enabled == 'all':
# sql_enabled = ''
sql_enabled = ''
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
sql_enabled, data['enable'] = sql_enable_part(table_name='site_domain', enabled=enabled) # Reasonably safe return str and bool
sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str
sql = f"""
SELECT `tbl`.id AS 'site_domain_id', `tbl`.id_random AS 'site_domain_id_random'
FROM `site_domain` AS `tbl`
SELECT `site_domain`.id AS 'site_domain_id', `site_domain`.id_random AS 'site_domain_id_random'
FROM `site_domain` AS `site_domain`
WHERE
{sql_obj_type_id}
`site_domain`.site_id = :site_id
{sql_enabled}
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
ORDER BY `site_domain`.fqdn ASC, `site_domain`.access_key ASC, `site_domain`.required_referrer ASC, `site_domain`.created_on DESC, `site_domain`.updated_on DESC
{sql_limit};
"""
@@ -150,8 +139,6 @@ def get_site_domain_rec_list(
site_domain_rec_li = site_domain_rec_li_result
else:
site_domain_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(site_domain_rec_li_result)
return site_domain_rec_li
# ### END ### API Site Domain Methods ### get_site_domain_rec_list() ###

58
app/methods/site_methods.py
View File

@@ -1,11 +1,10 @@
from __future__ import annotations
import datetime
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
from app.db_sql import redis_lookup_id_random, sql_enable_part, sql_insert, sql_limit_offset_part, sql_select, sql_update
from app.lib_general import log, logging, logger_reset
from app.methods.site_domain_methods import get_site_domain_rec_list, load_site_domain_obj
@@ -42,11 +41,12 @@ def create_site_obj(site_obj_new:Site_Base):
# ### BEGIN ### API Site Methods ### load_site_obj() ###
def load_site_obj(
site_id: int|str,
limit: int = 1000,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 100,
offset: int = 0,
by_alias: bool = True,
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_site_domain_list: bool = False,
) -> Site_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -69,10 +69,10 @@ def load_site_obj(
# Updated 2021-06-18
if inc_site_domain_list:
if site_domain_rec_list_result := get_site_domain_rec_list(
for_obj_type = 'site',
for_obj_id = site_id,
limit = limit,
site_id = site_id,
enabled = enabled,
limit = limit,
offset = offset,
):
site_domain_result_list = []
for site_domain_rec in site_domain_rec_list_result:
@@ -125,45 +125,33 @@ def update_site_obj(
# ### BEGIN ### API Site Methods ### get_site_rec_list() ###
# Updated 2022-06-14
@logger_reset
def get_site_rec_list(
for_obj_type: str,
for_obj_id: str,
limit: int = 1000,
account_id: int,
enabled: str = 'enabled', # enabled, disabled, all
limit: int = 100,
offset: int = 0,
) -> list|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
if for_obj_id := redis_lookup_id_random(record_id_random=for_obj_id, table_name=for_obj_type): pass
if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
else: return False
data = {}
data[f'{for_obj_type}_id'] = for_obj_id
# data['for_obj_type'] = for_obj_type
sql_obj_type_id = f'`tbl`.{for_obj_type}_id = :{for_obj_type}_id'
data['account_id'] = account_id
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
data['enable'] = True
sql_enabled = f'AND `tbl`.enable = :enable'
elif enabled == 'disabled':
data['enable'] = False
sql_enabled = f'AND `tbl`.enable = :enable'
elif enabled == 'all':
sql_enabled = ''
if limit:
data['limit'] = limit
sql_limit = f'LIMIT :limit'
else:
sql_limit = ''
sql_enabled, data['enable'] = sql_enable_part(table_name='site', enabled=enabled) # Reasonably safe return str and bool
sql_limit = sql_limit_offset_part(limit=limit, offset=offset) # Reasonably safe return str
sql = f"""
SELECT `tbl`.id AS 'site_id', `tbl`.id_random AS 'site_id_random'
FROM `site` AS `tbl`
SELECT `site`.id AS 'site_id', `site`.id_random AS 'site_id_random'
FROM `site` AS `site`
WHERE
{sql_obj_type_id}
`site`.account_id = :account_id
{sql_enabled}
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
ORDER BY `site`.created_on DESC, `site`.updated_on DESC
{sql_limit};
"""
@@ -171,8 +159,6 @@ def get_site_rec_list(
site_rec_li = site_rec_li_result
else:
site_rec_li = []
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(site_rec_li_result)
return site_rec_li
# ### END ### API Site Methods ### get_site_rec_list() ###