Scott.Idem/OSIT-AE-API-FastAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

A lot of changes related to person and membership

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
app/models/account_models.py
View File

@@ -59,7 +59,7 @@ class Account_Base(BaseModel):
journal_list: Optional[list] # Journal_Base() # Priority l3
membership_cfg: Optional[Membership_Cfg_Base] # Priority l2
membership_group_list: Optional[list] # Membership_Group_Base() # Priority l2
membership_member_list: Optional[list] # Membership_Member_Base() # Priority l2
membership_person_list: Optional[list] # Membership_Person_Base() # Priority l2
membership_type_list: Optional[list] # Membership_Type_Base() # Priority l2
order_list: Optional[list] # Order_Base() # Priority l2
organization_list: Optional[list] # Organization_Base() # Priority l3

7
app/models/common_field_schema.py
View File

@@ -52,10 +52,11 @@ base_fields['log_client_viewing_id_random'] = xxx_id_random_field_schema
# base_fields['membership_id_random'] = xxx_id_random_field_schema # renamed to membership_type
base_fields['membership_cfg_id_random'] = xxx_id_random_field_schema
base_fields['membership_group_id_random'] = xxx_id_random_field_schema
base_fields['membership_group_member_id_random'] = xxx_id_random_field_schema
base_fields['membership_member_id_random'] = xxx_id_random_field_schema
base_fields['membership_member_profile_id_random'] = xxx_id_random_field_schema
base_fields['membership_group_person_id_random'] = xxx_id_random_field_schema
base_fields['membership_person_id_random'] = xxx_id_random_field_schema
base_fields['membership_person_profile_id_random'] = xxx_id_random_field_schema
base_fields['membership_type_id_random'] = xxx_id_random_field_schema
base_fields['membership_type_person_id_random'] = xxx_id_random_field_schema
base_fields['order_cart_id_random'] = xxx_id_random_field_schema
base_fields['order_cart_line_id_random'] = xxx_id_random_field_schema
base_fields['order_id_random'] = xxx_id_random_field_schema

8
app/models/contact_models.py
View File

@@ -41,10 +41,9 @@ class Contact_Base(BaseModel):
description: Optional[str]
lu_time_zone_id: Optional[str]
timezone: Optional[str]
timezone_name: Optional[str]
email: Optional[str]
website_url: Optional[str]
website_name: Optional[str]
phone_mobile: Optional[str]
phone_home: Optional[str]
@@ -52,10 +51,13 @@ class Contact_Base(BaseModel):
phone_land: Optional[str]
phone_fax: Optional[str]
website_url: Optional[str]
website_name: Optional[str]
facebook_url: Optional[str]
instagram_url: Optional[str]
twitter_url: Optional[str]
linkedin_url: Optional[str]
twitter_url: Optional[str]
other_site_url: Optional[str]
other_site_name: Optional[str]

8
app/models/membership_cfg_models.py
View File

@@ -39,9 +39,9 @@ class Membership_Cfg_Base(BaseModel):
confirm_name: Optional[str]
# Including JSON data
# extended_membership_member_profile: Optional[str] # list of dicts outlining extended (custom) membership profile fields for client
# extended_membership_member_profile: Optional[Json] = '[]' # list of dicts outlining extended (custom) membership profile fields for client
# extended_membership_member_profile: Optional[Json] # list of dicts outlining extended (custom) membership profile fields for client
extended_membership_member_profile: Optional[str] # list of dicts outlining extended (custom) membership profile fields for client
# extended_membership_person_profile: Optional[str] # list of dicts outlining extended (custom) membership profile fields for client
# extended_membership_person_profile: Optional[Json] = '[]' # list of dicts outlining extended (custom) membership profile fields for client
# extended_membership_person_profile: Optional[Json] # list of dicts outlining extended (custom) membership profile fields for client
extended_membership_person_profile: Optional[str] # list of dicts outlining extended (custom) membership profile fields for client
Membership_Cfg_Base.update_forward_refs()

2
app/models/membership_group_models.py
View File

@@ -49,7 +49,7 @@ class Membership_Group_Base(BaseModel):
# Including other related objects
cfg: Optional[Membership_Cfg_Base]
# membership_type: Optional[Membership_Type_Base] # The membership option/type they currently have
membership_group_member_list: Optional[list] # Membership_Group_Member_Base
membership_group_person_list: Optional[list] # Membership_Group_Person_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

