A lot of changes related to person and membership

This commit is contained in:
Scott Idem
2021-07-09 17:34:02 -04:00
parent 2b8d00551c
commit 49805f48c9
49 changed files with 1389 additions and 758 deletions

View File

@@ -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_person_models import Membership_Person_Base
from app.models.organization_models import Organization_Base
# from app.models.user_models import User_Base
@@ -39,6 +39,9 @@ class Person_Base(BaseModel):
user_id_random: Optional[str]
user_id: Optional[int]
membership_person_id_random: Optional[str] # Linked from membership_person using the v_person view
membership_person_id: Optional[int] # Linked from membership_person using the v_person view
given_name: Optional[str]
family_name: Optional[str]
middle_name: Optional[str]
@@ -63,8 +66,11 @@ 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 member type of the person
membership_group_list: Optional[list] # Membership_Group_Base() list of groups the person is a part of
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_type_person_list: Optional[list] # Membership_Type_Person_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_group_person_list: Optional[list] # Membership_Group_Person_Base() list of member group person records
order_list: Optional[list] # Order_Base() # Priority l2
order_cart_list: Optional[list] # Order_Base() # Priority l2
organization: Optional[Union[Organization_Base, None]]