Working on membership still...

app/models/account_models.py

@@ -46,7 +46,7 @@ class Account_Base(BaseModel):
     created_on: Optional[datetime.datetime] = None
     updated_on: Optional[datetime.datetime] = None
 
-    testing: Optional[str]
+    # testing: Optional[str]
 
     # Including other related objects
     account_cfg: Optional[Account_Cfg_Base] # Priority l1

app/models/membership_member_models.py

@@ -11,9 +11,9 @@ from app.models.common_field_schema import base_fields, default_num_bytes
 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.person_models import Person_Base
 from app.models.product_models import Product_Base
-from app.models.user_models import User_Base
+# from app.models.user_models import User_Base
 
 
 class Membership_Member_Base(BaseModel):
@@ -73,9 +73,9 @@ class Membership_Member_Base(BaseModel):
     cfg: Optional[Membership_Cfg_Base]
     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]
+    person: Optional[dict] # should be Person_Base() but causes an import loop
     product: Optional[Product_Base] # The product used to become a member?
-    user: Optional[User_Base]
+    user: Optional[dict] # should be User_Base() but causes an import loop
 
     extended_member_profile: Optional[dict] = {}
 

app/models/person_models.py

@@ -10,7 +10,7 @@ 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_member_models import Membership_Member_Base
+from app.models.membership_member_models import Membership_Member_Base
 from app.models.organization_models import Organization_Base
 # from app.models.user_models import User_Base
 
@@ -68,8 +68,8 @@ 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_member: Optional[Membership_Member_Base] # Priority l2
-    # membership_member_list: Optional[list] # Membership_Base() ????
+    membership_member: Optional[Membership_Member_Base] # Priority l2 member type of the person
+    membership_group_list: Optional[list] # Membership_Group_Base() list of groups the person is a part of
     order_list: Optional[list] # Order_Base() # Priority l2
     order_cart_list: Optional[list] # Order_Base() # Priority l2
     organization: Optional[Union[Organization_Base, None]]

app/models/response_models.py

@@ -18,9 +18,9 @@ class Resp_Body_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    test_prop: Optional[str] = Field(
-        alias='test_prop_alias'
-    )
+    # test_prop: Optional[str] = Field(
+    #     alias='test_prop_alias'
+    # )
 
     data: Union[dict, list]
     meta: Optional[dict]

app/routers/membership_member.py

@@ -178,7 +178,6 @@ async def lookup_membership_member_obj(
     return mk_resp(data=data)
 
 
-
 # ### BEGIN ### API Membership Group ### get_membership_member_obj() ###
 # Working well as of 2021-06-24. Using as a template for other routes.
 @router.get('/{membership_member_id}', response_model=Resp_Body_Base)