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

Working on journal related

Browse Source
This commit is contained in:
Scott Idem
2021-07-22 14:04:25 -04:00
parent b9483b5bdd
commit 6b2e0b67e0
6 changed files with 86 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/methods/journal_entry_methods.py
View File

@@ -7,8 +7,6 @@ from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, v
from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_update
from app.lib_general import log, logging
# from app.methods.journal_methods import load_journal_entry_obj
from app.models.journal_entry_models import Journal_Entry_Base
@@ -43,10 +41,7 @@ def load_journal_entry_obj(
by_alias: bool = True,
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_journal_entry_list: bool = False,
inc_person: bool = False,
inc_user: bool = False,
# enabled: str = 'enabled', # enabled, disabled, all
) -> Journal_Entry_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -105,20 +100,19 @@ def update_journal_entry_obj(
# ### BEGIN ### API Journal Entry Methods ### get_journal_entry_rec_list() ###
def get_journal_entry_rec_list(
for_obj_type: str,
for_obj_id: str,
journal_id: str,
limit: int = 1000,
enabled: str = 'enabled', # enabled, disabled, all
) -> 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 journal_id := redis_lookup_id_random(record_id_random=journal_id, table_name='journal'): 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['journal_id'] = journal_id
sql_journal_id = f'`tbl`.journal_id = :journal_id'
if enabled in ['enabled', 'disabled', 'all']:
if enabled == 'enabled':
@@ -140,7 +134,7 @@ def get_journal_entry_rec_list(
SELECT `tbl`.id AS 'journal_entry_id', `tbl`.id_random AS 'journal_entry_id_random'
FROM `journal_entry` AS `tbl`
WHERE
{sql_obj_type_id}
{sql_journal_id}
{sql_enabled}
ORDER BY `tbl`.created_on DESC, `tbl`.updated_on DESC
{sql_limit};