feat(v3): robust search wildcards, smart status filtering, and fixed ID population

app/models/site_domain_models.py

@@ -3,7 +3,7 @@ import datetime, pytz
 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.db_sql import get_id_random, redis_lookup_id_random
 from app.lib_general import log, logging
 
 from app.models.common_field_schema import base_fields, default_num_bytes
@@ -38,6 +38,12 @@ class Site_Domain_Base(BaseModel):
 
     cfg_json: Optional[Union[Json, None]] # In use 2024-03-04
 
+    hide: Optional[bool]
+    priority: Optional[bool]
+    sort: Optional[int]
+    group: Optional[str]
+
+    notes: Optional[str]
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
@@ -53,9 +59,23 @@ class Site_Domain_Base(BaseModel):
         log.setLevel(logging.WARNING)
         log.debug(locals())
 
-        if values['id_random']:
-            log.debug(values['id_random'])
-            return redis_lookup_id_random(record_id_random=values['id_random'], table_name='site_domain')
+        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='site_domain')
+        return None
+
+    @validator('account_id', always=True)
+    def account_id_lookup(cls, v, values, **kwargs):
+        if isinstance(v, int) and v > 0: return v
+        elif id_random := values.get('account_id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='account')
+        return None
+
+    @validator('account_id_random', always=True)
+    def account_id_random_lookup(cls, v, values, **kwargs):
+        if isinstance(v, str) and len(v) >= 11: return v
+        elif account_id := values.get('account_id'):
+            return get_id_random(record_id=account_id, table_name='account')
         return None
 
     @validator('site_id', always=True)
@@ -104,12 +124,18 @@ class Site_Domain_FQDN_ID_Base(BaseModel):
     valid_for: Optional[int] # number of hours
     enable: Optional[bool]
 
+    hide: Optional[bool]
+    priority: Optional[bool]
+    sort: Optional[int]
+    group: Optional[str]
+
+    notes: Optional[str]
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
     # Including convenience data
     # This is only for convenience. Probably going to keep unless it causes a problem.
-    # account_id: Optional[int]
+    account_id: Optional[int]
     account_id_random: Optional[str]
     account_code: Optional[str] # Useful for export file naming
     account_name: Optional[str] # Generally useful for display
@@ -131,24 +157,19 @@ class Site_Domain_FQDN_ID_Base(BaseModel):
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    # @validator('id', always=True)
-    # def site_domain_id_lookup(cls, v, values, **kwargs):
-    #     log.setLevel(logging.WARNING)
-    #     log.debug(locals())
+    @validator('account_id', always=True)
+    def account_id_lookup(cls, v, values, **kwargs):
+        if isinstance(v, int) and v > 0: return v
+        elif id_random := values.get('account_id_random'):
+            return redis_lookup_id_random(record_id_random=id_random, table_name='account')
+        return None
 
-    #     if values['id_random']:
-    #         log.debug(values['id_random'])
-    #         return redis_lookup_id_random(record_id_random=values['id_random'], table_name='site_domain')
-    #     return None
-
-    # @validator('account_id', always=True)
-    # def account_id_lookup(cls, v, values, **kwargs):
-    #     log.setLevel(logging.WARNING)
-    #     log.debug(locals())
-
-    #     if values['account_id_random']:
-    #         return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
-    #     return None
+    @validator('account_id_random', always=True)
+    def account_id_random_lookup(cls, v, values, **kwargs):
+        if isinstance(v, str) and len(v) >= 11: return v
+        elif account_id := values.get('account_id'):
+            return get_id_random(record_id=account_id, table_name='account')
+        return None
 
     @validator('site_id', always=True)
     def site_id_lookup(cls, v, values, **kwargs):