Working on all the routes, methods, and models.

This commit is contained in:
Scott Idem
2021-06-18 17:49:32 -04:00
parent 938aabb2a8
commit ce44e93b4d
17 changed files with 614 additions and 285 deletions

View File

@@ -7,7 +7,7 @@ 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.person_methods import load_person_obj
# from app.methods.person_methods import load_person_obj
# from app.methods.post_comment_methods import create_post_comment_obj, update_post_comment_obj
from app.methods.post_comment_methods import get_post_comment_rec_list, load_post_comment_obj
# from app.methods.user_methods import load_user_obj
@@ -46,8 +46,8 @@ def load_post_obj(
exclude_unset: bool = True,
model_as_dict: bool = False,
enabled: str = 'enabled', # enabled, disabled, all
inc_post_comment_list: bool = False,
inc_person: bool = False,
inc_post_comment_list: bool = False,
inc_user: bool = False,
) -> Post_Base|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -70,15 +70,19 @@ def load_post_obj(
except ValidationError as e:
log.error(e.json())
# Updated 2021-06-18
if inc_person:
person_id = post_rec.get('person_id', None)
if person_obj_result := load_person_obj(person_id=person_id):
person_obj = person_obj_result
# post_rec['person'] = person_obj
# log.debug(post_rec)
#post_obj.person = person_obj.dict(by_alias=True, exclude_unset=True)
post_obj.person = person_obj
else: post_obj.person = None
from app.methods.person_methods import load_person_obj
person_result = load_person_obj(
person_id = post_rec.get('person_id', None),
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
enabled = enabled,
)
post_obj.person = person_result
else: post_obj.person = None
# Updated 2021-06-17
if inc_post_comment_list:
@@ -105,18 +109,22 @@ def load_post_obj(
post_obj.post_comment_list = post_comment_result_list
else: post_obj.post_comment_list = []
# Updated 2021-06-18
if inc_user:
user_id = post_rec.get('user_id', None)
if user_obj_result := load_user_obj(user_id=user_id):
user_obj = user_obj_result
# post_rec['user'] = user_obj
# log.debug(post_rec)
#post_obj.user = user_obj.dict(by_alias=True, exclude_unset=True)
post_obj.user = user_obj
else: post_obj.user = None
from app.methods.user_methods import load_user_obj
user_result = load_user_obj(
user_id = post_rec.get('user_id', None),
limit = limit,
by_alias = by_alias,
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
enabled = enabled,
)
post_obj.user = user_result
else: post_obj.user = None
if model_as_dict:
return post_obj.dict(by_alias=True, exclude_unset=True) # pylint: disable=no-member
return post_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
else:
return post_obj
# ### END ### API Post Methods ### load_post_obj() ###