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

Work on membership and related

Browse Source
This commit is contained in:
Scott Idem
2022-01-12 18:58:07 -05:00
parent 55063d0f94
commit 771778669e
8 changed files with 79 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/models/membership_person_models.py
View File

@@ -20,7 +20,7 @@ from app.models.product_models import Product_Base
class Membership_Person_Base(BaseModel):
log.setLevel(logging.INFO)
log.setLevel(logging.DEBUG)
log.debug(locals())
id_random: Optional[str] = Field(
@@ -69,13 +69,13 @@ class Membership_Person_Base(BaseModel):
membership_group_status_name: Optional[str]
membership_type_id_random: Optional[str] = Field(
alias = 'type_id_random',
# alias = 'type_id_random',
) # NOTE: This is not optional
membership_type_id: Optional[int] = Field(
alias = 'type_id',
# alias = 'type_id',
) # NOTE: This is not optional
membership_type_name: Optional[str] = Field(
alias = 'type_name',
# alias = 'type_name',
)
membership_person_type_id_random: Optional[str] = Field(
@@ -86,11 +86,11 @@ class Membership_Person_Base(BaseModel):
) # NOTE: This is not optional
membership_person_type_name: Optional[str] = Field(
alias = 'membership_type_name', # type_person_name
# alias = 'membership_type_name', # type_person_name
)
membership_type_status_id: Optional[int]
membership_type_status_name: Optional[str]
membership_person_type_status_id: Optional[int]
membership_person_type_status_name: Optional[str]
person_id_random: Optional[str]
person_id: Optional[int]
@@ -146,6 +146,7 @@ class Membership_Person_Base(BaseModel):
membership_group_list: Optional[list[Membership_Group_Base]]
membership_type: Optional[Membership_Type_Base] # The primary membership type option they currently have
# membership_type: Optional[dict]
membership_type_list: Optional[list[Membership_Type_Base]]
# membership_group_list: Optional[list] = Field(
@@ -200,7 +201,7 @@ class Membership_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['account_id_random']:
if values.get('account_id_random'):
return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
return None
@@ -236,7 +237,7 @@ class Membership_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['membership_person_type_id_random']:
if values.get('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
@@ -245,7 +246,7 @@ class Membership_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['person_id_random']:
if values.get('person_id_random'):
return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person')
return None
@@ -263,7 +264,7 @@ class Membership_Person_Base(BaseModel):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['user_id_random']:
if values.get('user_id_random'):
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
return None

12
app/models/membership_person_type_models.py
View File

@@ -14,7 +14,7 @@ from app.models.product_models import Product_Base
class Membership_Person_Type_Base(BaseModel):
log.setLevel(logging.WARNING)
log.setLevel(logging.DEBUG)
log.debug(locals())
id_random: Optional[str] = Field(
@@ -30,13 +30,13 @@ class Membership_Person_Type_Base(BaseModel):
account_id: Optional[int]
membership_type_id_random: Optional[str] = Field(
alias = 'type_id_random',
# alias = 'type_id_random',
) # NOTE: This is not optional
membership_type_id: Optional[int] = Field(
alias = 'type_id',
# alias = 'type_id',
) # NOTE: This is not optional
membership_type_name: Optional[str] = Field(
alias = 'type_name',
# alias = 'type_name',
)
membership_person_id_random: Optional[str]
@@ -46,10 +46,10 @@ class Membership_Person_Type_Base(BaseModel):
product_id: Optional[int] # The product they purchased to get this membership
lu_membership_type_status_id: Optional[int] = Field(
alias = 'status_id'
# alias = 'status_id'
)
membership_type_status_name: Optional[str] = Field(
alias = 'status_name'
# alias = 'status_name'
)
level: Optional[int] = Field(0, ge=0, lt=150)