Working on all the routes, methods, and models.

app/models/site_models.py

@@ -5,10 +5,10 @@ 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 .site_domain_models import Site_Domain_Base as Site_Domain_Base_2
+from app.models.common_field_schema import base_fields, default_num_bytes
+from app.models.site_domain_models import Site_Domain_Base
 
 
 class Site_Base(BaseModel):
@@ -21,7 +21,7 @@ class Site_Base(BaseModel):
         default_factory=lambda:secrets.token_urlsafe(default_num_bytes),
     )
     id: Optional[int] = Field(
-        #alias='site_id'
+        alias='site_id'
     )
 
     account_id_random: Optional[str]
@@ -75,19 +75,11 @@ class Site_Base(BaseModel):
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
-    site_domain: Optional[Site_Domain_Base_2] = Site_Domain_Base_2()
+    # Including other related objects
+    site_domain_list: Optional[list] # Site_Domain_Base()
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
-    #@validator('site_id_random', always=True)
-    def site_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 site_id_lookup(cls, v, values, **kwargs):
         log.setLevel(logging.WARNING)