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

Working on membership and related modules

Browse Source
This commit is contained in:
Scott Idem
2021-07-27 15:39:47 -04:00
parent e61089ce2c
commit ae1cd473ed
7 changed files with 318 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
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.WARNING)
log.setLevel(logging.DEBUG)
log.debug(locals())
id_random: Optional[str] = Field(
@@ -42,15 +42,15 @@ class Membership_Person_Base(BaseModel):
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_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_group_person_id_random: Optional[str] = Field(
alias = 'group_person_id_random',
@@ -62,15 +62,15 @@ class Membership_Person_Base(BaseModel):
alias = 'group_person_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_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',
@@ -103,13 +103,15 @@ class Membership_Person_Base(BaseModel):
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
first_application_start_on: Optional[datetime.datetime]
# application_start_on: Optional[datetime.datetime]
first_approved_on: Optional[datetime.datetime]
first_start_on: Optional[datetime.datetime]
start_buffer_on: Optional[datetime.datetime]
start_on: Optional[datetime.datetime]
end_on: Optional[datetime.datetime]
end_buffer_on: Optional[datetime.datetime]
last_end_on: Optional[datetime.datetime]
flag: Optional[bool]
flag_message: Optional[str]
@@ -183,14 +185,14 @@ class Membership_Person_Base(BaseModel):
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())
# @validator('membership_group_id', always=True)
# def membership_group_id_lookup(cls, v, values, **kwargs):
# log.setLevel(logging.DEBUG)
# 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
# if values.get('membership_group_id_random', None):
# 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):
@@ -201,14 +203,14 @@ class Membership_Person_Base(BaseModel):
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.WARNING)
log.debug(locals())
# @validator('membership_type_id', always=True)
# def membership_type_id_lookup(cls, v, values, **kwargs):
# log.setLevel(logging.DEBUG)
# 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
# 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')
# return None
@validator('membership_type_person_id', always=True)
def membership_type_person_id_lookup(cls, v, values, **kwargs):

15
app/models/membership_type_person_models.py
View File

@@ -54,13 +54,14 @@ class Membership_Type_Person_Base(BaseModel):
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
application_start_on: Optional[datetime.datetime]
approved_on: Optional[datetime.datetime]
first_start_on: Optional[datetime.datetime]
start_buffer_on: Optional[datetime.datetime]
start_on: Optional[datetime.datetime]
end_on: Optional[datetime.datetime]
end_buffer_on: Optional[datetime.datetime]
last_end_on: Optional[datetime.datetime]
flag: Optional[bool]
flag_message: Optional[str]