56
app/models/membership_group_member_models.py → app/models/membership_group_person_models.py
View File

@@ -8,32 +8,50 @@ from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
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_group_models import Membership_Group_Base
from app.models.membership_member_models import Membership_Member_Base
from app.models.product_models import Product_Base
class Membership_Group_Member_Base(BaseModel):
class Membership_Group_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['membership_group_member_id_random'],
alias = 'membership_group_member_id_random',
**base_fields['membership_group_person_id_random'],
alias = 'membership_group_person_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'membership_group_member_id'
alias = 'membership_group_person_id'
)
membership_group_id_random: Optional[str]
membership_group_id: Optional[int]
membership_member_id_random: Optional[str]
membership_member_id: Optional[int]
account_id_random: Optional[str]
account_id: Optional[int]
membership_group_id_random: Optional[str] = Field(
alias = 'group_id_random',
) # NOTE: This is not optional
membership_group_id: Optional[int] = Field(
alias = 'group_id',
) # NOTE: This is not optional
membership_group_name: Optional[str] = Field(
alias = 'group_name',
)
membership_person_id_random: Optional[str]
membership_person_id: Optional[int]
product_id_random: Optional[str]
product_id: Optional[int] # The product they purchased to get this membership
membership_group_status_id: Optional[int] = Field(
alias = 'status_id'
)
membership_group_status_name: Optional[str] = Field(
alias = 'status_name'
)
flag: Optional[bool]
flag_message: Optional[str]
@@ -43,14 +61,16 @@ class Membership_Group_Member_Base(BaseModel):
updated_on: Optional[datetime.datetime] = None
# Including other related objects
membership_cfg: Optional[Membership_Cfg_Base] = Field(
alias = 'cfg',
)
membership_group: Optional[Membership_Group_Base]
membership_member: Optional[Membership_Member_Base]
product: Optional[Product_Base] # The product used to be a part of the group?
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('membership_group_member_id_random', always=True)
def membership_group_member_id_random_copy(cls, v, values, **kwargs):
#@validator('membership_group_person_id_random', always=True)
def membership_group_person_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
@@ -59,12 +79,12 @@ class Membership_Group_Member_Base(BaseModel):
return None
@validator('id', always=True)
def membership_group_member_id_lookup(cls, v, values, **kwargs):
def membership_group_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_group_member')
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_group_person')
return None
@validator('membership_group_id', always=True)
@@ -76,13 +96,13 @@ class Membership_Group_Member_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['membership_group_id_random'], table_name='membership_group')
return None
@validator('membership_member_id', always=True)
def membership_member_id_lookup(cls, v, values, **kwargs):
@validator('membership_person_id', always=True)
def membership_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['membership_member_id_random']:
return redis_lookup_id_random(record_id_random=values['membership_member_id_random'], table_name='membership_member')
if values['membership_person_id_random']:
return redis_lookup_id_random(record_id_random=values['membership_person_id_random'], table_name='membership_person')
return None
@validator('product_id', always=True)

204
app/models/membership_person_models.py Normal file
View File

