Clean up
This commit is contained in:
@@ -19,6 +19,7 @@ from app.models.membership_person_models import Membership_Person_Base
|
||||
|
||||
|
||||
# ### BEGIN ### API Membership Person Methods ### load_membership_person_obj() ###
|
||||
# Updated 2021-12-16
|
||||
def load_membership_person_obj(
|
||||
membership_person_id:int|str,
|
||||
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_user: bool = False,
|
||||
) -> 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())
|
||||
|
||||
if membership_person_id := redis_lookup_id_random(record_id_random=membership_person_id, table_name='membership_person'): pass
|
||||
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
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
log.debug(membership_person_rec)
|
||||
|
||||
try:
|
||||
@@ -62,7 +64,7 @@ def load_membership_person_obj(
|
||||
log.debug(membership_person_obj)
|
||||
except ValidationError as e:
|
||||
log.error(e.json())
|
||||
# log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
|
||||
log.debug(membership_person_obj)
|
||||
|
||||
# Updated 2021-06-24
|
||||
@@ -74,15 +76,13 @@ def load_membership_person_obj(
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
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
|
||||
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(
|
||||
# for_obj_type = 'membership_person',
|
||||
# for_obj_id = membership_person_id,
|
||||
membership_person_id = membership_person_id,
|
||||
limit = limit,
|
||||
enabled = enabled,
|
||||
@@ -156,7 +156,7 @@ def load_membership_person_obj(
|
||||
inc_organization = inc_organization,
|
||||
):
|
||||
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)
|
||||
|
||||
# Updated 2021-07-09
|
||||
@@ -179,7 +179,7 @@ def load_membership_person_obj(
|
||||
inc_product_list = inc_product_list,
|
||||
):
|
||||
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)
|
||||
|
||||
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,
|
||||
):
|
||||
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)
|
||||
|
||||
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,
|
||||
):
|
||||
membership_person_obj.person = person_result
|
||||
else: membership_person_obj.person = None
|
||||
else: membership_person_obj.person = {} # None
|
||||
log.debug(person_result)
|
||||
|
||||
# Updated 2021-06-24
|
||||
@@ -235,7 +235,7 @@ def load_membership_person_obj(
|
||||
model_as_dict = model_as_dict,
|
||||
):
|
||||
membership_person_obj.product = product_result
|
||||
else: membership_person_obj.product = None
|
||||
else: membership_person_obj.product = {} # None
|
||||
log.debug(product_result)
|
||||
|
||||
# Updated 2021-06-18
|
||||
@@ -253,7 +253,7 @@ def load_membership_person_obj(
|
||||
# inc_person = inc_person,
|
||||
):
|
||||
membership_person_obj.user = user_result
|
||||
else: membership_person_obj.user = None
|
||||
else: membership_person_obj.user = {} # None
|
||||
log.debug(user_result)
|
||||
|
||||
if model_as_dict:
|
||||
|
||||
@@ -24,7 +24,7 @@ def load_membership_person_profile_obj(
|
||||
inc_membership_cfg: bool = False,
|
||||
inc_organization: bool = False,
|
||||
) -> 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())
|
||||
|
||||
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',
|
||||
record_id = membership_person_profile_id,
|
||||
): pass
|
||||
else: return False
|
||||
else: return None
|
||||
elif membership_person_id:
|
||||
if membership_person_profile_rec := sql_select(
|
||||
table_name = 'v_membership_person_profile',
|
||||
field_name = 'membership_person_id',
|
||||
field_value = membership_person_id,
|
||||
): pass
|
||||
else: return False
|
||||
else: return None
|
||||
else:
|
||||
return None
|
||||
log.debug(membership_person_profile_rec)
|
||||
try:
|
||||
membership_person_profile_obj = Membership_Person_Profile_Base(**membership_person_profile_rec)
|
||||
|
||||
@@ -40,6 +40,7 @@ def create_post_obj(post_obj_new:Post_Base):
|
||||
|
||||
|
||||
# ### BEGIN ### API Post Methods ### load_post_obj() ###
|
||||
# Updated 2021-12-16
|
||||
@logger_reset
|
||||
def load_post_obj(
|
||||
post_id: int|str,
|
||||
@@ -59,11 +60,9 @@ def load_post_obj(
|
||||
else: return False
|
||||
|
||||
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)
|
||||
else: return False
|
||||
|
||||
#log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
|
||||
log.debug(post_rec)
|
||||
|
||||
try:
|
||||
|
||||
Reference in New Issue
Block a user