Working on all the routes, methods, and models.

app/models/journal_models.py

@@ -5,9 +5,9 @@ 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
 
-from .common_field_schema import base_fields, default_num_bytes
+from app.models.common_field_schema import base_fields, default_num_bytes
 
 
 class Journal_Base(BaseModel):
@@ -15,12 +15,12 @@ class Journal_Base(BaseModel):
     log.debug(locals())
 
     id_random: Optional[str] = Field(
-        **base_fields['product_id_random'],
-        alias='product_id_random',
-        default_factory=lambda:secrets.token_urlsafe(default_num_bytes),
+        **base_fields['journal_id_random'],
+        alias = 'journal_id_random',
+        default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
     )
     id: Optional[int] = Field(
-        #alias='product_id'
+        alias = 'journal_id'
     )
     account_id_random: Optional[str]
     account_id: Optional[int]
@@ -31,8 +31,9 @@ class Journal_Base(BaseModel):
     title: Optional[str]
     summary: Optional[str]
 
-    hide: Optional[int]
-    priority: Optional[int]
+    enable: Optional[bool]
+    hide: Optional[bool]
+    priority: Optional[bool]
     sort: Optional[int]
     group: Optional[str]
 
@@ -40,17 +41,11 @@ class Journal_Base(BaseModel):
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
+    # Including other related objects
+    journal_entry_list: Optional[list] # Journal_Entry_Base()
+
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    #@validator('journal_id_random', always=True)
-    def journal_id_random_copy(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values['id_random']:
-            return values['id_random']
-        return None
-
     @validator('id', always=True)
     def journal_id_lookup(cls, v, values, **kwargs):
         log.setLevel(logging.WARNING)