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

28
app/methods/membership_person_methods.py
View File

@@ -19,6 +19,7 @@ from app.models.membership_person_models import Membership_Person_Base
# ### BEGIN ### API Membership Person Methods ### load_membership_person_obj() ### # ### BEGIN ### API Membership Person Methods ### load_membership_person_obj() ###
# Updated 2021-12-16
def load_membership_person_obj( def load_membership_person_obj(
membership_person_id:int|str, membership_person_id:int|str,
limit: int = 1000, limit: int = 1000,
@@ -46,15 +47,16 @@ def load_membership_person_obj(
inc_product_list: bool = False, # The list of products that give access to a member_type or member_group inc_product_list: bool = False, # The list of products that give access to a member_type or member_group
inc_user: bool = False, inc_user: bool = False,
) -> Membership_Person_Base: ) -> Membership_Person_Base:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass
else: return False else: return False
if membership_person_rec := sql_select(table_name='v_membership_person', record_id=membership_person_id): pass if membership_person_rec := sql_select(table_name='v_membership_person', record_id=membership_person_id):
log.debug(membership_person_rec)
else: return False else: return False
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_person_rec) log.debug(membership_person_rec)
try: try:
@@ -62,7 +64,7 @@ def load_membership_person_obj(
log.debug(membership_person_obj) log.debug(membership_person_obj)
except ValidationError as e: except ValidationError as e:
log.error(e.json()) log.error(e.json())
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(membership_person_obj) log.debug(membership_person_obj)
# Updated 2021-06-24 # Updated 2021-06-24
@@ -74,15 +76,13 @@ def load_membership_person_obj(
model_as_dict = model_as_dict, model_as_dict = model_as_dict,
): ):
membership_person_obj.membership_cfg = membership_cfg_obj_result membership_person_obj.membership_cfg = membership_cfg_obj_result
else: membership_person_obj.membership_cfg = None else: membership_person_obj.membership_cfg = {} # None
if inc_membership_group: pass # The primary membership group the person is a part of. Not used at this time. if inc_membership_group: pass # The primary membership group the person is a part of. Not used at this time. 2021-12-16
# Updated 2021-07-09 # Updated 2021-07-09
if inc_membership_group_list: # The list of groups the member is a part of if inc_membership_group_list: # The list of groups the member is a part of
if membership_group_rec_list_result := get_membership_group_rec_list( if membership_group_rec_list_result := get_membership_group_rec_list(
# for_obj_type = 'membership_person',
# for_obj_id = membership_person_id,
membership_person_id = membership_person_id, membership_person_id = membership_person_id,
limit = limit, limit = limit,
enabled = enabled, enabled = enabled,
@@ -156,7 +156,7 @@ def load_membership_person_obj(
inc_organization = inc_organization, inc_organization = inc_organization,
): ):
membership_person_obj.membership_person_profile = membership_person_profile_result membership_person_obj.membership_person_profile = membership_person_profile_result
else: membership_person_obj.membership_person_profile = None else: membership_person_obj.membership_person_profile = {} # None
log.debug(membership_person_profile_result) log.debug(membership_person_profile_result)
# Updated 2021-07-09 # Updated 2021-07-09
@@ -179,7 +179,7 @@ def load_membership_person_obj(
inc_product_list = inc_product_list, inc_product_list = inc_product_list,
): ):
membership_person_obj.membership_type = membership_type_result membership_person_obj.membership_type = membership_type_result
else: membership_person_obj.membership_type = None else: membership_person_obj.membership_type = {} # None
log.debug(membership_type_result) log.debug(membership_type_result)
if inc_membership_type_list: pass # All of the membership types the person is a part of if inc_membership_type_list: pass # All of the membership types the person is a part of
@@ -201,7 +201,7 @@ def load_membership_person_obj(
inc_product = inc_product, inc_product = inc_product,
): ):
membership_person_obj.membership_type_person = membership_type_person_result membership_person_obj.membership_type_person = membership_type_person_result
else: membership_person_obj.membership_type_person = None else: membership_person_obj.membership_type_person = {} # None
log.debug(membership_type_person_result) log.debug(membership_type_person_result)
if inc_membership_type_person_list: pass # All of the membership type person records for a person if inc_membership_type_person_list: pass # All of the membership type person records for a person
@@ -221,7 +221,7 @@ def load_membership_person_obj(
# inc_user = inc_user, # inc_user = inc_user,
): ):
membership_person_obj.person = person_result membership_person_obj.person = person_result
else: membership_person_obj.person = None else: membership_person_obj.person = {} # None
log.debug(person_result) log.debug(person_result)
# Updated 2021-06-24 # Updated 2021-06-24
@@ -235,7 +235,7 @@ def load_membership_person_obj(
model_as_dict = model_as_dict, model_as_dict = model_as_dict,
): ):
membership_person_obj.product = product_result membership_person_obj.product = product_result
else: membership_person_obj.product = None else: membership_person_obj.product = {} # None
log.debug(product_result) log.debug(product_result)
# Updated 2021-06-18 # Updated 2021-06-18
@@ -253,7 +253,7 @@ def load_membership_person_obj(
# inc_person = inc_person, # inc_person = inc_person,
): ):
membership_person_obj.user = user_result membership_person_obj.user = user_result
else: membership_person_obj.user = None else: membership_person_obj.user = {} # None
log.debug(user_result) log.debug(user_result)
if model_as_dict: if model_as_dict:

