diff --git a/app/models/post_comment_models.py b/app/models/post_comment_models.py index b9b3493..8e9ff31 100644 --- a/app/models/post_comment_models.py +++ b/app/models/post_comment_models.py @@ -4,10 +4,12 @@ import datetime, hashlib, logging, os, pytz, redis, secrets from typing import Dict, List, Optional, Set, Union from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator -from app.lib_general import * -from ..log import * +from app.db_sql import redis_lookup_id_random +from app.lib_general import log, logging, secure_hash_string -from .common_field_schema import base_fields, default_num_bytes +from app.models.common_field_schema import base_fields, default_num_bytes +from app.models.person_models import Person_Base +from app.models.user_models import User_Base class Post_Comment_Base(BaseModel): @@ -38,6 +40,10 @@ class Post_Comment_Base(BaseModel): created_on: Optional[datetime.datetime] = None updated_on: Optional[datetime.datetime] = None + # Including other related objects + person: [Person_Base] + user: [User_Base] + _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) #@validator('post_comment_id_random', always=True) diff --git a/app/models/post_models.py b/app/models/post_models.py index d9c3b31..7e7668a 100644 --- a/app/models/post_models.py +++ b/app/models/post_models.py @@ -5,9 +5,11 @@ from typing import Dict, List, Optional, Set, Union from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator from app.db_sql import redis_lookup_id_random -from app.lib_general import * +from app.lib_general import log, logging, secure_hash_string -from .common_field_schema import base_fields, default_num_bytes +from app.models.common_field_schema import base_fields, default_num_bytes +from app.models.person_models import Person_Base +from app.models.user_models import User_Base class Post_Base(BaseModel): @@ -62,6 +64,11 @@ class Post_Base(BaseModel): created_on: Optional[datetime.datetime] = None updated_on: Optional[datetime.datetime] = None + # Including other related objects + post_comment_list: [list] # Post_Comment_Base() + person: [Person_Base] + user: [User_Base] + _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) #@validator('post_id_random', always=True)