Working on membership still...

app/models/membership_group_models.py

@@ -26,11 +26,16 @@ class Membership_Group_Base(BaseModel):
     )
     account_id_random: Optional[str]
     account_id: Optional[int]
-    membership_type_id_random: Optional[str]
-    membership_type_id: Optional[int]
+
+    # membership_type_id_random: Optional[str]
+    # membership_type_id: Optional[int]
+
     parent_membership_group_id_random: Optional[str]
     parent_membership_group_id: Optional[int]
 
+    product_id_random: Optional[str]
+    product_id: Optional[int] # The product they purchased to get this membership
+
     name: Optional[str]
     overview: Optional[str]
     description: Optional[str]
@@ -78,14 +83,14 @@ class Membership_Group_Base(BaseModel):
             return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
         return None
 
-    @validator('membership_type_id', always=True)
-    def membership_lookup(cls, v, values, **kwargs):
-        log.setLevel(logging.WARNING)
-        log.debug(locals())
+    # @validator('membership_type_id', always=True)
+    # def membership_type_lookup(cls, v, values, **kwargs):
+    #     log.setLevel(logging.WARNING)
+    #     log.debug(locals())
 
-        if values['membership_type_id_random']:
-            return redis_lookup_id_random(record_id_random=values['membership_type_id_random'], table_name='membership_type')
-        return None
+    #     if values['membership_type_id_random']:
+    #         return redis_lookup_id_random(record_id_random=values['membership_type_id_random'], table_name='membership_type')
+    #     return None
 
     @validator('parent_membership_group_id', always=True)
     def parent_membership_group_id_lookup(cls, v, values, **kwargs):

app/models/membership_member_models.py

@@ -12,6 +12,7 @@ from app.models.membership_cfg_models import Membership_Cfg_Base
 from app.models.membership_member_profile_models import Membership_Member_Profile_Base
 from app.models.membership_type_models import Membership_Type_Base
 from app.models.person_models import Person_Base
+from app.models.product_models import Product_Base
 from app.models.user_models import User_Base
 
 
@@ -73,7 +74,7 @@ class Membership_Member_Base(BaseModel):
     membership_group_list: Optional[list] # Membership_Group_Base() The membership groups they are a part of
     membership_member_profile: Optional[Membership_Member_Profile_Base]
     person: Optional[Person_Base]
-    # product: Optional[Product_Base] # The product used to become a member?
+    product: Optional[Product_Base] # The product used to become a member?
     user: Optional[User_Base]
 
     extended_member_profile: Optional[dict] = {}