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

Clean up

Browse Source
This commit is contained in:
Scott Idem
2021-12-17 16:17:17 -05:00
parent 398897efe1
commit 615d5dab17
6 changed files with 105 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
app/models/membership_person_models.py
View File

@@ -42,6 +42,7 @@ class Membership_Person_Base(BaseModel):
# alias = 'status_name'
)
# NOTE: Currently there is not going to be a designated primary group. 2021-12-16
# membership_group_id_random: Optional[str] = Field(
# alias = 'group_id_random',
# ) # NOTE: This is not optional
@@ -52,29 +53,30 @@ class Membership_Person_Base(BaseModel):
# alias = 'group_name',
# )
membership_group_person_id_random: Optional[str] = Field(
# alias = 'group_person_id_random',
) # NOTE: This is not optional
membership_group_person_id: Optional[int] = Field(
# alias = 'group_person_id',
) # NOTE: This is not optional
# NOTE: Currently there is not going to be a designated primary group. 2021-12-16
# membership_group_person_id_random: Optional[str] = Field(
# # alias = 'group_person_id_random',
# ) # NOTE: This is not optional
# membership_group_person_id: Optional[int] = Field(
# # alias = 'group_person_id',
# ) # NOTE: This is not optional
membership_group_person_name: Optional[str] = Field(
alias = 'membership_group_name', # group_person_name
)
# membership_group_person_name: Optional[str] = Field(
# alias = 'membership_group_name', # group_person_name
# )
membership_group_status_id: Optional[int]
membership_group_status_name: Optional[str]
# 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',
# )
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',
)
membership_type_person_id_random: Optional[str] = Field(
# alias = 'type_person_id_random',
@@ -136,11 +138,11 @@ class Membership_Person_Base(BaseModel):
membership_group: Optional[Membership_Group_Base] # The primary membership group option they currently have
membership_group_list: Optional[list] = Field(
alias = 'group_list',
# 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: 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',
# 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(
@@ -152,12 +154,12 @@ class Membership_Person_Base(BaseModel):
membership_type: Optional[Membership_Type_Base] # The primary membership type option they currently have
membership_type_list: Optional[list] = Field(
alias = 'type_list',
# 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
# 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
@@ -202,24 +204,24 @@ 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):
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')
return None
# @validator('membership_type_id', always=True)
# def membership_type_id_lookup(cls, v, values, **kwargs):
# log.setLevel(logging.DEBUG)
# @validator('membership_group_person_id', always=True)
# def membership_group_person_id_lookup(cls, v, values, **kwargs):
# log.setLevel(logging.WARNING)
# log.debug(locals())
# if values.get('membership_type_id_random', None):
# return redis_lookup_id_random(record_id_random=values['membership_type_id_random'], table_name='membership_type')
# 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')
# return None
@validator('membership_type_id', always=True)
def membership_type_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.DEBUG)
log.debug(locals())
if values.get('membership_type_id_random'):
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):
log.setLevel(logging.WARNING)