8
app/methods/membership_person_profile_methods.py
View File

@@ -24,7 +24,7 @@ def load_membership_person_profile_obj(
inc_membership_cfg: bool = False, inc_membership_cfg: bool = False,
inc_organization: bool = False, inc_organization: bool = False,
) -> Membership_Person_Profile_Base|dict|bool: ) -> Membership_Person_Profile_Base|dict|bool:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if membership_person_profile_id := redis_lookup_id_random(record_id_random=membership_person_profile_id, table_name='membership_person_profile'): pass if membership_person_profile_id := redis_lookup_id_random(record_id_random=membership_person_profile_id, table_name='membership_person_profile'): pass
@@ -35,14 +35,16 @@ def load_membership_person_profile_obj(
table_name = 'v_membership_person_profile', table_name = 'v_membership_person_profile',
record_id = membership_person_profile_id, record_id = membership_person_profile_id,
): pass ): pass
else: return False else: return None
elif membership_person_id: elif membership_person_id:
if membership_person_profile_rec := sql_select( if membership_person_profile_rec := sql_select(
table_name = 'v_membership_person_profile', table_name = 'v_membership_person_profile',
field_name = 'membership_person_id', field_name = 'membership_person_id',
field_value = membership_person_id, field_value = membership_person_id,
): pass ): pass
else: return False else: return None
else:
return None
log.debug(membership_person_profile_rec) log.debug(membership_person_profile_rec)
try: try:
membership_person_profile_obj = Membership_Person_Profile_Base(**membership_person_profile_rec) membership_person_profile_obj = Membership_Person_Profile_Base(**membership_person_profile_rec)

3
app/methods/post_methods.py
View File