@@ -0,0 +1,204 @@
from __future__ import annotations
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
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_group_models import Membership_Group_Base
from app.models.membership_group_person_models import Membership_Group_Person_Base
from app.models.membership_person_profile_models import Membership_Person_Profile_Base
from app.models.membership_type_models import Membership_Type_Base
from app.models.membership_type_person_models import Membership_Type_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
class Membership_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['membership_person_id_random'],
alias = 'membership_person_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'membership_person_id'
)
account_id_random: Optional[str]
account_id: Optional[int]
membership_person_status_id: Optional[int] = Field(
alias = 'status_id'
)
membership_person_status_name: Optional[str] = Field(
alias = 'status_name'
)
membership_group_id_random: Optional[str] = Field(
alias = 'group_id_random',
) # NOTE: This is not optional
membership_group_id: Optional[int] = Field(
alias = 'group_id',
) # NOTE: This is not optional
membership_group_name: Optional[str] = Field(
alias = 'group_name',
)
membership_type_id_random: Optional[str] = Field(
alias = 'type_id_random',
) # NOTE: This is not optional
membership_type_id: Optional[int] = Field(
alias = 'type_id',
) # NOTE: This is not optional
membership_type_name: Optional[str] = Field(
alias = 'type_name',
)
person_id_random: Optional[str]
person_id: Optional[int]
product_id_random: Optional[str]
product_id: Optional[int] # The product they purchased to get this membership
user_id_random: Optional[str]
user_id: Optional[int]
level: Optional[int] = Field(0, ge=0, lt=150)
application_start_on: Optional[datetime.datetime] = None
approved_on: Optional[datetime.datetime] = None
first_start_on: Optional[datetime.datetime] = None
start_buffer_on: Optional[datetime.datetime] = None
start_on: Optional[datetime.datetime] = None
end_on: Optional[datetime.datetime] = None
end_buffer_on: Optional[datetime.datetime] = None
flag: Optional[bool]
flag_message: Optional[str]
notes: Optional[str]
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
# Including other related objects
membership_cfg: Optional[Membership_Cfg_Base] = Field(
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_group_person: Optional[Membership_Group_Person_Base] # The group person information for the primary membership group they currently have
membership_group_person_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_profile: Optional[Membership_Person_Profile_Base] = 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_type_person: Optional[Membership_Type_Person_Base] # The type person information for the primary membership type they currently have
membership_type_person_list: Optional[list] = Field(
alias = 'type_person_list',
) # Membership_Type_Person_Base() The type person information for all the membership types they are a part of
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[dict] # should be User_Base() but causes an import loop
extended_member_profile: Optional[dict] = {}
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('membership_person_id_random', always=True)
def membership_person_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
return values['id_random']
return None
@validator('id', always=True)
def membership_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_person')
return None
@validator('account_id', always=True)
def account_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['account_id_random']:
return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
return None
@validator('membership_group_id', always=True)
def membership_group_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['membership_group_id_random']:
return redis_lookup_id_random(record_id_random=values['membership_group_id_random'], table_name='membership_group')
return None
@validator('membership_type_id', always=True)
def membership_type_id_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
@validator('person_id', always=True)
def person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['person_id_random']:
return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person')
return None
@validator('product_id', always=True)
def product_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['product_id_random']:
return redis_lookup_id_random(record_id_random=values['product_id_random'], table_name='product')
return None
@validator('user_id', always=True)
def user_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['user_id_random']:
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
return None
class Config:
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields

20
app/models/membership_member_profile_models.py → app/models/membership_person_profile_models.py
View File

@@ -9,29 +9,25 @@ from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
from app.models.contact_models import Contact_Base
from app.models.membership_type_models import Membership_Type_Base
from app.models.organization_models import Organization_Base
class Membership_Member_Profile_Base(BaseModel):
class Membership_Person_Profile_Base(BaseModel):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['membership_member_profile_id_random'],
alias = 'membership_member_profile_id_random',
**base_fields['membership_person_profile_id_random'],
alias = 'membership_person_profile_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'membership_member_profile_id'
alias = 'membership_person_profile_id'
)
contact_id_random: Optional[str]
contact_id: Optional[int]
# membership_type_id_random: Optional[str]
# membership_type_id: Optional[int]
organization_id_random: Optional[str]
organization_id: Optional[int]
@@ -56,8 +52,8 @@ class Membership_Member_Profile_Base(BaseModel):
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('membership_member_profile_id_random', always=True)
def membership_member_profile_id_random_copy(cls, v, values, **kwargs):
#@validator('membership_person_profile_id_random', always=True)
def membership_person_profile_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
@@ -66,13 +62,13 @@ class Membership_Member_Profile_Base(BaseModel):
return None
@validator('id', always=True)
def membership_member_profile_id_lookup(cls, v, values, **kwargs):
def membership_person_profile_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
log.debug(values['id_random'])
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_member_profile')
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_person_profile')
return None
@validator('contact_id', always=True)

2
app/models/membership_type_models.py
View File

@@ -72,7 +72,7 @@ class Membership_Type_Base(BaseModel):
# Including other related objects
cfg: Optional[Membership_Cfg_Base]
membership_member_list: Optional[list] # Membership_Member_Base() List of membership members
membership_type_person_list: Optional[list] # Membership_Type_Person_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
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

74
app/models/membership_member_models.py → app/models/membership_type_person_models.py
View File

