Working on membership, person, and user

app/models/address_models.py

@@ -30,6 +30,9 @@ class Address_Base(BaseModel):
     for_id_random: Optional[str]
     for_id: Optional[int]
 
+    contact_id_random: Optional[str]
+    contact_id: Optional[int]
+
     #organization: Optional[Organization_Base] = Organization_Base()
 
     name: Optional[str]
@@ -41,10 +44,12 @@ class Address_Base(BaseModel):
     line_3: Optional[str]
     city: Optional[str]
     country_subdivision_code: Optional[str]
-    state_province: Optional[str]
+    country_subdivision_name: Optional[str] # From country subdivision lookup table
+    state_province: Optional[str] # Avoid using
     postal_code: Optional[str]
     country_alpha_2_code: Optional[str]
-    country: Optional[str]
+    country_name: Optional[str] # From country lookup table
+    country: Optional[str] # Avoid using
 
     lu_time_zone_id: Optional[str]
     timezone: Optional[str]
@@ -93,6 +98,15 @@ class Address_Base(BaseModel):
             return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
         return None
 
+    @validator('contact_id', always=True)
+    def contact_id_lookup(cls, v, values, **kwargs):
+        log.setLevel(logging.WARNING)
+        log.debug(locals())
+
+        if values['contact_id_random']:
+            return redis_lookup_id_random(record_id_random=values['contact_id_random'], table_name='contact')
+        return None
+
     #@validator('organization_id', always=True)
     #def organization_id_lookup(cls, v, values, **kwargs):
         #log.setLevel(logging.WARNING)