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

Code clean up. More changes to membership tables, views, routes, methods, and models renamed.

Browse Source
This commit is contained in:
Scott Idem
2022-01-11 16:56:26 -05:00
parent 163e57ef76
commit 6e764b21e1
7 changed files with 79 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/methods/account_methods.py
View File

@@ -86,11 +86,11 @@ def load_account_obj(
inc_journal_entry_list: bool = False, # Priority l3
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of groups for the account
inc_membership_person_group_list: bool = False, # List of members of a group
inc_membership_person: bool = False,
inc_membership_person_list: bool = False, # Priority l1
inc_membership_person_group_list: bool = False, # List of members of a group
inc_membership_person_list: bool = False, # List of people that have membersship
inc_membership_person_profile: bool = False,
# inc_membership_type: bool = False,
inc_membership_person_type: bool = False,
inc_membership_type_list: bool = False,
inc_order: bool = False,
inc_order_cfg: bool = False,
@@ -637,6 +637,7 @@ def load_account_obj_membership_type(
inc_membership_person: bool = False,
inc_membership_person_list: bool = False, # Priority l1
inc_membership_person_profile: bool = False,
inc_membership_person_type: bool = False,
inc_membership_type: bool = False,
inc_membership_type_list: bool = False,
inc_order: bool = False,
@@ -704,9 +705,10 @@ def load_account_obj_membership_type(
model_as_dict = model_as_dict,
inc_address = inc_address,
inc_contact = inc_contact,
inc_membership_group_list = inc_membership_group_list, # per member
inc_membership_person_group_list = inc_membership_person_group_list, # per member
inc_membership_person_list = inc_membership_person_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_profile = inc_membership_person_profile, # per member
inc_membership_person_type = inc_membership_person_type, # per member
inc_product_list = inc_product_list,
inc_person = inc_person,
inc_user = inc_user,

32
app/methods/membership_group_methods.py
View File

@@ -67,7 +67,7 @@ def load_membership_group_obj(
else: membership_group_obj.cfg = None
# Updated 2021-06-23
if inc_membership_person_group_list:
if inc_membership_person_list:
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
if membership_person_group_rec_list_result := get_membership_person_group_rec_list(
for_obj_type = 'membership_group',
@@ -84,13 +84,11 @@ def load_membership_group_obj(
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
enabled = enabled,
inc_membership_person = inc_membership_person,
# inc_membership_group_list = inc_membership_group_list,
# inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
# inc_organization = inc_organization,
inc_person = inc_person,
# inc_product = inc_product,
inc_user = inc_user,
):
membership_person_group_result_list.append(load_membership_person_group_result)
else: membership_person_group_result_list.append(None)
@@ -236,11 +234,13 @@ def get_membership_group_rec_list(
# ### BEGIN ### API Membership Group Methods ### create_membership_group_obj() ###
def create_membership_group_obj(membership_group_obj_new:Membership_Group_Base) -> bool|int:
def create_membership_group_obj(
membership_group_dict_obj: Membership_Group_Base
) -> bool|dict|int:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
membership_group_obj_data = membership_group_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
membership_group_obj_data = membership_group_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'})
if membership_group_obj_in_result := sql_insert(
data=membership_group_obj_data,
@@ -262,7 +262,7 @@ def create_membership_group_obj(membership_group_obj_new:Membership_Group_Base)
# ### BEGIN ### API Membership Group Methods ### update_membership_group_obj() ###
def update_membership_group_obj(
membership_group_id: int|str, # This allows for updating of the id_random value.
membership_group_obj_up: Membership_Group_Base,
membership_group_dict_obj: Membership_Group_Base,
create_sub_obj: bool = False,
) -> bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -271,19 +271,19 @@ def update_membership_group_obj(
if membership_group_id := redis_lookup_id_random(record_id_random=membership_group_id, table_name='membership_group'): pass
else: return False
membership_group_obj_up.id = membership_group_id
membership_group_dict_obj.id = membership_group_id
log.debug(membership_group_obj_up)
log.debug(membership_group_obj_up.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_group_obj_up.dict(by_alias=False, exclude_unset=False))
log.debug(membership_group_dict_obj)
log.debug(membership_group_dict_obj.dict(by_alias=False, exclude_unset=True))
# log.debug(membership_group_dict_obj.dict(by_alias=False, exclude_unset=False))
membership_group_dict_up = membership_group_obj_up.dict(by_alias=False, exclude_unset=True)
membership_group_dict_up = membership_group_dict_obj.dict(by_alias=False, exclude_unset=True)
log.debug(membership_group_dict_up)
if membership_group_obj_up_result := sql_update(data=membership_group_dict_up, table_name='membership_group', rm_id_random=True):
log.debug(membership_group_obj_up_result)
if membership_group_dict_obj_result := sql_update(data=membership_group_dict_up, table_name='membership_group', rm_id_random=True):
log.debug(membership_group_dict_obj_result)
return True
else:
log.debug(membership_group_obj_up_result)
log.debug(membership_group_dict_obj_result)
return False
# ### END ### API Membership Group Methods ### update_membership_group_obj() ###

9
app/methods/membership_person_group_methods.py
View File

@@ -21,15 +21,16 @@ def load_membership_person_group_obj(
enabled: str = 'enabled', # enabled, disabled, all
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group: bool = False,
inc_membership_person: bool = False,
inc_membership_person_profile: bool = False,
inc_membership_person_type: bool = False,
inc_membership_type: bool = False,
inc_organization: bool = False,
inc_person: bool = False,
inc_product: bool = False,
# inc_product_list: bool = False,
inc_user: bool = False,
) -> Membership_Person_Group_Base|bool:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -138,7 +139,9 @@ def get_membership_person_group_rec_list(
# ### BEGIN ### API Membership Group Person Methods ### create_membership_person_group_obj() ###
def create_membership_person_group_obj(membership_person_group_obj_new:Membership_Person_Group_Base) -> bool|int:
def create_membership_person_group_obj(
membership_person_group_obj_new: Membership_Person_Group_Base
) -> bool|dict|int:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -166,7 +169,7 @@ def update_membership_person_group_obj(
membership_person_group_id: int|str, # This allows for updating of the id_random value.
membership_person_group_obj_up: Membership_Person_Group_Base,
create_sub_obj: bool = False,
) -> bool:
) -> bool|dict:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())

7
app/methods/membership_person_type_methods.py
View File

@@ -25,6 +25,8 @@ def load_membership_person_type_obj(
inc_address: bool = False,
inc_contact: bool = False,
inc_membership_cfg: bool = False,
inc_membership_group: bool = False,
inc_membership_group_list: bool = False,
inc_membership_person: bool = False,
inc_membership_person_profile: bool = False,
inc_membership_type: bool = False,
@@ -32,7 +34,6 @@ def load_membership_person_type_obj(
inc_product: bool = False,
inc_product_list: bool = False,
inc_person: bool = False,
inc_user: bool = False,
) -> Membership_Person_Type_Base|bool:
# log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -190,7 +191,7 @@ def create_membership_person_type_obj(
membership_person_type_dict_obj: Membership_Person_Type_Base,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False,
) -> bool|int:
) -> bool|dict|int:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
@@ -232,7 +233,7 @@ def update_membership_person_type_obj(
membership_person_type_dict_obj: Membership_Person_Type_Base,
fail_any: bool = False, # Fail if any thing goes wrong for sub objects
return_outline: bool = False,
) -> bool:
) -> bool|dict:
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())

11
app/methods/membership_type_methods.py
View File

@@ -81,12 +81,11 @@ def load_membership_type_obj(
exclude_unset = exclude_unset,
model_as_dict = model_as_dict,
enabled = enabled,
inc_membership_group_list = inc_membership_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_profile = inc_membership_person_profile,
# inc_organization = inc_organization,
inc_person = inc_person,
# inc_product = inc_product,
inc_user = inc_user,
):
membership_person_result_list.append(load_membership_person_result)
else: membership_person_result_list.append(None)
@@ -195,13 +194,15 @@ def get_membership_type_rec_list(
# ### END ### API Membership Type Methods ### get_membership_type_rec_list() ###
# ### BEGIN ### API Membership Type Methods ### save_membership_type_obj() ###
def save_membership_type_obj(membership_type_obj_new:Membership_Type_Base):
# ### BEGIN ### API Membership Type Methods ### create_membership_type_obj() ###
def create_membership_type_obj(
membership_type_dict_obj: Membership_Type_Base
) -> bool|dict|int:
log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
return membership_type_id
# ### END ### API Membership Type Methods ### save_membership_type_obj() ###
# ### END ### API Membership Type Methods ### create_membership_type_obj() ###
# ### BEGIN ### API Membership Type Methods ### get_membership_type_rec_list() ###

74
app/routers/membership_person.py
View File

@@ -30,9 +30,9 @@ async def post_membership_person_obj(
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
return_obj: bool = True,
commons: Common_Route_Params = Depends(common_route_params),
@@ -88,9 +88,9 @@ async def patch_membership_person_obj(
fail_any: bool = True, # Fail if any thing goes wrong for sub objects
inc_membership_cfg: bool = False,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
return_obj: bool = True,
commons: Common_Route_Params = Depends(common_route_params),
@@ -140,11 +140,11 @@ async def get_membership_person_obj(
# inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False, # The primary membership group for a person
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
# inc_membership_person_profile: bool = False,
# inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_person_type: bool = False,
# inc_order: bool = False,
@@ -171,14 +171,14 @@ async def get_membership_person_obj(
# inc_address = inc_address,
# inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
# inc_membership_person_profile = inc_membership_person_profile,
# inc_membership_person_profile_cust = inc_membership_person_profile_cust,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
# inc_membership_type_list = inc_membership_type_list, # All the membership types they are a part of.
# inc_membership_person_type = inc_membership_person_type,
# inc_membership_person_type_list = inc_membership_type_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
# inc_membership_person_type_list = inc_membership_person_type_list, # All the membership types they are a part of.
# inc_membership_type = inc_membership_type,
# inc_membership_type_list = inc_membership_type_list,
# inc_order = inc_order,
# inc_organization = inc_organization,
# inc_person = inc_person,
@@ -207,13 +207,13 @@ async def get_person_obj_membership_person(
# inc_contact: bool = False, # Per member
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False, # The primary membership group for a person
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
# inc_membership_person_group_list: bool = False,
# inc_membership_person_profile_cust: bool = False, # Extended profile?
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_person_type: bool = False,
# inc_membership_type: bool = False,
# inc_order: bool = False,
# inc_organization: bool = False,
# inc_product: bool = False, # The product the person actually purchased for a member_type or member_group
@@ -241,9 +241,9 @@ async def get_person_obj_membership_person(
exclude_unset = commons.exclude_unset,
enabled = commons.enabled,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list, # List of membership group for a person - 2022-01-11
inc_membership_profile = inc_membership_profile, # Membership profile for a person - 2022-01-11
inc_membership_type = Fainc_membership_typelse, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list = inc_membership_person_group_list, # List of membership group for a person - 2022-01-11
inc_membership_person_profile = inc_membership_person_profile, # Membership profile for a person - 2022-01-11
inc_membership_person_type = inc_membership_person_type, # Primary membership type for a person - 2022-01-11
):
response_data = membership_person_rec_result
elif membership_person_rec_result is None: # Empty dict or None
@@ -267,13 +267,13 @@ async def get_account_obj_membership_person_list(
# inc_contact: bool = False,
inc_membership_cfg: bool = False,
# inc_membership_group: bool = False,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
# inc_membership_person: bool = False,
# inc_membership_person_list: bool = False,
# inc_membership_person_profile: bool = False,
# inc_membership_person_profile_cust: bool = False,
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_type_list: bool = False,
# inc_order: bool = False,
# inc_organization: bool = False,
@@ -311,12 +311,12 @@ async def get_account_obj_membership_person_list(
# inc_address = inc_address,
# inc_contact = inc_contact,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
# inc_membership_person_group_list = inc_membership_person_group_list,
# inc_membership_person = inc_membership_person,
# inc_membership_person_list = inc_membership_person_list,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
# inc_order = inc_order,
# inc_organization = inc_organization,
# inc_person = inc_person,
@@ -342,9 +342,9 @@ async def lookup_membership_person_obj(
for_obj_id: Union[int,str],
for_obj_type: str = Query(..., min_length=2, max_length=50),
inc_membership_cfg: bool = True,
inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_group_list: bool = False, # List of membership group for a person - 2022-01-11
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
commons: Common_Route_Params = Depends(common_route_params),
):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
@@ -394,9 +394,9 @@ async def lookup_membership_person_obj(
membership_person_obj = load_membership_person_obj(
membership_person_id = membership_person_id,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
data = membership_person_obj
elif isinstance(membership_person_obj_result, list):
@@ -407,9 +407,9 @@ async def lookup_membership_person_obj(
load_membership_person_obj(
membership_person_id = membership_person_id,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
inc_membership_profile = inc_membership_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_person_type = inc_membership_person_type,
).dict(by_alias=by_alias, exclude_unset=exclude_unset)
)
data = membership_person_obj_li

7
app/routers/person.py
View File

@@ -373,7 +373,7 @@ async def get_person_obj(
# inc_membership_person_group_list: bool = False,
inc_membership_person: bool = False,
inc_membership_person_profile: bool = False, # Membership profile for a person - 2022-01-11
inc_membership_type: bool = False, # Primary membership type for a person - 2022-01-11
inc_membership_person_type: bool = False, # Primary membership type for a person - 2022-01-11
# inc_membership_person_type: bool = False,
# inc_membership_type_list: bool = False, # The list of all membership types a person is a part of
# inc_membership_person_type_list: bool = False,
@@ -410,11 +410,10 @@ async def get_person_obj(
inc_journal_list = inc_journal_list,
# inc_journal_entry_list = inc_journal_entry_list,
inc_membership_cfg = inc_membership_cfg,
inc_membership_group_list = inc_membership_group_list,
# inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person_group_list = inc_membership_person_group_list,
inc_membership_person = inc_membership_person,
inc_membership_person_profile = inc_membership_person_profile,
inc_membership_type = inc_membership_type,
inc_membership_person_type = inc_membership_person_type,
# inc_membership_person_type = inc_membership_person_type,
inc_order_closed_count = inc_order_closed_count,
inc_order_line_list = inc_order_line_list,