@@ -9,36 +9,26 @@ from app.lib_general import log, logging
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.product_models import Product_Base
# from app.models.user_models import User_Base
class Membership_Member_Base(BaseModel):
class Membership_Type_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['membership_member_id_random'],
alias = 'membership_member_id_random',
**base_fields['membership_type_person_id_random'],
alias = 'membership_type_person_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'membership_member_id'
alias = 'membership_type_person_id'
)
account_id_random: Optional[str]
account_id: Optional[int]
membership_member_status_id: Optional[int] = Field(
alias = 'status_id'
)
membership_member_status_name: Optional[str] = Field(
alias = 'status_name'
)
membership_type_id_random: Optional[str] = Field(
alias = 'type_id_random',
) # NOTE: This is not optional
@@ -49,14 +39,18 @@ class Membership_Member_Base(BaseModel):
alias = 'type_name',
)
person_id_random: Optional[str]
person_id: Optional[int]
membership_person_id_random: Optional[str]
membership_person_id: Optional[int]
product_id_random: Optional[str]
product_id: Optional[int] # The product they purchased to get this membership
user_id_random: Optional[str]
user_id: Optional[int]
membership_type_status_id: Optional[int] = Field(
alias = 'status_id'
)
membership_type_status_name: Optional[str] = Field(
alias = 'status_name'
)
level: Optional[int] = Field(0, ge=0, lt=150)
@@ -77,32 +71,16 @@ class Membership_Member_Base(BaseModel):
updated_on: Optional[datetime.datetime] = None
# Including other related objects
membership_type: Optional[Membership_Type_Base] # The membership option they currently have
membership_cfg: Optional[Membership_Cfg_Base] = Field(
alias = 'cfg',
)
membership_group_list: Optional[list] = Field(
alias = 'group_list',
) # Membership_Group_Base() The membership groups they are a part of
membership_member_profile: Optional[Membership_Member_Profile_Base] = Field(
alias = 'profile',
)
# membership_member_profile: Optional[Membership_Member_Profile_Base] = Field(
# alias = 'profile',
# )
# = Field(
# alias = 'extended_membership_member_profile',
# )
person: Optional[dict] # should be Person_Base() but causes an import loop
membership_type: Optional[Membership_Type_Base] # The membership option they currently have
product: Optional[Product_Base] # The product used to become a member?
user: Optional[dict] # should be User_Base() but causes an import loop
extended_member_profile: Optional[dict] = {}
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('membership_member_id_random', always=True)
def membership_member_id_random_copy(cls, v, values, **kwargs):
#@validator('membership_type_person_id_random', always=True)
def membership_type_person_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
@@ -111,12 +89,12 @@ class Membership_Member_Base(BaseModel):
return None
@validator('id', always=True)
def membership_member_id_lookup(cls, v, values, **kwargs):
def membership_type_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['id_random']:
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_member')
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_type_person')
return None
@validator('account_id', always=True)
@@ -137,15 +115,6 @@ class Membership_Member_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['membership_type_id_random'], table_name='membership_type')
return None
@validator('person_id', always=True)
def person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['person_id_random']:
return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person')
return None
@validator('product_id', always=True)
def product_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
@@ -155,15 +124,6 @@ class Membership_Member_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['product_id_random'], table_name='product')
return None
@validator('user_id', always=True)
def user_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['user_id_random']:
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
return None
class Config:
underscore_attrs_are_private = True
allow_population_by_field_name = True

12
app/models/person_models.py
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]]

8
app/models/user_models.py
View File

@@ -9,7 +9,7 @@ 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_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.person_models import Person_Base # Causes circular import
# from app.models.user_role_models import User_Role_Base
@@ -194,8 +194,8 @@ class User_Out_Base(BaseModel):
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_member: Optional[Membership_Member_Base] # Priority l2
# membership_member_list: Optional[list] # Membership_Base() ???
# membership_person: Optional[Membership_Person_Base] # Priority l2
# membership_person_list: Optional[list] # Membership_Base() ???
order_list: Optional[list] # Order_Base() # Priority l2
order_cart_list: Optional[list] # Order_Base() # Priority l2
organization: Optional[Union[Organization_Base, None]] # Organization_Base() # Priority l3
@@ -278,8 +278,6 @@ class User_Base(BaseModel):
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_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[Union[Organization_Base, None]] # Organization_Base() # Priority l3