Working on all module routes, methods, and models

app/models/user_models.py

@@ -8,11 +8,11 @@ from app.db_sql import redis_lookup_id_random
 from app.lib_general import log, logging, secure_hash_string
 
 from app.models.common_field_schema import base_fields, default_num_bytes
-from app.models.contact_models import Contact_Base
-# from app.models.membership_models import Membership_Base
+# from app.models.contact_models import Contact_Base
+# from app.models.membership_member_models import Membership_Member_Base
 from app.models.organization_models import Organization_Base
-# from app.models.person_models import Person_Base # Causes circular import
-from app.models.user_role_models import User_Role_Base
+from app.models.person_models import Person_Base # Causes circular import
+# from app.models.user_role_models import User_Role_Base
 
 
 # ### BEGIN ### API User Models ### User_New_Base() ###
@@ -142,10 +142,13 @@ class User_Out_Base(BaseModel):
     )
     account_id_random: Optional[str]
     #account_id: Optional[int]
+
     contact_id_random: Optional[str]
     #contact_id: Optional[int]
+
     organization_id_random: Optional[str]
     #organization_id: Optional[int]
+
     person_id_random: Optional[str]
     #person_id: Optional[int]
 
@@ -182,20 +185,20 @@ class User_Out_Base(BaseModel):
 
     # Including other related objects
     # from app.models.person_models import Person_Base # Causes circular import
-
-    archive_list: Optional[list] # Archive_Base()
-    contact: Optional[Contact_Base]
-    event_list: Optional[list] # Event_Base() # Priority l1
-    hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
+    # archive_list: Optional[list] # Archive_Base()
+    # contact: Optional[Contact_Base]
+    event_list: Optional[list] # Event_Base() # Priority complete
+    hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l3
     journal_list: Optional[list] # Journal_Base() # Priority l3
-    # membership: Optional[Membership_Base] # Priority l2
+    # membership_member: Optional[Membership_Member_Base] # Priority l2
+    # membership_member_list: Optional[list] # Membership_Base() ???
     order_list: Optional[list] # Order_Base() # Priority l2
     order_cart_list: Optional[list] # Order_Base() # Priority l2
-    organization: Optional[Organization_Base] # Organization_Base() # Priority l3
-    person: Optional[dict] # Person_Base() # Priority l2
+    organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
+    # person: Optional[dict] # Person_Base() # Priority l2
+    person: Optional[Union[Person_Base, None]]
     post_list: Optional[list] # Post_Base() # Priority l1
     user_role_list: Optional[list] # User_Role_Base()
-    role_list: Optional[list] = [] # User_Role_Base() # NOTE <- This is a duplicate of above!
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
@@ -223,10 +226,13 @@ class User_Base(BaseModel):
     )
     account_id_random: Optional[str]
     account_id: Optional[int]
-    contact_id_random: Optional[str]
-    contact_id: Optional[int]
+
+    # contact_id_random: Optional[str]
+    # contact_id: Optional[int]
+
     organization_id_random: Optional[str]
     organization_id: Optional[int]
+
     person_id_random: Optional[str]
     person_id: Optional[int]
 
@@ -263,19 +269,22 @@ class User_Base(BaseModel):
     updated_on: Optional[datetime.datetime] = None
 
     # Including other related objects
-    archive_list: Optional[list] # Archive_Base()
-    contact: Optional[Contact_Base]
+    # from app.models.person_models import Person_Base # Causes circular import
+    # archive_list: Optional[list] # Archive_Base()
+    # contact: Optional[Contact_Base]
     event_list: Optional[list] # Event_Base() # Priority l1
     hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
     journal_list: Optional[list] # Journal_Base() # Priority l3
-    # membership: Optional[Membership_Base] # Priority l2
+    # membership_member: Optional[Membership_Member_Base] # Priority l2
+    # membership_member_list: Optional[list] # Membership_Base() ???
     order_list: Optional[list] # Order_Base() # Priority l2
     order_cart_list: Optional[list] # Order_Base() # Priority l2
-    organization: Optional[Organization_Base] # Organization_Base() # Priority l3
-    person: Optional[dict] # Person_Base() # Priority l2
+    organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
+    # person: Optional[dict] # Person_Base() # Priority l2
+    person: Optional[Union[Person_Base, None]]
     post_list: Optional[list] # Post_Base() # Priority l1
     user_role_list: Optional[list] # User_Role_Base()
-    role_list: Optional[list] = [] # User_Role_Base() # NOTE <- This is a duplicate of above!
+    # role_list: Optional[list] = [] # User_Role_Base() # NOTE <- This is a duplicate of above!
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
 
@@ -307,14 +316,14 @@ class User_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())
+    # @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
+    #     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):