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

Code clean up. Membership tables, views, routes, methods, and models renamed.

Browse Source
This commit is contained in:
Scott Idem
2022-01-11 14:12:51 -05:00
parent 253ed6c19b
commit 8953fc32d8
24 changed files with 485 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/common_field_schema.py
View File

@@ -59,11 +59,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_person_id_random'] = xxx_id_random_field_schema
base_fields['membership_person_group_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['membership_person_type_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

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_person_list: Optional[list] # Membership_Group_Person_Base
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

24
app/models/membership_group_person_models.py → app/models/membership_person_group_models.py
View File

@@ -8,22 +8,22 @@ 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_cfg_models import Membership_Cfg_Base
from app.models.membership_group_models import Membership_Group_Base
from app.models.product_models import Product_Base
class Membership_Group_Person_Base(BaseModel):
class Membership_Person_Group_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['membership_group_person_id_random'],
alias = 'membership_group_person_id_random',
**base_fields['membership_person_group_id_random'],
alias = 'membership_person_group_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'membership_group_person_id'
alias = 'membership_person_group_id'
)
account_id_random: Optional[str]
@@ -61,16 +61,16 @@ class Membership_Group_Person_Base(BaseModel):
updated_on: Optional[datetime.datetime] = None
# Including other related objects
membership_cfg: Optional[Membership_Cfg_Base] = Field(
alias = 'cfg',
)
# membership_cfg: Optional[Membership_Cfg_Base] = Field(
# alias = 'cfg',
# )
membership_group: Optional[Membership_Group_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_person_id_random', always=True)
def membership_group_person_id_random_copy(cls, v, values, **kwargs):
#@validator('membership_person_group_id_random', always=True)
def membership_person_group_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
@@ -79,12 +79,12 @@ class Membership_Group_Person_Base(BaseModel):
return None
@validator('id', always=True)
def membership_group_person_id_lookup(cls, v, values, **kwargs):
def membership_person_group_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_person')
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_person_group')
return None
@validator('membership_group_id', always=True)

50
app/models/membership_person_models.py
View File

@@ -10,10 +10,10 @@ 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_group_models import Membership_Person_Group_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.membership_person_type_models import Membership_Person_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
@@ -54,14 +54,14 @@ class Membership_Person_Base(BaseModel):
# )
# NOTE: Currently there is not going to be a designated primary group. 2021-12-16
# membership_group_person_id_random: Optional[str] = Field(
# membership_person_group_id_random: Optional[str] = Field(
# # alias = 'group_person_id_random',
# ) # NOTE: This is not optional
# membership_group_person_id: Optional[int] = Field(
# membership_person_group_id: Optional[int] = Field(
# # alias = 'group_person_id',
# ) # NOTE: This is not optional
# membership_group_person_name: Optional[str] = Field(
# membership_person_group_name: Optional[str] = Field(
# alias = 'membership_group_name', # group_person_name
# )
@@ -78,14 +78,14 @@ class Membership_Person_Base(BaseModel):
alias = 'type_name',
)
membership_type_person_id_random: Optional[str] = Field(
membership_person_type_id_random: Optional[str] = Field(
# alias = 'type_person_id_random',
) # NOTE: This is not optional
membership_type_person_id: Optional[int] = Field(
membership_person_type_id: Optional[int] = Field(
# alias = 'type_person_id',
) # NOTE: This is not optional
membership_type_person_name: Optional[str] = Field(
membership_person_type_name: Optional[str] = Field(
alias = 'membership_type_name', # type_person_name
)
@@ -96,8 +96,8 @@ class Membership_Person_Base(BaseModel):
person_id: Optional[int]
# For products use:
# link using membership_person.membership_group_person_id to membership_group_person.id
# link using membership_person.membership_type_person_id to membership_type_person.id
# link using membership_person.membership_person_group_id to membership_person_group.id
# link using membership_person.membership_person_type_id to membership_person_type.id
# product_id_random: Optional[str]
# product_id: Optional[int] # The product they purchased to get this membership
@@ -140,8 +140,8 @@ class Membership_Person_Base(BaseModel):
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(
# 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
@@ -156,13 +156,13 @@ class Membership_Person_Base(BaseModel):
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(
membership_person_type: Optional[Membership_Person_Type_Base] # The type person information for the primary membership type they currently have
# membership_person_type_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
# ) # Membership_Person_Type_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
# user: Optional[dict] # should be User_Base() but causes an import loop
extended_member_profile: Optional[dict] = {}
@@ -204,13 +204,13 @@ class Membership_Person_Base(BaseModel):
# return redis_lookup_id_random(record_id_random=values['membership_group_id_random'], table_name='membership_group')
# return None
# @validator('membership_group_person_id', always=True)
# def membership_group_person_id_lookup(cls, v, values, **kwargs):
# @validator('membership_person_group_id', always=True)
# def membership_person_group_id_lookup(cls, v, values, **kwargs):
# log.setLevel(logging.WARNING)
# log.debug(locals())
# if values['membership_group_person_id_random']:
# return redis_lookup_id_random(record_id_random=values['membership_group_person_id_random'], table_name='membership_group_person')
# if values['membership_person_group_id_random']:
# return redis_lookup_id_random(record_id_random=values['membership_person_group_id_random'], table_name='membership_person_group')
# return None
@validator('membership_type_id', always=True)
@@ -222,13 +222,13 @@ class Membership_Person_Base(BaseModel):
return redis_lookup_id_random(record_id_random=values['membership_type_id_random'], table_name='membership_type')
return None
@validator('membership_type_person_id', always=True)
def membership_type_person_id_lookup(cls, v, values, **kwargs):
@validator('membership_person_type_id', always=True)
def membership_person_type_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['membership_type_person_id_random']:
return redis_lookup_id_random(record_id_random=values['membership_type_person_id_random'], table_name='membership_type_person')
if values['membership_person_type_id_random']:
return redis_lookup_id_random(record_id_random=values['membership_person_type_id_random'], table_name='membership_person_type')
return None
@validator('person_id', always=True)

8
app/models/membership_person_profile_models.py
View File

@@ -9,7 +9,7 @@ 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_cfg_models import Membership_Cfg_Base
# from app.models.membership_cfg_models import Membership_Cfg_Base
from app.models.organization_models import Organization_Base
@@ -75,9 +75,9 @@ class Membership_Person_Profile_Base(BaseModel):
# Including other related objects
contact: Optional[Contact_Base]
membership_cfg: Optional[Membership_Cfg_Base] = Field(
alias = 'cfg',
)
# membership_cfg: Optional[Membership_Cfg_Base] = Field(
# alias = 'cfg',
# )
organization: Optional[Organization_Base]
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

24
app/models/membership_type_person_models.py → app/models/membership_person_type_models.py
View File

@@ -8,22 +8,22 @@ 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_cfg_models import Membership_Cfg_Base
from app.models.membership_type_models import Membership_Type_Base
from app.models.product_models import Product_Base
class Membership_Type_Person_Base(BaseModel):
class Membership_Person_Type_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['membership_type_person_id_random'],
alias = 'membership_type_person_id_random',
**base_fields['membership_person_type_id_random'],
alias = 'membership_person_type_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'membership_type_person_id'
alias = 'membership_person_type_id'
)
account_id_random: Optional[str]
@@ -72,16 +72,16 @@ class Membership_Type_Person_Base(BaseModel):
updated_on: Optional[datetime.datetime] = None
# Including other related objects
membership_cfg: Optional[Membership_Cfg_Base] = Field(
alias = 'cfg',
)
# membership_cfg: Optional[Membership_Cfg_Base] = Field(
# alias = 'cfg',
# )
membership_type: Optional[Membership_Type_Base] # The membership option they currently have
product: Optional[Product_Base] # The product used to become a member?
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('membership_type_person_id_random', always=True)
def membership_type_person_id_random_copy(cls, v, values, **kwargs):
#@validator('membership_person_type_id_random', always=True)
def membership_person_type_id_random_copy(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
@@ -90,12 +90,12 @@ class Membership_Type_Person_Base(BaseModel):
return None
@validator('id', always=True)
def membership_type_person_id_lookup(cls, v, values, **kwargs):
def membership_person_type_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_type_person')
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_person_type')
return None
@validator('account_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_type_person_list: Optional[list] # Membership_Type_Person_Base() List of people for membership type
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
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)

4
app/models/person_models.py
View File

@@ -122,9 +122,9 @@ class Person_Base(BaseModel):
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_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_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_group_person_list: Optional[list] # Membership_Group_Person_Base() list of member group person records
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