Working on all the routes, methods, and models.
This commit is contained in:
@@ -7,7 +7,7 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
|
||||
from app.db_sql import redis_lookup_id_random, sql_select
|
||||
from app.lib_general import log, logging
|
||||
|
||||
from app.methods.archive_content_methods import load_archive_content_obj, load_archive_content_obj_list
|
||||
from app.methods.archive_content_methods import get_archive_content_rec_list, load_archive_content_obj
|
||||
|
||||
from app.models.archive_models import Archive_Base
|
||||
|
||||
@@ -16,6 +16,8 @@ from app.models.archive_models import Archive_Base
|
||||
def load_archive_obj(
|
||||
archive_id: int|str,
|
||||
limit: int = 1000,
|
||||
by_alias: bool = True,
|
||||
exclude_unset: bool = True,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_archive_content_list: bool = False,
|
||||
@@ -38,95 +40,34 @@ def load_archive_obj(
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_archive_content_list:
|
||||
if archive_content_dict_list := load_archive_content_obj_list(
|
||||
archive_id = archive_id,
|
||||
limit = limit,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
# inc_archive_content_content_list=inc_archive_content_content_list
|
||||
):
|
||||
archive_obj.archive_content_list = archive_content_dict_list
|
||||
else: archive_obj.archive_content_list = None
|
||||
if archive_content_rec_list_result := get_archive_content_rec_list(
|
||||
for_obj_type = 'archive',
|
||||
for_obj_id = archive_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
):
|
||||
archive_content_result_list = []
|
||||
for archive_content_rec in archive_content_rec_list_result:
|
||||
archive_content_result_list.append(
|
||||
load_archive_content_obj(
|
||||
archive_content_id = archive_content_rec.get('archive_content_id', None),
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
)
|
||||
)
|
||||
archive_obj.archive_content_list = archive_content_result_list
|
||||
else: archive_obj.archive_content_list = []
|
||||
|
||||
if model_as_dict:
|
||||
return archive_obj.dict(by_alias=True, exclude_unset=True) # pylint: disable=no-member
|
||||
return archive_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
else:
|
||||
return archive_obj
|
||||
# ### END ### API Archive Methods ### load_archive_obj() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Archive Methods ### load_archive_obj_list() ###
|
||||
def load_archive_obj_list(
|
||||
account_id: int|str,
|
||||
limit: int = 1000,
|
||||
model_as_dict: bool = False,
|
||||
enabled: str = 'enabled', # enabled, disabled, all
|
||||
inc_archive_content_list: bool = False,
|
||||
) -> list|bool:
|
||||
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 False
|
||||
|
||||
data = {}
|
||||
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 = ''
|
||||
# else: tbl_obj['account'] = None
|
||||
|
||||
if limit:
|
||||
data['limit'] = limit
|
||||
sql_limit = f'LIMIT :limit'
|
||||
else:
|
||||
sql_limit = ''
|
||||
|
||||
sql = f"""
|
||||
SELECT `tbl`.id AS 'archive_id', `tbl`.id_random AS 'archive_id_random'
|
||||
FROM `archive` AS `tbl`
|
||||
WHERE `tbl`.account_id = :account_id
|
||||
{sql_enabled}
|
||||
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
|
||||
{sql_limit};
|
||||
"""
|
||||
|
||||
if archive_rec_li_result := sql_select(data=data, sql=sql, as_list=True):
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(archive_rec_li_result)
|
||||
archive_result_li = []
|
||||
for archive_rec in archive_rec_li_result:
|
||||
archive_id = archive_rec.get('archive_id', None)
|
||||
if archive_result := load_archive_obj(
|
||||
archive_id = archive_id,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
inc_archive_content_list = inc_archive_content_list,
|
||||
):
|
||||
log.debug(archive_result)
|
||||
archive_result_li.append(archive_result)
|
||||
else:
|
||||
log.debug(archive_result)
|
||||
archive_result_li.append(None)
|
||||
log.debug(archive_result_li)
|
||||
else:
|
||||
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(archive_rec_li_result)
|
||||
archive_result_li = []
|
||||
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
return archive_result_li
|
||||
# ### END ### API Archive Methods ### load_archive_obj_list() ###
|
||||
|
||||
|
||||
# ### BEGIN ### API Archive Methods ### get_archive_rec_list() ###
|
||||
def get_archive_rec_list(
|
||||
for_obj_type: str,
|
||||
|
||||
Reference in New Issue
Block a user