@@ -40,6 +40,7 @@ def create_post_obj(post_obj_new:Post_Base):
# ### BEGIN ### API Post Methods ### load_post_obj() ### # ### BEGIN ### API Post Methods ### load_post_obj() ###
# Updated 2021-12-16
@logger_reset @logger_reset
def load_post_obj( def load_post_obj(
post_id: int|str, post_id: int|str,
@@ -59,11 +60,9 @@ def load_post_obj(
else: return False else: return False
if post_rec := sql_select(table_name='v_post', record_id=post_id): if post_rec := sql_select(table_name='v_post', record_id=post_id):
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(post_rec) log.debug(post_rec)
else: return False else: return False
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(post_rec) log.debug(post_rec)
try: try:

80
app/models/membership_person_models.py
View File

@@ -42,6 +42,7 @@ class Membership_Person_Base(BaseModel):
# alias = 'status_name' # 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( # membership_group_id_random: Optional[str] = Field(
# alias = 'group_id_random', # alias = 'group_id_random',
# ) # NOTE: This is not optional # ) # NOTE: This is not optional
@@ -52,29 +53,30 @@ class Membership_Person_Base(BaseModel):
# alias = 'group_name', # alias = 'group_name',
# ) # )
membership_group_person_id_random: Optional[str] = Field( # NOTE: Currently there is not going to be a designated primary group. 2021-12-16
# alias = 'group_person_id_random', # membership_group_person_id_random: Optional[str] = Field(
) # NOTE: This is not optional # # alias = 'group_person_id_random',
membership_group_person_id: Optional[int] = Field( # ) # NOTE: This is not optional
# alias = 'group_person_id', # membership_group_person_id: Optional[int] = Field(
) # NOTE: This is not optional # # alias = 'group_person_id',
# ) # NOTE: This is not optional
membership_group_person_name: Optional[str] = Field( # membership_group_person_name: Optional[str] = Field(
alias = 'membership_group_name', # group_person_name # alias = 'membership_group_name', # group_person_name
) # )
membership_group_status_id: Optional[int] membership_group_status_id: Optional[int]
membership_group_status_name: Optional[str] membership_group_status_name: Optional[str]
# membership_type_id_random: Optional[str] = Field( membership_type_id_random: Optional[str] = Field(
# alias = 'type_id_random', alias = 'type_id_random',
# ) # NOTE: This is not optional ) # NOTE: This is not optional
# membership_type_id: Optional[int] = Field( membership_type_id: Optional[int] = Field(
# alias = 'type_id', alias = 'type_id',
# ) # NOTE: This is not optional ) # NOTE: This is not optional
# membership_type_name: Optional[str] = Field( membership_type_name: Optional[str] = Field(
# alias = 'type_name', alias = 'type_name',
# ) )
membership_type_person_id_random: Optional[str] = Field( membership_type_person_id_random: Optional[str] = Field(
# alias = 'type_person_id_random', # 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: Optional[Membership_Group_Base] # The primary membership group option they currently have
membership_group_list: Optional[list] = Field( 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_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( 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_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( 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: Optional[Membership_Type_Base] # The primary membership type option they currently have
membership_type_list: Optional[list] = Field( 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_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: 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_type_person_list: Optional[list] = Field(
alias = 'type_person_list', # 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_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 person: Optional[dict] # should be Person_Base() but causes an import loop
product: Optional[Product_Base] # The product used to become a member? 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
@@ -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 redis_lookup_id_random(record_id_random=values['membership_group_id_random'], table_name='membership_group')
# return None # return None
@validator('membership_group_person_id', always=True) # @validator('membership_group_person_id', always=True)
def membership_group_person_id_lookup(cls, v, values, **kwargs): # def membership_group_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) # 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)
# log.debug(locals()) # log.debug(locals())
# if values.get('membership_type_id_random', None): # if values['membership_group_person_id_random']:
# return redis_lookup_id_random(record_id_random=values['membership_type_id_random'], table_name='membership_type') # return redis_lookup_id_random(record_id_random=values['membership_group_person_id_random'], table_name='membership_group_person')
# return None # 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) @validator('membership_type_person_id', always=True)
def membership_type_person_id_lookup(cls, v, values, **kwargs): def membership_type_person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING) log.setLevel(logging.WARNING)

38
app/routers/membership_person.py
View File

@@ -180,50 +180,47 @@ async def get_account_obj_membership_person_list(
# Working well as of 2021-07-09. Using as a template for other routes. # Working well as of 2021-07-09. Using as a template for other routes.
@router.get('/person/{person_id}/membership/person', response_model=Resp_Body_Base) @router.get('/person/{person_id}/membership/person', response_model=Resp_Body_Base)
async def get_person_obj_membership_person( async def get_person_obj_membership_person(
person_id: str = Query(..., min_length=1, max_length=22), person_id: str = Query(..., min_length=11, max_length=22),
limit: int = 500, # For now this covers any included objects or object lists
enabled: str = 'enabled', # For now this covers any included objects or object lists enabled: str = 'enabled', # For now this covers any included objects or object lists
from_datetime: datetime.datetime = None, limit: int = 500, # For now this covers any included objects or object lists
to_datetime: datetime.datetime = None,
inc_address: bool = False, inc_address: bool = False,
inc_contact: bool = False, inc_contact: bool = False,
inc_membership_cfg: bool = False, inc_membership_cfg: bool = False,
# inc_membership_group: bool = False, # The primary membership group # inc_membership_group: bool = False, # The primary membership group for a person
inc_membership_group_list: bool = False, # The list of all membership groups a person is a part of inc_membership_group_list: bool = False, # The list of all membership group options a person can select
inc_membership_group_person_list: bool = False, inc_membership_group_person_list: bool = False,
# inc_membership_person: bool = False, # Priority l2
inc_membership_person_profile: bool = False, # Profile? inc_membership_person_profile: bool = False, # Profile?
inc_membership_person_profile_cust: bool = False, # Extended profile? inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_type: bool = False, # The primary membership type inc_membership_type: bool = False, # The primary membership type for a person
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
inc_membership_type_person: bool = False, inc_membership_type_person: bool = False,
# inc_order: bool = False, # inc_order: bool = False,
inc_organization: bool = False, inc_organization: bool = False,
inc_product: bool = False, # The product the person actually purchased for a member_type or member_group inc_product: bool = False, # The product the person actually purchased for a member_type or member_group
inc_product_list: bool = False, # The list of products that give access to a member_type or member_group inc_product_list: bool = False, # The list of products that give access to a member_type or member_group
inc_user: bool = False, # inc_user: bool = False,
x_account_id: str = Header(...), x_account_id: str = Header(...),
by_alias: Optional[bool] = True, by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True, exclude_unset: Optional[bool] = True,
response: Response = Response, response: Response = Response,
): ):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals()) log.debug(locals())
if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass if person_id := redis_lookup_id_random(record_id_random=person_id, table_name='person'): pass
else: return mk_resp(data=None, status_code=404) else: return mk_resp(data=None, status_code=404, response=response)
if membership_person_rec := sql_select(table_name='v_membership_person', field_name='person_id', field_value=person_id): pass if membership_person_rec := sql_select(table_name='v_membership_person', field_name='person_id', field_value=person_id): pass
else: return mk_resp(data=None, status_code=404) else: return mk_resp(data=None, status_code=404, response=response)
membership_person_id = membership_person_rec.get('membership_person_id', None) membership_person_id = membership_person_rec.get('membership_person_id', None)
log.debug(membership_person_id) log.debug(membership_person_id)
if membership_person_result := load_membership_person_obj( if membership_person_rec_result := load_membership_person_obj(
membership_person_id = membership_person_id, membership_person_id = membership_person_id,
limit = limit, limit = limit,
by_alias = by_alias, by_alias = by_alias,
exclude_unset = exclude_unset, exclude_unset = exclude_unset,
model_as_dict = True, # model_as_dict = True,
enabled = enabled, enabled = enabled,
inc_address = inc_address, inc_address = inc_address,
inc_contact = inc_contact, inc_contact = inc_contact,
@@ -242,10 +239,15 @@ async def get_person_obj_membership_person(
# inc_product_list = inc_product_list, # inc_product_list = inc_product_list,
# inc_user = inc_user, # inc_user = inc_user,
): ):
response_data = membership_person_result response_data = membership_person_rec_result
else: return mk_resp(data=False, status_code=404, response=response) # Bad Request elif person_rec_result is None: # Empty dict or None
log.info('No results')
return mk_resp(data=False, status_code=404, response=response) # Not Found
else:
log.warning('Likely bad request')
return mk_resp(data=False, status_code=400, response=response) # Bad Request
return mk_resp(data=response_data) return mk_resp(data=response_data, response=response)
# ### END ### API Membership Person ### get_person_obj_membership_person() ### # ### END ### API Membership Person ### get_person_obj_membership_person() ###

24
app/routers/membership_person_profile.py
View File

@@ -18,6 +18,30 @@ from app.models.response_models import Resp_Body_Base, mk_resp
router = APIRouter() router = APIRouter()
@router.post('/membership/person/profile', response_model=Resp_Body_Base)
async def post_membership_person_profile_obj(
obj: Membership_Person_Profile_Base,
x_account_id: str = Header(...),
return_obj: Optional[bool] = True,
by_alias: Optional[bool] = True,
exclude_unset: Optional[bool] = True,
response: Response = Response,
):
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
obj_type = 'membership_person_profile'
obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
result = post_obj_template(
obj_type=obj_type,
data=obj_data_dict,
return_obj=True,
by_alias=True,
exclude_unset=True,
)
return result
@router.patch('/membership/person/profile/{obj_id}', response_model=Resp_Body_Base) @router.patch('/membership/person/profile/{obj_id}', response_model=Resp_Body_Base)
async def patch_membership_person_profile_obj( async def patch_membership_person_profile_obj(
obj_id: str = Query(..., min_length=1, max_length=22), obj_id: str = Query(..., min_length=1, max_length=22),