Vision ID: Standardize Site Domain and Journal objects with string-only IDs and searchable mapping

app/models/journal_entry_models.py

@@ -1,7 +1,7 @@
 import datetime, pytz
 
 from typing import Dict, List, Optional, Set, Union, ClassVar
-from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
+from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator, root_validator
 
 from app.db_sql import redis_lookup_id_random
 from app.lib_general import log, logging
@@ -14,23 +14,18 @@ class Journal_Entry_Base(BaseModel):
     log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    id_random: Optional[str] = Field(
-        **base_fields['journal_entry_id_random'],
-        alias = 'journal_entry_id_random',
-    )
-    id: Optional[int] = Field(
-        alias = 'journal_entry_id'
-    )
-
-    journal_id_random: Optional[str]
-    journal_id: Optional[int]
+    # --- Standardized Vision IDs (Strings) ---
+    id: Optional[str] = Field(None, **base_fields['journal_entry_id_random'])
+    journal_entry_id: Optional[str] = Field(None, **base_fields['journal_entry_id_random'])
+    journal_id: Optional[str] = Field(None, **base_fields['journal_id_random'])
+    account_id: Optional[str] = Field(None, **base_fields['account_id_random'])
 
     external_id: Optional[str] # ID generated by or for external systems (should be stable and not change)
     import_id: Optional[str] # Used for import purposes to track the source of the data
     code: Optional[str]
 
     for_type: Optional[str] # 'person', 'user', 'account', etc
-    for_id: Optional[int]
+    for_id: Optional[int] = Field(None, exclude=True)
     for_id_random: Optional[str]
 
     name: Optional[str]
@@ -76,10 +71,11 @@ class Journal_Entry_Base(BaseModel):
     personal: Optional[bool] = True
     professional: Optional[bool] = False
 
-    parent_id_random: Optional[str]
-    parent_id: Optional[int]
+    parent_id: Optional[str] = Field(None, **base_fields['journal_entry_id_random'])
+    # parent_id_random: Optional[str]
+    
     related_entry_id_random: Optional[List[str]]
-    related_entry_id_li: Optional[List[int]]
+    related_entry_id_li: Optional[List[int]] = Field(None, exclude=True)
 
     due_datetime: Optional[datetime.datetime]
     due_alert: Optional[bool]
@@ -113,41 +109,38 @@ class Journal_Entry_Base(BaseModel):
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    @validator('id', always=True)
-    def journal_entry_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='journal_entry')
-        return None
-
-    @validator('journal_id', always=True)
-    def journal_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('journal_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='journal')
-        return None
-
-    @validator('parent_id', always=True)
-    def parent_id_lookup(cls, v, values, **kwargs):
-        if isinstance(v, int) and v > 0: return v
-        elif id_random := values.get('parent_id_random'):
-            return redis_lookup_id_random(record_id_random=id_random, table_name='journal_entry')
-        return None
-
-    @validator('for_id', always=True)
-    def for_id_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
-
-        if values.get('for_id_random') and values.get('for_type'):
-            return redis_lookup_id_random(record_id_random=values['for_id_random'], table_name=values['for_type'])
-        return None
+    @root_validator(pre=True)
+    def map_v3_ids(cls, values):
+        """
+        Vision Transformer:
+        Map DB keys to clean API keys and strip internal integers.
+        """
+        # 1. Map Random Strings to Clean Names
+        if rid := values.get('id_random') or values.get('journal_entry_id_random'):
+            values['id'] = rid
+            values['journal_entry_id'] = rid
+            
+        if j_rid := values.get('journal_id_random'):
+            values['journal_id'] = j_rid
+            
+        if a_rid := values.get('account_id_random'):
+            values['account_id'] = a_rid
+            
+        if p_rid := values.get('parent_id_random'):
+            values['parent_id'] = p_rid
+            
+        # 2. Prevent "Collision Population"
+        for k in ['id', 'journal_id', 'account_id', 'parent_id']:
+            if k in values and not isinstance(values[k], str):
+                del values[k]
+                
+        return values
 
     # Fields that are part of the model (for reading) but should not be saved to the DB table
     fields_to_exclude_from_db: ClassVar[list] = ['file_count']
 
     class Config:
         underscore_attrs_are_private = True
-        allow_population_by_field_name = True
+        allow_population_by_field_name = False
         fields = base_fields
 # ### END ### API Journal Entry Models ### Journal_Entry_Base() ###