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_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.user_methods import load_user_obj
|
||||
|
||||
from app.models.post_comment_models import Post_Comment_Base
|
||||
@@ -66,25 +66,33 @@ def load_post_comment_obj(
|
||||
log.error(e.json())
|
||||
return False
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_person:
|
||||
person_id = post_comment_rec.get('person_id', None)
|
||||
if person_obj_result := load_person_obj(person_id=person_id):
|
||||
person_obj = person_obj_result
|
||||
# post_comment_rec['person'] = person_obj
|
||||
# log.debug(post_comment_rec)
|
||||
#post_comment_obj.person = person_obj.dict(by_alias=True, exclude_unset=True)
|
||||
post_comment_obj.person = person_obj
|
||||
else: post_comment_obj.person = None
|
||||
from app.methods.person_methods import load_person_obj
|
||||
person_result = load_person_obj(
|
||||
person_id = post_comment_rec.get('person_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
)
|
||||
post_comment_obj.person = person_result
|
||||
else: post_comment_obj.person = None
|
||||
|
||||
# Updated 2021-06-18
|
||||
if inc_user:
|
||||
user_id = post_comment_rec.get('user_id', None)
|
||||
if user_obj_result := load_user_obj(user_id=user_id):
|
||||
user_obj = user_obj_result
|
||||
# post_comment_rec['user'] = user_obj
|
||||
# log.debug(post_comment_rec)
|
||||
#post_comment_obj.user = user_obj.dict(by_alias=True, exclude_unset=True)
|
||||
post_comment_obj.user = user_obj
|
||||
else: post_comment_obj.user = None
|
||||
from app.methods.user_methods import load_user_obj
|
||||
user_result = load_user_obj(
|
||||
user_id = post_comment_rec.get('user_id', None),
|
||||
limit = limit,
|
||||
by_alias = by_alias,
|
||||
exclude_unset = exclude_unset,
|
||||
model_as_dict = model_as_dict,
|
||||
enabled = enabled,
|
||||
)
|
||||
post_comment_obj.user = user_result
|
||||
else: post_comment_obj.user = None
|
||||
|
||||
if model_as_dict:
|
||||
return post_comment_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
|
||||
|
||||
Reference in New Issue
Block a user