Save before hosted_file_link DB field name changes.

app/models/hosted_file_link_models.py

@@ -0,0 +1,85 @@
+from __future__ import annotations
+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.db_sql import redis_lookup_id_random
+from app.lib_general import log, logging
+
+from .common_field_schema import base_fields, default_num_bytes
+
+
+class Hosted_File_Link_Base(BaseModel):
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    id_random: Optional[str] = Field(
+        **base_fields['hosted_file_link_id_random'],
+        alias='hosted_file_link_id_random',
+        default_factory=lambda:secrets.token_urlsafe(default_num_bytes),
+    )
+    id: Optional[int] = Field(
+        #alias='hosted_file_link_id'
+    )
+    account_id_random: Optional[str]
+    account_id: Optional[int]
+
+    hosted_file_id_random: Optional[str]
+    hosted_file_id: Optional[int]
+
+    link_to_type: Optional[str] # Should this be renamed to "link_to_obj_type" for clarity?
+    link_to_id_random: Optional[str] # Should this be renamed to "link_to_obj_id_random" for clarity?
+    link_to_id: Optional[int] # Should this be renamed to "link_to_obj_id" for clarity?
+
+    # notes: Optional[str]
+    created_on: Optional[datetime.datetime] = None
+    updated_on: Optional[datetime.datetime] = None
+
+    # Including other related objects
+    link_to: Optional[dict] # Should this be renamed to "link_to_obj" or leave off the "_obj"?
+
+    _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
+
+    #@validator('hosted_file_link_id_random', always=True)
+    def hosted_file_link_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 hosted_file_link_id_lookup(cls, v, values, **kwargs):
+        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='hosted_file_link')
+        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('object_id', always=True)
+    def object_id_lookup(cls, v, values, **kwargs):
+        log.setLevel(logging.WARNING)
+        log.debug(locals())
+
+        if values['object_id_random'] and values['object_type']:
+            return redis_lookup_id_random(record_id_random=values['object_id_random'], table_name=values['object_type'])
+        return None
+
+    class Config:
+        underscore_attrs_are_private = True
+        fields = base_fields
+
+Hosted_File_Base.update_forward_refs()

app/models/hosted_file_models.py

@@ -22,8 +22,8 @@ class Hosted_File_Base(BaseModel):
     id: Optional[int] = Field(
         #alias='hosted_file_id'
     )
-    #account_id_random: Optional[str]
-    #account_id: Optional[int]
+    account_id_random: Optional[str]
+    account_id: Optional[int]
 
     hash_sha256: Optional[str]
     title: Optional[str]
@@ -59,6 +59,9 @@ class Hosted_File_Base(BaseModel):
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
+    # Including other related objects
+    hosted_file_link_list: Optional[list] # Hosted_File_Base()
+
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
     #@validator('hosted_file_id_random', always=True)
@@ -80,6 +83,15 @@ class Hosted_File_Base(BaseModel):
             return redis_lookup_id_random(record_id_random=values['id_random'], table_name='hosted_file')
         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
+
     class Config:
         underscore_attrs_are_private = True
         fields = base_fields