Code clean up. More changes to membership tables, views, routes, methods, and models renamed.

app/models/membership_group_models.py

@@ -47,10 +47,10 @@ class Membership_Group_Base(BaseModel):
     updated_on: Optional[datetime.datetime] = None
 
     # Including other related objects
-    cfg: Optional[Membership_Cfg_Base]
-    # membership_type: Optional[Membership_Type_Base] # The membership option/type they currently have
+    membership_cfg: Optional[Membership_Cfg_Base] = Field(
+        alias = 'cfg',
+        )
     membership_person_group_list: Optional[list] # Membership_Person_Group_Base
-    # parent_membership_group: Optional[Membership_Group_Base]
     product_list: Optional[list] # Product_Base() List of products (for_type and for_id) that get this membership option
 
     _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

app/models/membership_person_models.py

@@ -136,27 +136,36 @@ class Membership_Person_Base(BaseModel):
         alias = 'cfg',
         )
 
-    membership_group: Optional[Membership_Group_Base] # The primary membership group option they currently have
-    membership_group_list: Optional[list] = Field(
-        # alias = 'group_list',
-        ) # Membership_Group_Base() The group information for all the membership groups they are a part of
-    # membership_person_group: Optional[Membership_Person_Group_Base] # The group person information for the primary membership group they currently have
-    membership_person_group_list: Optional[list] = Field(
-        # alias = 'group_person_list',
-        ) # Membership_Group_Base() The group person information for all the membership groups they are a part of
+    # membership_person_group: Optional[Membership_Person_Group_Base] # Not currently used
+    membership_person_group_list: Optional[list[Membership_Person_Group_Base]] # The list of membership group information the person has
+    membership_person_profile: Optional[Membership_Person_Profile_Base]
+    membership_person_type: Optional[Membership_Person_Type_Base] # The membership type information for the primary membership type the person has
+    # membership_person_type_list: Optional[list[Membership_Person_Type_Base]] # Not currently used
 
-    membership_person_profile: Optional[Membership_Person_Profile_Base] = Field(
-        alias = 'profile',
-        )
+    membership_group: Optional[Membership_Group_Base]
+    membership_group_list: Optional[list[Membership_Group_Base]]
+
+    membership_type: Optional[Membership_Type_Base] # The primary membership type option they currently have
+    membership_type_list: Optional[list[Membership_Type_Base]]
+
+    # membership_group_list: Optional[list] = Field(
+    #     # alias = 'group_list',
+    #     ) # Membership_Group_Base() The group information for all the membership groups they are a part of
+    # membership_person_group: Optional[Membership_Person_Group_Base] # The group person information for the primary membership group they currently have
+    # membership_person_group_list: Optional[list] = Field(
+    #     # alias = 'group_person_list',
+    #     ) # Membership_Group_Base() The group person information for all the membership groups they are a part of
+
+     # = Field(
+        # alias = 'profile',
+        # )
     #  = Field(
     #     alias = 'extended_membership_person_profile',
     #     )
 
-    membership_type: Optional[Membership_Type_Base] # The primary membership type option they currently have
-    membership_type_list: Optional[list] = Field(
-        # alias = 'type_list',
-        ) # Membership_Type_Base() The type information for all the membership types they are a part of
-    membership_person_type: Optional[Membership_Person_Type_Base] # The type person information for the primary membership type they currently have
+    # membership_type_list: Optional[list] = Field(
+    #     # alias = 'type_list',
+    #     ) # Membership_Type_Base() The type information for all the membership types they are a part of
     # membership_person_type_list: Optional[list] = Field(
     #     alias = 'type_person_list',
     #     ) # Membership_Person_Type_Base() The type person information for all the membership types they are a part of

app/models/membership_type_models.py

@@ -71,7 +71,9 @@ class Membership_Type_Base(BaseModel):
     # additional_terms_conditions: Optional[dict] = {} # Is this useful?
 
     # Including other related objects
-    cfg: Optional[Membership_Cfg_Base]
+    membership_cfg: Optional[Membership_Cfg_Base] = Field(
+        alias = 'cfg',
+        )
     membership_person_type_list: Optional[list] # Membership_Person_Type_Base() List of people for membership type
     product_list: Optional[list] # Product_Base() List of products (for_type and for_id) that get this membership option
 

app/models/person_models.py

@@ -10,7 +10,9 @@ from app.lib_general import log, logging
 from app.models.common_field_schema import base_fields, default_num_bytes
 # from app.models.account_models import Account_Base
 from app.models.contact_models import Contact_Base
+from app.models.membership_group_models import Membership_Group_Base
 from app.models.membership_person_models import Membership_Person_Base
+from app.models.membership_type_models import Membership_Type_Base
 from app.models.organization_models import Organization_Base
 from app.models.user_models import User_Base
 
@@ -120,17 +122,19 @@ class Person_Base(BaseModel):
     hosted_file_list: Optional[list] # Hosted_File_Base() # Priority l2
     journal_list: Optional[list] # Journal_Base() # Priority l3
     contact: Optional[Union[Contact_Base, None]]
-    membership_person: Optional[Membership_Person_Base] # Priority l2 member person record of the person
-    membership_type_list: Optional[list] # Membership_Type_Base() list of member types the person has... for now this should be only one at most.
-    membership_person_type_list: Optional[list] # Membership_Person_Type_Base() list of member type person records... for now this should be only one at most.
-    membership_group_list: Optional[list] # Membership_Group_Base() list of member groups the person has
-    membership_person_group_list: Optional[list] # Membership_Person_Group_Base() list of member group person records
+    membership_person: Optional[Membership_Person_Base]
+
+    membership_group_list: Optional[list[Membership_Group_Base]] # Membership_Group_Base() list of member group options
+    membership_type_list: Optional[list[Membership_Type_Base]] # Membership_Type_Base() list of member type options
+    # membership_person_type_list: Optional[list] # Membership_Person_Type_Base() list of member type person records... for now this should be only one at most.
+    # membership_person_group_list: Optional[list] # Membership_Person_Group_Base() list of member group person records
+
     orders_info: Optional[dict] # closed_count, etc
     order_list: Optional[list] # Order_Base() # Priority l2
     order_cart: Optional[dict] # Order_Cart_Base() # Priority l2
+
     organization: Optional[Union[Organization_Base, None]]
     post_list: Optional[list] # Post_Base() # Priority l1
-    # user: Optional[dict] # Optional[Union[User_Base, None]]
     # from app.models.user_models import User_Base
     user: Optional[Union[User_Base, None]]