From 8953fc32d8f75185367b9e0e85e5a8229be005d8 Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 11 Jan 2022 14:12:51 -0500 Subject: [PATCH] Code clean up. Membership tables, views, routes, methods, and models renamed. --- app/db_sql.py | 12 +- app/main.py | 6 +- app/methods/account_methods.py | 10 +- app/methods/membership_group_methods.py | 36 +-- ....py => membership_person_group_methods.py} | 108 ++++----- app/methods/membership_person_methods.py | 205 +++++++++--------- ...s.py => membership_person_type_methods.py} | 134 ++++++------ app/methods/membership_type_methods.py | 2 +- app/methods/person_methods.py | 6 +- app/models/common_field_schema.py | 4 +- app/models/membership_group_models.py | 2 +- ...s.py => membership_person_group_models.py} | 24 +- app/models/membership_person_models.py | 50 ++--- .../membership_person_profile_models.py | 8 +- ...ls.py => membership_person_type_models.py} | 24 +- app/models/membership_type_models.py | 2 +- app/models/person_models.py | 4 +- app/routers/api_crud.py | 8 +- app/routers/importing.py | 204 +++++++++-------- app/routers/membership_group.py | 8 +- app/routers/membership_person.py | 27 ++- ...p_person.py => membership_person_group.py} | 38 ++-- ...pe_person.py => membership_person_type.py} | 38 ++-- app/routers/person.py | 14 +- 24 files changed, 485 insertions(+), 489 deletions(-) rename app/methods/{membership_group_person_methods.py => membership_person_group_methods.py} (60%) rename app/methods/{membership_type_person_methods.py => membership_person_type_methods.py} (65%) rename app/models/{membership_group_person_models.py => membership_person_group_models.py} (85%) rename app/models/{membership_type_person_models.py => membership_person_type_models.py} (86%) rename app/routers/{membership_group_person.py => membership_person_group.py} (74%) rename app/routers/{membership_type_person.py => membership_person_type.py} (75%) diff --git a/app/db_sql.py b/app/db_sql.py index 0a82ad7..be7dd19 100644 --- a/app/db_sql.py +++ b/app/db_sql.py @@ -1095,9 +1095,9 @@ def lookup_id_random_pop( obj_data['membership_group_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_group_id_random', None), table_name='membership_group') obj_data.pop('membership_group_id_random') - if 'membership_group_person_id_random' in obj_data: - obj_data['membership_group_person_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_group_person_id_random', None), table_name='membership_group_person') - obj_data.pop('membership_group_person_id_random') + if 'membership_person_group_id_random' in obj_data: + obj_data['membership_person_group_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_person_group_id_random', None), table_name='membership_person_group') + obj_data.pop('membership_person_group_id_random') if 'membership_person_id_random' in obj_data: obj_data['membership_person_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_person_id_random', None), table_name='membership_person') @@ -1107,9 +1107,9 @@ def lookup_id_random_pop( obj_data['membership_type_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_type_id_random', None), table_name='membership_type') obj_data.pop('membership_type_id_random') - if 'membership_type_person_id_random' in obj_data: - obj_data['membership_type_person_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_type_person_id_random', None), table_name='membership_type_person') - obj_data.pop('membership_type_person_id_random') + if 'membership_person_type_id_random' in obj_data: + obj_data['membership_person_type_id'] = redis_lookup_id_random(record_id_random=obj_data.get('membership_person_type_id_random', None), table_name='membership_person_type') + obj_data.pop('membership_person_type_id_random') if 'order_id_random' in obj_data: obj_data['order_id'] = redis_lookup_id_random(record_id_random=obj_data.get('order_id_random', None), table_name='order') diff --git a/app/main.py b/app/main.py index 2f67eef..d3f9e7c 100644 --- a/app/main.py +++ b/app/main.py @@ -18,7 +18,7 @@ from . import config from app.log import log, logging # Import the routers here first: -from app.routers import api_crud, api, importing, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, event, event_badge, event_badge_template, event_exhibit, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_group_person, membership_person, membership_person_profile, membership_type, membership_type_person, order, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, site, site_domain, user, websockets#, e_impexium +from app.routers import api_crud, api, importing, account, activity_log, address, archive, archive_content, contact, cont_edu_cert, cont_edu_cert_person, event, event_badge, event_badge_template, event_exhibit, event_file, event_importing, event_location, event_person, event_person_detail, event_person_tracking, event_presentation, event_presenter, event_registration, event_session, flask_cfg, hosted_file, journal, journal_entry, log_client_viewing, lookup, membership_cfg, membership_group, membership_person_group, membership_person, membership_person_profile, membership_type, membership_person_type, order, order_line, order_cart, organization, page, person, person_user, post, post_comment, product, site, site_domain, user, websockets#, e_impexium from app.db_sql import db @@ -220,7 +220,7 @@ app.include_router( tags=['Membership Group'], ) app.include_router( - membership_group_person.router, + membership_person_group.router, tags=['Membership Group Person'], ) app.include_router( @@ -236,7 +236,7 @@ app.include_router( tags=['Membership Type'], ) app.include_router( - membership_type_person.router, + membership_person_type.router, tags=['Membership Type Person'], ) app.include_router( diff --git a/app/methods/account_methods.py b/app/methods/account_methods.py index 8d526e1..c45b64c 100644 --- a/app/methods/account_methods.py +++ b/app/methods/account_methods.py @@ -86,7 +86,7 @@ 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_group_person_list: bool = False, # List of members of a group + 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_profile: bool = False, @@ -318,7 +318,7 @@ def load_account_obj( exclude_unset = exclude_unset, model_as_dict = model_as_dict, inc_membership_person_list = inc_membership_person_list, - # inc_membership_group_person_list = inc_membership_group_person_list, + # inc_membership_person_group_list = inc_membership_person_group_list, inc_product_list = inc_product_list, ) ) @@ -633,7 +633,7 @@ def load_account_obj_membership_type( inc_contact: bool = False, inc_membership_cfg: bool = False, inc_membership_group_list: bool = False, # List of groups for the account - inc_membership_group_person_list: bool = False, # List of members of a group + 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_profile: bool = False, @@ -737,7 +737,7 @@ def load_account_obj_membership_group( inc_contact: bool = False, inc_membership_cfg: bool = False, # inc_membership_group_list: bool = False, # List of groups for the account - inc_membership_group_person_list: bool = False, # List of members of a group + 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_profile: bool = False, @@ -808,7 +808,7 @@ def load_account_obj_membership_group( inc_address = inc_address, inc_contact = inc_contact, # inc_membership_person_list = inc_membership_person_list, - inc_membership_group_person_list = inc_membership_group_person_list, + inc_membership_person_group_list = inc_membership_person_group_list, inc_product_list = inc_product_list, inc_person = inc_person, inc_user = inc_user, diff --git a/app/methods/membership_group_methods.py b/app/methods/membership_group_methods.py index ddbd392..feff76f 100644 --- a/app/methods/membership_group_methods.py +++ b/app/methods/membership_group_methods.py @@ -8,7 +8,7 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_updat from app.lib_general import log, logging from app.methods.membership_cfg_methods import load_membership_cfg_obj -from app.methods.membership_group_person_methods import get_membership_group_person_rec_list, load_membership_group_person_obj +from app.methods.membership_person_group_methods import get_membership_person_group_rec_list, load_membership_person_group_obj from app.methods.product_methods import get_product_rec_list, load_product_obj from app.models.membership_group_models import Membership_Group_Base @@ -26,7 +26,7 @@ def load_membership_group_obj( inc_address: bool = False, inc_contact: bool = False, inc_membership_cfg: bool = False, - inc_membership_group_person_list: bool = False, # List of members that are a part of this group + inc_membership_person_group_list: bool = False, # List of members that are a part of this group inc_membership_person: bool = False, inc_membership_person_profile: bool = False, # under membership_person # inc_membership_type_list: bool = False, # ??? @@ -67,18 +67,18 @@ def load_membership_group_obj( else: membership_group_obj.cfg = None # Updated 2021-06-23 - if inc_membership_group_person_list: + if inc_membership_person_group_list: # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - if membership_group_person_rec_list_result := get_membership_group_person_rec_list( + if membership_person_group_rec_list_result := get_membership_person_group_rec_list( for_obj_type = 'membership_group', for_obj_id = membership_group_id, limit = limit, enabled = enabled, ): - membership_group_person_result_list = [] - for membership_group_person_rec in membership_group_person_rec_list_result: - if load_membership_group_person_result := load_membership_group_person_obj( - membership_group_person_id = membership_group_person_rec.get('membership_group_person_id', None), + membership_person_group_result_list = [] + for membership_person_group_rec in membership_person_group_rec_list_result: + if load_membership_person_group_result := load_membership_person_group_obj( + membership_person_group_id = membership_person_group_rec.get('membership_person_group_id', None), limit = limit, by_alias = by_alias, exclude_unset = exclude_unset, @@ -92,10 +92,10 @@ def load_membership_group_obj( # inc_product = inc_product, inc_user = inc_user, ): - membership_group_person_result_list.append(load_membership_group_person_result) - else: membership_group_person_result_list.append(None) - membership_group_obj.membership_group_person_list = membership_group_person_result_list - else: membership_group_obj.membership_group_person_list = [] + membership_person_group_result_list.append(load_membership_person_group_result) + else: membership_person_group_result_list.append(None) + membership_group_obj.membership_person_group_list = membership_person_group_result_list + else: membership_group_obj.membership_person_group_list = [] # Updated 2021-06-18 # if inc_parent_membership_group: @@ -191,15 +191,15 @@ def get_membership_group_rec_list( """ elif membership_person_id: - sql_membership_person_id = f'`membership_group_person`.membership_person_id = :membership_person_id' + sql_membership_person_id = f'`membership_person_group`.membership_person_id = :membership_person_id' if enabled in ['enabled', 'disabled', 'all']: if enabled == 'enabled': data['enable'] = True - sql_enabled = f'AND `membership_group_person`.enable = :enable' + sql_enabled = f'AND `membership_person_group`.enable = :enable' elif enabled == 'disabled': data['enable'] = False - sql_enabled = f'AND `membership_group_person`.enable = :enable' + sql_enabled = f'AND `membership_person_group`.enable = :enable' elif enabled == 'all': sql_enabled = '' else: sql_enabled = '' @@ -211,12 +211,12 @@ def get_membership_group_rec_list( sql_limit = '' sql = f""" - SELECT `membership_group_person`.membership_group_id AS 'membership_group_id', `membership_group_person`.membership_group_id_random AS 'membership_group_id_random' - FROM `v_membership_group_person` AS `membership_group_person` + SELECT `membership_person_group`.membership_group_id AS 'membership_group_id', `membership_person_group`.membership_group_id_random AS 'membership_group_id_random' + FROM `v_membership_person_group` AS `membership_person_group` WHERE {sql_membership_person_id} {sql_enabled} - ORDER BY `membership_group_person`.sort ASC, `membership_group_person`.created_on DESC, `membership_group_person`.updated_on DESC + ORDER BY `membership_person_group`.sort ASC, `membership_person_group`.created_on DESC, `membership_person_group`.updated_on DESC {sql_limit}; """ else: return False diff --git a/app/methods/membership_group_person_methods.py b/app/methods/membership_person_group_methods.py similarity index 60% rename from app/methods/membership_group_person_methods.py rename to app/methods/membership_person_group_methods.py index 7c71e42..6f1a829 100644 --- a/app/methods/membership_group_person_methods.py +++ b/app/methods/membership_person_group_methods.py @@ -8,12 +8,12 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_select, sql_updat from app.lib_general import log, logging # from app.methods.membership_person_methods import get_membership_person_rec_list, load_membership_person_obj -from app.models.membership_group_person_models import Membership_Group_Person_Base +from app.models.membership_person_group_models import Membership_Person_Group_Base -# ### BEGIN ### API Membership Group Person Methods ### load_membership_group_person_obj() ### -def load_membership_group_person_obj( - membership_group_person_id: int|str, +# ### BEGIN ### API Membership Group Person Methods ### load_membership_person_group_obj() ### +def load_membership_person_group_obj( + membership_person_group_id: int|str, limit: int = 1000, by_alias: bool = True, exclude_unset: bool = True, @@ -30,29 +30,29 @@ def load_membership_group_person_obj( inc_product: bool = False, # inc_product_list: bool = False, inc_user: bool = False, - ) -> Membership_Group_Person_Base|bool: + ) -> Membership_Person_Group_Base|bool: log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if membership_group_person_id := redis_lookup_id_random(record_id_random=membership_group_person_id, table_name='membership_group_person'): pass + if membership_person_group_id := redis_lookup_id_random(record_id_random=membership_person_group_id, table_name='membership_person_group'): pass else: return False - log.debug(membership_group_person_id) + log.debug(membership_person_group_id) - if membership_group_person_rec := sql_select(table_name='v_membership_group_person', record_id=membership_group_person_id): - log.debug(membership_group_person_rec) + if membership_person_group_rec := sql_select(table_name='v_membership_person_group', record_id=membership_person_group_id): + log.debug(membership_person_group_rec) else: return False - log.debug(membership_group_person_rec) + log.debug(membership_person_group_rec) try: - membership_group_person_obj = Membership_Group_Person_Base(**membership_group_person_rec) - log.debug(membership_group_person_obj) + membership_person_group_obj = Membership_Person_Group_Base(**membership_person_group_rec) + log.debug(membership_person_group_obj) except ValidationError as e: log.error(e.json()) # Updated 2021-06-21 if inc_membership_person: from app.methods.membership_person_methods import load_membership_person_obj - membership_person_id = membership_group_person_rec.get('membership_person_id', None) + membership_person_id = membership_person_group_rec.get('membership_person_id', None) log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(membership_person_id) if membership_person_result := load_membership_person_obj( @@ -70,19 +70,19 @@ def load_membership_group_person_obj( inc_person = inc_person, inc_user = inc_user, ): - membership_group_person_obj.membership_person = membership_person_result - else: membership_group_person_obj.membership_person = None + membership_person_group_obj.membership_person = membership_person_result + else: membership_person_group_obj.membership_person = None log.debug(membership_person_result) if model_as_dict: - return membership_group_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member + return membership_person_group_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member else: - return membership_group_person_obj -# ### END ### API Membership Group Person Methods ### load_membership_group_person_obj() ### + return membership_person_group_obj +# ### END ### API Membership Group Person Methods ### load_membership_person_group_obj() ### -# ### BEGIN ### API Membership Group Person Methods ### get_membership_group_person_rec_list() ### -def get_membership_group_person_rec_list( +# ### BEGIN ### API Membership Group Person Methods ### get_membership_person_group_rec_list() ### +def get_membership_person_group_rec_list( for_obj_type: str, for_obj_id: str, limit: int = 1000, @@ -115,8 +115,8 @@ def get_membership_group_person_rec_list( sql_limit = '' sql = f""" - SELECT `tbl`.id AS 'membership_group_person_id', `tbl`.id_random AS 'membership_group_person_id_random' - FROM `membership_group_person` AS `tbl` + SELECT `tbl`.id AS 'membership_person_group_id', `tbl`.id_random AS 'membership_person_group_id_random' + FROM `membership_person_group` AS `tbl` WHERE {sql_obj_type_id} {sql_enabled} @@ -126,66 +126,66 @@ def get_membership_group_person_rec_list( # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(sql) - if membership_group_person_rec_li_result := sql_select(data=data, sql=sql, as_list=True): - membership_group_person_rec_li = membership_group_person_rec_li_result + if membership_person_group_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + membership_person_group_rec_li = membership_person_group_rec_li_result else: - membership_group_person_rec_li = [] + membership_person_group_rec_li = [] log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(membership_group_person_rec_li_result) + log.debug(membership_person_group_rec_li_result) - return membership_group_person_rec_li -# ### END ### API Membership Group Person Methods ### get_membership_group_person_rec_list() ### + return membership_person_group_rec_li +# ### END ### API Membership Group Person Methods ### get_membership_person_group_rec_list() ### -# ### BEGIN ### API Membership Group Person Methods ### create_membership_group_person_obj() ### -def create_membership_group_person_obj(membership_group_person_obj_new:Membership_Group_Person_Base) -> bool|int: +# ### 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: log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - membership_group_person_obj_data = membership_group_person_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'}) + membership_person_group_obj_data = membership_person_group_obj_new.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'}) - if membership_group_person_obj_in_result := sql_insert( - data=membership_group_person_obj_data, - table_name='membership_group_person', + if membership_person_group_obj_in_result := sql_insert( + data=membership_person_group_obj_data, + table_name='membership_person_group', rm_id_random=True, id_random_length=8 ): pass else: return False - log.debug(membership_group_person_obj_in_result) + log.debug(membership_person_group_obj_in_result) - membership_group_person_id = membership_group_person_obj_in_result + membership_person_group_id = membership_person_group_obj_in_result - log.debug(f'New membership_group_person_id: {membership_group_person_id}') - return membership_group_person_id -# ### END ### API Membership Group Person Methods ### create_membership_group_person_obj() ### + log.debug(f'New membership_person_group_id: {membership_person_group_id}') + return membership_person_group_id +# ### END ### API Membership Group Person Methods ### create_membership_person_group_obj() ### -# ### BEGIN ### API Membership Group Person Methods ### update_membership_group_person_obj() ### -def update_membership_group_person_obj( - membership_group_person_id: int|str, # This allows for updating of the id_random value. - membership_group_person_obj_up: Membership_Group_Person_Base, +# ### BEGIN ### API Membership Group Person Methods ### update_membership_person_group_obj() ### +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: log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if membership_group_person_id := redis_lookup_id_random(record_id_random=membership_group_person_id, table_name='membership_group_person'): pass + if membership_person_group_id := redis_lookup_id_random(record_id_random=membership_person_group_id, table_name='membership_person_group'): pass else: return False - membership_group_person_obj_up.id = membership_group_person_id + membership_person_group_obj_up.id = membership_person_group_id - log.debug(membership_group_person_obj_up) - log.debug(membership_group_person_obj_up.dict(by_alias=False, exclude_unset=True)) - # log.debug(membership_group_person_obj_up.dict(by_alias=False, exclude_unset=False)) + log.debug(membership_person_group_obj_up) + log.debug(membership_person_group_obj_up.dict(by_alias=False, exclude_unset=True)) + # log.debug(membership_person_group_obj_up.dict(by_alias=False, exclude_unset=False)) - membership_group_person_dict_up = membership_group_person_obj_up.dict(by_alias=False, exclude_unset=True) - log.debug(membership_group_person_dict_up) + membership_person_group_dict_up = membership_person_group_obj_up.dict(by_alias=False, exclude_unset=True) + log.debug(membership_person_group_dict_up) - if membership_group_person_obj_up_result := sql_update(data=membership_group_person_dict_up, table_name='membership_group_person', rm_id_random=True): - log.debug(membership_group_person_obj_up_result) + if membership_person_group_obj_up_result := sql_update(data=membership_person_group_dict_up, table_name='membership_person_group', rm_id_random=True): + log.debug(membership_person_group_obj_up_result) return True else: - log.debug(membership_group_person_obj_up_result) + log.debug(membership_person_group_obj_up_result) return False -# ### END ### API Membership Group Person Methods ### update_membership_group_person_obj() ### +# ### END ### API Membership Group Person Methods ### update_membership_person_group_obj() ### diff --git a/app/methods/membership_person_methods.py b/app/methods/membership_person_methods.py index 77bff71..4d20697 100644 --- a/app/methods/membership_person_methods.py +++ b/app/methods/membership_person_methods.py @@ -9,9 +9,9 @@ from app.db_sql import redis_lookup_id_random, sql_insert, sql_insert_or_update, from app.methods.membership_cfg_methods import load_membership_cfg_obj from app.methods.membership_group_methods import get_membership_group_rec_list, load_membership_group_obj -from app.methods.membership_group_person_methods import get_membership_group_person_rec_list, load_membership_group_person_obj +from app.methods.membership_person_group_methods import get_membership_person_group_rec_list, load_membership_person_group_obj from app.methods.membership_person_profile_methods import get_membership_person_profile_rec_list, load_membership_person_profile_obj -from app.methods.membership_type_person_methods import create_membership_type_person_obj, update_membership_type_person_obj +from app.methods.membership_person_type_methods import create_membership_person_type_obj, update_membership_person_type_obj from app.methods.person_methods import load_person_obj from app.methods.product_methods import load_product_obj from app.methods.user_methods import load_user_obj @@ -20,10 +20,10 @@ from app.models.membership_person_models import Membership_Person_Base # ### BEGIN ### API Membership Person Methods ### load_membership_person_obj() ### -# Updated 2021-12-16 +# Updated 2022-01-11 def load_membership_person_obj( membership_person_id:int|str, - limit: int = 1000, + limit: int = 100, by_alias: bool = True, exclude_unset: bool = True, model_as_dict: bool = False, @@ -31,22 +31,23 @@ def load_membership_person_obj( inc_address: bool = False, inc_contact: bool = False, inc_membership_cfg: bool = False, - inc_membership_group: bool = False, # Their primary membership group - inc_membership_group_list: bool = False, # The list of membership groups the person is a part of - inc_membership_group_person: bool = False, # The person information for their primary membership group - inc_membership_group_person_list: bool = False, # The person information for all of their membership groups - inc_membership_person_profile: bool = False, - inc_membership_person_profile_cust: bool = False, # Extended profile? - inc_membership_type: bool = False, # Their primary membership type - inc_membership_type_list: bool = False, # The list of membership types the person is a part of - inc_membership_type_person: bool = False, # The person information for their primary membership type - inc_membership_type_person_list: bool = False, # The person information for all of their membership types - # inc_order: bool = False, - inc_organization: bool = False, + # inc_membership_group: bool = False, # Their primary membership group + inc_membership_group_list: bool = False, # List of membership group for a person - 2022-01-11 + # inc_membership_person_group: bool = False, # The person information for their primary membership group + # inc_membership_person_group_list: bool = False, # The person information for all of their membership groups + # 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_type_list: bool = False, # The list of membership types the person is a part of + # inc_membership_person_type: bool = False, # The person information for their primary membership type + # inc_membership_person_type_list: bool = False, # The person information for all of their membership types + inc_order: bool = False, + # inc_organization: bool = False, inc_person: bool = False, 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_user: bool = False, + # inc_user: bool = False, ) -> Membership_Person_Base: log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) @@ -111,38 +112,38 @@ def load_membership_person_obj( else: membership_person_obj.membership_group_list = [] # Updated 2021-07-09 - if inc_membership_group_person_list: # The person information for the list of groups the member is a part of - if membership_group_person_rec_list_result := get_membership_group_person_rec_list( - for_obj_type = 'membership_person', - for_obj_id = membership_person_id, - # membership_person_id = membership_person_id, - limit = limit, - enabled = enabled, - ): - membership_group_person_result_list = [] - for membership_group_person_rec in membership_group_person_rec_list_result: - if load_membership_group_person_result := load_membership_group_person_obj( - membership_group_person_id = membership_group_person_rec.get('membership_group_person_id', None), - limit = limit, - by_alias = by_alias, - exclude_unset = exclude_unset, - model_as_dict = model_as_dict, - enabled = enabled, - # inc_membership_group_person_list = inc_membership_group_person_list, - # inc_membership_person_profile = inc_membership_person_profile, - # inc_organization = inc_organization, - # inc_person = inc_person, - inc_product = inc_product, - # inc_product_list = inc_product_list, - # inc_user = inc_user, - ): - membership_group_person_result_list.append(load_membership_group_person_result) - else: membership_group_person_result_list.append(None) - membership_person_obj.membership_group_person_list = membership_group_person_result_list - else: membership_person_obj.membership_group_person_list = [] + # if inc_membership_person_group_list: # The person information for the list of groups the member is a part of + # if membership_person_group_rec_list_result := get_membership_person_group_rec_list( + # for_obj_type = 'membership_person', + # for_obj_id = membership_person_id, + # # membership_person_id = membership_person_id, + # limit = limit, + # enabled = enabled, + # ): + # membership_person_group_result_list = [] + # for membership_person_group_rec in membership_person_group_rec_list_result: + # if load_membership_person_group_result := load_membership_person_group_obj( + # membership_person_group_id = membership_person_group_rec.get('membership_person_group_id', None), + # limit = limit, + # by_alias = by_alias, + # exclude_unset = exclude_unset, + # model_as_dict = model_as_dict, + # enabled = enabled, + # # 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_product_list = inc_product_list, + # # inc_user = inc_user, + # ): + # membership_person_group_result_list.append(load_membership_person_group_result) + # else: membership_person_group_result_list.append(None) + # membership_person_obj.membership_person_group_list = membership_person_group_result_list + # else: membership_person_obj.membership_person_group_list = [] # Updated 2021-06-21 - if inc_membership_person_profile: + if inc_membership_profile: membership_person_profile_id = membership_person_rec.get('membership_person_profile_id', None) log.debug(membership_person_profile_id) if membership_person_profile_result := load_membership_person_profile_obj( @@ -186,26 +187,26 @@ def load_membership_person_obj( if inc_membership_type_list: pass # All of the membership types the person is a part of # Updated 2021-07-09 - if inc_membership_type_person: # The primary membership type person information for the person - from app.methods.membership_type_person_methods import load_membership_type_person_obj - membership_type_person_id = membership_person_rec.get('membership_type_person_id', None) - log.debug(membership_type_person_id) - if membership_type_person_result := load_membership_type_person_obj( - membership_type_person_id = membership_type_person_id, - limit = limit, - by_alias = by_alias, - exclude_unset = exclude_unset, - model_as_dict = model_as_dict, - enabled = enabled, - inc_membership_cfg = inc_membership_cfg, - inc_membership_type = inc_membership_type, - inc_product = inc_product, - ): - membership_person_obj.membership_type_person = membership_type_person_result - else: membership_person_obj.membership_type_person = {} # None - log.debug(membership_type_person_result) + # if inc_membership_person_type: # The primary membership type person information for the person + # from app.methods.membership_person_type_methods import load_membership_person_type_obj + # membership_person_type_id = membership_person_rec.get('membership_person_type_id', None) + # log.debug(membership_person_type_id) + # if membership_person_type_result := load_membership_person_type_obj( + # membership_person_type_id = membership_person_type_id, + # limit = limit, + # by_alias = by_alias, + # exclude_unset = exclude_unset, + # model_as_dict = model_as_dict, + # enabled = enabled, + # inc_membership_cfg = inc_membership_cfg, + # inc_membership_type = inc_membership_type, + # inc_product = inc_product, + # ): + # membership_person_obj.membership_person_type = membership_person_type_result + # else: membership_person_obj.membership_person_type = {} # None + # log.debug(membership_person_type_result) - if inc_membership_type_person_list: pass # All of the membership type person records for a person + # if inc_membership_person_type_list: pass # All of the membership type person records for a person # Updated 2021-06-18 if inc_person: @@ -240,22 +241,22 @@ def load_membership_person_obj( log.debug(product_result) # Updated 2021-06-18 - if inc_user: - log.warning(f'This is being deprecated? load_membership_person_obj() inc_user') - user_id = membership_person_rec.get('user_id', None) - if user_result := load_user_obj( - user_id = user_id, - by_alias = by_alias, - exclude_unset = exclude_unset, - model_as_dict = model_as_dict, - # inc_address = inc_address, - # inc_contact = inc_contact, - # inc_organization = inc_organization, - # inc_person = inc_person, - ): - membership_person_obj.user = user_result - else: membership_person_obj.user = {} # None - log.debug(user_result) + # if inc_user: + # log.warning(f'This is being deprecated? load_membership_person_obj() inc_user') + # user_id = membership_person_rec.get('user_id', None) + # if user_result := load_user_obj( + # user_id = user_id, + # by_alias = by_alias, + # exclude_unset = exclude_unset, + # model_as_dict = model_as_dict, + # # inc_address = inc_address, + # # inc_contact = inc_contact, + # # inc_organization = inc_organization, + # # inc_person = inc_person, + # ): + # membership_person_obj.user = user_result + # else: membership_person_obj.user = {} # None + # log.debug(user_result) if model_as_dict: return membership_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member @@ -416,7 +417,7 @@ def create_membership_person_obj( else: membership_person_obj = membership_person_dict_obj # Assume it is an object model - membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_group_person_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_type_person', 'person', 'product', 'user', 'created_on', 'updated_on'}) + membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_person_group_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_person_type', 'person', 'product', 'user', 'created_on', 'updated_on'}) log.debug(membership_person_dict) membership_person_dict['account_id'] = account_id @@ -478,7 +479,7 @@ def update_membership_person_obj( else: membership_person_obj = membership_person_dict_obj # Assume it is an object model - membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_group_person_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_type_person', 'person', 'product', 'user', 'created_on', 'updated_on'}) + membership_person_dict = membership_person_dict_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'membership_cfg', 'membership_group', 'membership_group_list', 'membership_person_group_list', 'profile', 'membership_person_profile', 'membership_type', 'membership_type_list', 'membership_person_type', 'person', 'product', 'user', 'created_on', 'updated_on'}) log.debug(membership_person_dict) if membership_person_dict_up_result := sql_update(data=membership_person_dict, table_name='membership_person', rm_id_random=True, id_random_length=8): pass @@ -499,37 +500,37 @@ def update_membership_person_obj( membership_person_outline['membership_person_profile_id'] = None # NOTE: Use object model version because of better type checking and validations - if membership_person_obj.membership_type_person: - membership_person_outline['membership_type_person_id'] = None - membership_type_person_obj = membership_person_obj.membership_type_person - if membership_type_person_id := membership_person_obj.membership_type_person_id: pass - elif membership_type_person_id := membership_type_person_obj.id: pass - else: membership_type_person_id = None + if membership_person_obj.membership_person_type: + membership_person_outline['membership_person_type_id'] = None + membership_person_type_obj = membership_person_obj.membership_person_type + if membership_person_type_id := membership_person_obj.membership_person_type_id: pass + elif membership_person_type_id := membership_person_type_obj.id: pass + else: membership_person_type_id = None - membership_type_person_obj.membership_type_id = 6 + membership_person_type_obj.membership_type_id = 6 - if membership_type_person_id: - update_membership_type_person_obj_result = update_membership_type_person_obj( - membership_type_person_dict_obj = membership_type_person_obj, - membership_type_person_id = membership_type_person_id, + if membership_person_type_id: + update_membership_person_type_obj_result = update_membership_person_type_obj( + membership_person_type_dict_obj = membership_person_type_obj, + membership_person_type_id = membership_person_type_id, fail_any = fail_any, return_outline = return_outline, ) - if update_membership_type_person_obj_result: - membership_person_outline['membership_type_person_id'] = membership_type_person_id + if update_membership_person_type_obj_result: + membership_person_outline['membership_person_type_id'] = membership_person_type_id pass else: pass else: - create_membership_type_person_obj_result = create_membership_type_person_obj( - membership_type_person_dict_obj = membership_type_person_obj, + create_membership_person_type_obj_result = create_membership_person_type_obj( + membership_person_type_dict_obj = membership_person_type_obj, membership_person_id = membership_person_id, fail_any = fail_any, return_outline = return_outline, ) - if isinstance(create_membership_type_person_obj_result, int): - membership_type_person_id = create_membership_type_person_obj_result - membership_person_outline['membership_type_person_id'] = membership_type_person_id + if isinstance(create_membership_person_type_obj_result, int): + membership_person_type_id = create_membership_person_type_obj_result + membership_person_outline['membership_person_type_id'] = membership_person_type_id else: pass diff --git a/app/methods/membership_type_person_methods.py b/app/methods/membership_person_type_methods.py similarity index 65% rename from app/methods/membership_type_person_methods.py rename to app/methods/membership_person_type_methods.py index be322cd..4992312 100644 --- a/app/methods/membership_type_person_methods.py +++ b/app/methods/membership_person_type_methods.py @@ -10,13 +10,13 @@ from app.lib_general import log, logging from app.methods.membership_cfg_methods import load_membership_cfg_obj from app.methods.product_methods import get_product_rec_list, load_product_obj -from app.models.membership_type_person_models import Membership_Type_Person_Base +from app.models.membership_person_type_models import Membership_Person_Type_Base -# ### BEGIN ### API Membership Type Person Methods ### load_membership_type_person_obj() ### +# ### BEGIN ### API Membership Type Person Methods ### load_membership_person_type_obj() ### # Updated 2021-07-09 -def load_membership_type_person_obj( - membership_type_person_id: int|str, +def load_membership_person_type_obj( + membership_person_type_id: int|str, limit: int = 1000, by_alias: bool = True, exclude_unset: bool = True, @@ -33,40 +33,40 @@ def load_membership_type_person_obj( inc_product_list: bool = False, inc_person: bool = False, inc_user: bool = False, - ) -> Membership_Type_Person_Base|bool: + ) -> Membership_Person_Type_Base|bool: # log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if membership_type_person_id := redis_lookup_id_random(record_id_random=membership_type_person_id, table_name='membership_type_person'): pass + if membership_person_type_id := redis_lookup_id_random(record_id_random=membership_person_type_id, table_name='membership_person_type'): pass else: return False - log.debug(membership_type_person_id) + log.debug(membership_person_type_id) - if membership_type_person_rec := sql_select(table_name='v_membership_type_person', record_id=membership_type_person_id): - log.debug(membership_type_person_rec) + if membership_person_type_rec := sql_select(table_name='v_membership_person_type', record_id=membership_person_type_id): + log.debug(membership_person_type_rec) else: return False - log.debug(membership_type_person_rec) + log.debug(membership_person_type_rec) try: - membership_type_person_obj = Membership_Type_Person_Base(**membership_type_person_rec) - log.debug(membership_type_person_obj) + membership_person_type_obj = Membership_Person_Type_Base(**membership_person_type_rec) + log.debug(membership_person_type_obj) except ValidationError as e: log.error(e.json()) # Updated 2021-06-24 if inc_membership_cfg: if membership_cfg_obj_result := load_membership_cfg_obj( - account_id = membership_type_person_rec.get('account_id', None), + account_id = membership_person_type_rec.get('account_id', None), by_alias = by_alias, exclude_unset = exclude_unset, model_as_dict = model_as_dict, ): - membership_type_person_obj.membership_cfg = membership_cfg_obj_result - else: membership_type_person_obj.membership_cfg = None + membership_person_type_obj.membership_cfg = membership_cfg_obj_result + else: membership_person_type_obj.membership_cfg = None # Updated 2021-06-21 if inc_membership_person: from app.methods.membership_person_methods import load_membership_person_obj - membership_person_id = membership_type_person_rec.get('membership_person_id', None) + membership_person_id = membership_person_type_rec.get('membership_person_id', None) # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(membership_person_id) if membership_person_result := load_membership_person_obj( @@ -84,14 +84,14 @@ def load_membership_type_person_obj( inc_person = inc_person, inc_user = inc_user, ): - membership_type_person_obj.membership_person = membership_person_result - else: membership_type_person_obj.membership_person = None + membership_person_type_obj.membership_person = membership_person_result + else: membership_person_type_obj.membership_person = None log.debug(membership_person_result) # Updated 2021-07-09 if inc_membership_type: # The primary membership type for the person from app.methods.membership_type_methods import load_membership_type_obj - membership_type_id = membership_type_person_rec.get('membership_type_id', None) + membership_type_id = membership_person_type_rec.get('membership_type_id', None) log.debug(membership_type_id) if membership_type_result := load_membership_type_obj( membership_type_id = membership_type_id, @@ -103,13 +103,13 @@ def load_membership_type_person_obj( # inc_membership_cfg = inc_membership_cfg, inc_product_list = inc_product_list, ): - membership_type_person_obj.membership_type = membership_type_result - else: membership_type_person_obj.membership_type = None + membership_person_type_obj.membership_type = membership_type_result + else: membership_person_type_obj.membership_type = None log.debug(membership_type_result) # Updated 2021-07-09 if inc_product: - product_id = membership_type_person_rec.get('product_id', None) + product_id = membership_person_type_rec.get('product_id', None) log.debug(product_id) if product_result := load_product_obj( product_id = product_id, @@ -117,19 +117,19 @@ def load_membership_type_person_obj( exclude_unset = exclude_unset, model_as_dict = model_as_dict, ): - membership_type_person_obj.product = product_result - else: membership_type_person_obj.product = None + membership_person_type_obj.product = product_result + else: membership_person_type_obj.product = None log.debug(product_result) if model_as_dict: - return membership_type_person_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member + return membership_person_type_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member else: - return membership_type_person_obj -# ### END ### API Membership Type Person Methods ### load_membership_type_person_obj() ### + return membership_person_type_obj +# ### END ### API Membership Type Person Methods ### load_membership_person_type_obj() ### -# ### BEGIN ### API Membership Type Person Methods ### get_membership_type_person_rec_list() ### -def get_membership_type_person_rec_list( +# ### BEGIN ### API Membership Type Person Methods ### get_membership_person_type_rec_list() ### +def get_membership_person_type_rec_list( for_obj_type: str, for_obj_id: str, limit: int = 1000, @@ -162,8 +162,8 @@ def get_membership_type_person_rec_list( sql_limit = '' sql = f""" - SELECT `tbl`.id AS 'membership_type_person_id', `tbl`.id_random AS 'membership_type_person_id_random' - FROM `membership_type_person` AS `tbl` + SELECT `tbl`.id AS 'membership_person_type_id', `tbl`.id_random AS 'membership_person_type_id_random' + FROM `membership_person_type` AS `tbl` WHERE {sql_obj_type_id} {sql_enabled} @@ -173,21 +173,21 @@ def get_membership_type_person_rec_list( # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(sql) - if membership_type_person_rec_li_result := sql_select(data=data, sql=sql, as_list=True): - membership_type_person_rec_li = membership_type_person_rec_li_result + if membership_person_type_rec_li_result := sql_select(data=data, sql=sql, as_list=True): + membership_person_type_rec_li = membership_person_type_rec_li_result else: - membership_type_person_rec_li = [] + membership_person_type_rec_li = [] # log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL - log.debug(membership_type_person_rec_li_result) + log.debug(membership_person_type_rec_li_result) - return membership_type_person_rec_li -# ### END ### API Membership Type Person Methods ### get_membership_type_person_rec_list() ### + return membership_person_type_rec_li +# ### END ### API Membership Type Person Methods ### get_membership_person_type_rec_list() ### -# ### BEGIN ### API Membership Type Person Methods ### create_membership_type_person_obj() ### -def create_membership_type_person_obj( +# ### BEGIN ### API Membership Type Person Methods ### create_membership_person_type_obj() ### +def create_membership_person_type_obj( membership_person_id: int|str, - membership_type_person_dict_obj: Membership_Type_Person_Base, + 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: @@ -201,62 +201,62 @@ def create_membership_type_person_obj( log.info(f'Membership Person ID: {membership_person_id}') return False - membership_type_person_obj = membership_type_person_dict_obj + membership_person_type_obj = membership_person_type_dict_obj # Stuff goes here - membership_type_person_obj_data = membership_type_person_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'}) + membership_person_type_obj_data = membership_person_type_obj.dict(by_alias=False, exclude_defaults=False, exclude_unset=True, exclude={'created_on', 'updated_on'}) - membership_type_person_obj_data['membership_person_id'] = membership_person_id + membership_person_type_obj_data['membership_person_id'] = membership_person_id - if membership_type_person_obj_in_result := sql_insert( - data = membership_type_person_obj_data, - table_name = 'membership_type_person', + if membership_person_type_obj_in_result := sql_insert( + data = membership_person_type_obj_data, + table_name = 'membership_person_type', rm_id_random = True, id_random_length = 8 ): pass else: return False - log.debug(membership_type_person_obj_in_result) + log.debug(membership_person_type_obj_in_result) - membership_type_person_id = membership_type_person_obj_in_result + membership_person_type_id = membership_person_type_obj_in_result - log.debug(f'New membership_type_person_id: {membership_type_person_id}') - return membership_type_person_id -# ### END ### API Membership Type Person Methods ### create_membership_type_person_obj() ### + log.debug(f'New membership_person_type_id: {membership_person_type_id}') + return membership_person_type_id +# ### END ### API Membership Type Person Methods ### create_membership_person_type_obj() ### -# ### BEGIN ### API Membership Type Person Methods ### update_membership_type_person_obj() ### -def update_membership_type_person_obj( - membership_type_person_id: int|str, # This allows for updating of the id_random value. - membership_type_person_dict_obj: Membership_Type_Person_Base, +# ### BEGIN ### API Membership Type Person Methods ### update_membership_person_type_obj() ### +def update_membership_person_type_obj( + membership_person_type_id: int|str, # This allows for updating of the id_random value. + 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: log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if membership_type_person_id := redis_lookup_id_random(record_id_random=membership_type_person_id, table_name='membership_type_person'): pass + if membership_person_type_id := redis_lookup_id_random(record_id_random=membership_person_type_id, table_name='membership_person_type'): pass else: return False # Stuff goes here - membership_type_person_dict_obj.id = membership_type_person_id + membership_person_type_dict_obj.id = membership_person_type_id - membership_type_person_obj = membership_type_person_dict_obj + membership_person_type_obj = membership_person_type_dict_obj - log.debug(membership_type_person_obj) - log.debug(membership_type_person_obj.dict(by_alias=False, exclude_unset=True)) - # log.debug(membership_type_person_obj.dict(by_alias=False, exclude_unset=False)) + log.debug(membership_person_type_obj) + log.debug(membership_person_type_obj.dict(by_alias=False, exclude_unset=True)) + # log.debug(membership_person_type_obj.dict(by_alias=False, exclude_unset=False)) - membership_type_person_dict = membership_type_person_obj.dict(by_alias=False, exclude_unset=True) - log.debug(membership_type_person_dict) + membership_person_type_dict = membership_person_type_obj.dict(by_alias=False, exclude_unset=True) + log.debug(membership_person_type_dict) - if membership_type_person_obj_up_result := sql_update(data=membership_type_person_dict, table_name='membership_type_person', rm_id_random=True): - log.debug(membership_type_person_obj_up_result) + if membership_person_type_obj_up_result := sql_update(data=membership_person_type_dict, table_name='membership_person_type', rm_id_random=True): + log.debug(membership_person_type_obj_up_result) return True else: - log.debug(membership_type_person_obj_up_result) + log.debug(membership_person_type_obj_up_result) return False -# ### END ### API Membership Type Person Methods ### update_membership_type_person_obj() ### +# ### END ### API Membership Type Person Methods ### update_membership_person_type_obj() ### diff --git a/app/methods/membership_type_methods.py b/app/methods/membership_type_methods.py index 507cfd5..445e565 100644 --- a/app/methods/membership_type_methods.py +++ b/app/methods/membership_type_methods.py @@ -26,7 +26,7 @@ def load_membership_type_obj( inc_contact: bool = False, inc_membership_cfg: bool = False, inc_membership_group_list: bool = False, # under membership_person - inc_membership_group_person_list: bool = False, + inc_membership_person_group_list: bool = False, inc_membership_person_list: bool = False, inc_membership_person_profile: bool = False, # under membership_person inc_organization: bool = False, diff --git a/app/methods/person_methods.py b/app/methods/person_methods.py index 4058299..aed6409 100644 --- a/app/methods/person_methods.py +++ b/app/methods/person_methods.py @@ -38,15 +38,15 @@ def load_person_obj( inc_membership_group: bool = False, inc_membership_person_group: bool = False, inc_membership_group_list: bool = False, - inc_membership_group_person_list: bool = False, + inc_membership_person_group_list: bool = False, inc_membership_person: bool = False, # NOTE: Same as inc_membership_person_list inc_membership_person_list: bool = False, # NOTE: Same as inc_membership_person inc_membership_person_profile: bool = False, inc_membership_person_profile_cust: bool = False, inc_membership_type: bool = False, - inc_membership_type_person: bool = False, + inc_membership_person_type: bool = False, inc_membership_type_list: bool = False, - inc_membership_type_person_list: bool = False, + inc_membership_person_type_list: bool = False, inc_order_cfg: bool = False, inc_order_closed_count: bool = False, inc_order_line_list: bool = False, diff --git a/app/models/common_field_schema.py b/app/models/common_field_schema.py index effadd9..501119f 100644 --- a/app/models/common_field_schema.py +++ b/app/models/common_field_schema.py @@ -59,11 +59,11 @@ base_fields['log_client_viewing_id_random'] = xxx_id_random_field_schema # base_fields['membership_id_random'] = xxx_id_random_field_schema # renamed to membership_type base_fields['membership_cfg_id_random'] = xxx_id_random_field_schema base_fields['membership_group_id_random'] = xxx_id_random_field_schema -base_fields['membership_group_person_id_random'] = xxx_id_random_field_schema +base_fields['membership_person_group_id_random'] = xxx_id_random_field_schema base_fields['membership_person_id_random'] = xxx_id_random_field_schema base_fields['membership_person_profile_id_random'] = xxx_id_random_field_schema base_fields['membership_type_id_random'] = xxx_id_random_field_schema -base_fields['membership_type_person_id_random'] = xxx_id_random_field_schema +base_fields['membership_person_type_id_random'] = xxx_id_random_field_schema base_fields['order_cart_id_random'] = xxx_id_random_field_schema base_fields['order_cart_line_id_random'] = xxx_id_random_field_schema base_fields['order_id_random'] = xxx_id_random_field_schema diff --git a/app/models/membership_group_models.py b/app/models/membership_group_models.py index b461794..44d9682 100644 --- a/app/models/membership_group_models.py +++ b/app/models/membership_group_models.py @@ -49,7 +49,7 @@ class Membership_Group_Base(BaseModel): # Including other related objects cfg: Optional[Membership_Cfg_Base] # membership_type: Optional[Membership_Type_Base] # The membership option/type they currently have - membership_group_person_list: Optional[list] # Membership_Group_Person_Base + membership_person_group_list: Optional[list] # Membership_Person_Group_Base # parent_membership_group: Optional[Membership_Group_Base] product_list: Optional[list] # Product_Base() List of products (for_type and for_id) that get this membership option diff --git a/app/models/membership_group_person_models.py b/app/models/membership_person_group_models.py similarity index 85% rename from app/models/membership_group_person_models.py rename to app/models/membership_person_group_models.py index 7a0d863..8f5864b 100644 --- a/app/models/membership_group_person_models.py +++ b/app/models/membership_person_group_models.py @@ -8,22 +8,22 @@ from app.db_sql import redis_lookup_id_random from app.lib_general import log, logging from app.models.common_field_schema import base_fields, default_num_bytes -from app.models.membership_cfg_models import Membership_Cfg_Base +# from app.models.membership_cfg_models import Membership_Cfg_Base from app.models.membership_group_models import Membership_Group_Base from app.models.product_models import Product_Base -class Membership_Group_Person_Base(BaseModel): +class Membership_Person_Group_Base(BaseModel): log.setLevel(logging.WARNING) log.debug(locals()) id_random: Optional[str] = Field( - **base_fields['membership_group_person_id_random'], - alias = 'membership_group_person_id_random', + **base_fields['membership_person_group_id_random'], + alias = 'membership_person_group_id_random', default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( - alias = 'membership_group_person_id' + alias = 'membership_person_group_id' ) account_id_random: Optional[str] @@ -61,16 +61,16 @@ class Membership_Group_Person_Base(BaseModel): updated_on: Optional[datetime.datetime] = None # Including other related objects - membership_cfg: Optional[Membership_Cfg_Base] = Field( - alias = 'cfg', - ) + # membership_cfg: Optional[Membership_Cfg_Base] = Field( + # alias = 'cfg', + # ) membership_group: Optional[Membership_Group_Base] product: Optional[Product_Base] # The product used to be a part of the group? _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) - #@validator('membership_group_person_id_random', always=True) - def membership_group_person_id_random_copy(cls, v, values, **kwargs): + #@validator('membership_person_group_id_random', always=True) + def membership_person_group_id_random_copy(cls, v, values, **kwargs): log.setLevel(logging.WARNING) log.debug(locals()) @@ -79,12 +79,12 @@ class Membership_Group_Person_Base(BaseModel): return None @validator('id', always=True) - def membership_group_person_id_lookup(cls, v, values, **kwargs): + def membership_person_group_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) log.debug(locals()) if values['id_random']: - return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_group_person') + return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_person_group') return None @validator('membership_group_id', always=True) diff --git a/app/models/membership_person_models.py b/app/models/membership_person_models.py index eed15b9..6b90fc8 100644 --- a/app/models/membership_person_models.py +++ b/app/models/membership_person_models.py @@ -10,10 +10,10 @@ from app.lib_general import log, logging from app.models.common_field_schema import base_fields, default_num_bytes from app.models.membership_cfg_models import Membership_Cfg_Base from app.models.membership_group_models import Membership_Group_Base -from app.models.membership_group_person_models import Membership_Group_Person_Base +from app.models.membership_person_group_models import Membership_Person_Group_Base from app.models.membership_person_profile_models import Membership_Person_Profile_Base from app.models.membership_type_models import Membership_Type_Base -from app.models.membership_type_person_models import Membership_Type_Person_Base +from app.models.membership_person_type_models import Membership_Person_Type_Base # from app.models.person_models import Person_Base from app.models.product_models import Product_Base # from app.models.user_models import User_Base @@ -54,14 +54,14 @@ class Membership_Person_Base(BaseModel): # ) # NOTE: Currently there is not going to be a designated primary group. 2021-12-16 - # membership_group_person_id_random: Optional[str] = Field( + # membership_person_group_id_random: Optional[str] = Field( # # alias = 'group_person_id_random', # ) # NOTE: This is not optional - # membership_group_person_id: Optional[int] = Field( + # membership_person_group_id: Optional[int] = Field( # # alias = 'group_person_id', # ) # NOTE: This is not optional - # membership_group_person_name: Optional[str] = Field( + # membership_person_group_name: Optional[str] = Field( # alias = 'membership_group_name', # group_person_name # ) @@ -78,14 +78,14 @@ class Membership_Person_Base(BaseModel): alias = 'type_name', ) - membership_type_person_id_random: Optional[str] = Field( + membership_person_type_id_random: Optional[str] = Field( # alias = 'type_person_id_random', ) # NOTE: This is not optional - membership_type_person_id: Optional[int] = Field( + membership_person_type_id: Optional[int] = Field( # alias = 'type_person_id', ) # NOTE: This is not optional - membership_type_person_name: Optional[str] = Field( + membership_person_type_name: Optional[str] = Field( alias = 'membership_type_name', # type_person_name ) @@ -96,8 +96,8 @@ class Membership_Person_Base(BaseModel): person_id: Optional[int] # For products use: - # link using membership_person.membership_group_person_id to membership_group_person.id - # link using membership_person.membership_type_person_id to membership_type_person.id + # link using membership_person.membership_person_group_id to membership_person_group.id + # link using membership_person.membership_person_type_id to membership_person_type.id # product_id_random: Optional[str] # product_id: Optional[int] # The product they purchased to get this membership @@ -140,8 +140,8 @@ class Membership_Person_Base(BaseModel): membership_group_list: Optional[list] = Field( # alias = 'group_list', ) # 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_list: Optional[list] = Field( + # membership_person_group: Optional[Membership_Person_Group_Base] # The group person information for the primary membership group they currently have + membership_person_group_list: Optional[list] = Field( # alias = 'group_person_list', ) # Membership_Group_Base() The group person information for all the membership groups they are a part of @@ -156,13 +156,13 @@ class Membership_Person_Base(BaseModel): membership_type_list: Optional[list] = Field( # alias = 'type_list', ) # 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_list: Optional[list] = Field( + membership_person_type: Optional[Membership_Person_Type_Base] # The type person information for the primary membership type they currently have + # membership_person_type_list: Optional[list] = Field( # alias = 'type_person_list', - # ) # 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 + # ) # Membership_Person_Type_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 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 extended_member_profile: Optional[dict] = {} @@ -204,13 +204,13 @@ class Membership_Person_Base(BaseModel): # 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): + # @validator('membership_person_group_id', always=True) + # def membership_person_group_id_lookup(cls, v, values, **kwargs): # 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') + # if values['membership_person_group_id_random']: + # return redis_lookup_id_random(record_id_random=values['membership_person_group_id_random'], table_name='membership_person_group') # return None @validator('membership_type_id', always=True) @@ -222,13 +222,13 @@ class Membership_Person_Base(BaseModel): 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): + @validator('membership_person_type_id', always=True) + def membership_person_type_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) log.debug(locals()) - if values['membership_type_person_id_random']: - return redis_lookup_id_random(record_id_random=values['membership_type_person_id_random'], table_name='membership_type_person') + if values['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 @validator('person_id', always=True) diff --git a/app/models/membership_person_profile_models.py b/app/models/membership_person_profile_models.py index c93e072..5c821fd 100644 --- a/app/models/membership_person_profile_models.py +++ b/app/models/membership_person_profile_models.py @@ -9,7 +9,7 @@ from app.lib_general import log, logging from app.models.common_field_schema import base_fields, default_num_bytes from app.models.contact_models import Contact_Base -from app.models.membership_cfg_models import Membership_Cfg_Base +# from app.models.membership_cfg_models import Membership_Cfg_Base from app.models.organization_models import Organization_Base @@ -75,9 +75,9 @@ class Membership_Person_Profile_Base(BaseModel): # Including other related objects contact: Optional[Contact_Base] - membership_cfg: Optional[Membership_Cfg_Base] = Field( - alias = 'cfg', - ) + # membership_cfg: Optional[Membership_Cfg_Base] = Field( + # alias = 'cfg', + # ) organization: Optional[Organization_Base] _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) diff --git a/app/models/membership_type_person_models.py b/app/models/membership_person_type_models.py similarity index 86% rename from app/models/membership_type_person_models.py rename to app/models/membership_person_type_models.py index 277e612..1936322 100644 --- a/app/models/membership_type_person_models.py +++ b/app/models/membership_person_type_models.py @@ -8,22 +8,22 @@ from app.db_sql import redis_lookup_id_random from app.lib_general import log, logging from app.models.common_field_schema import base_fields, default_num_bytes -from app.models.membership_cfg_models import Membership_Cfg_Base +# from app.models.membership_cfg_models import Membership_Cfg_Base from app.models.membership_type_models import Membership_Type_Base from app.models.product_models import Product_Base -class Membership_Type_Person_Base(BaseModel): +class Membership_Person_Type_Base(BaseModel): log.setLevel(logging.WARNING) log.debug(locals()) id_random: Optional[str] = Field( - **base_fields['membership_type_person_id_random'], - alias = 'membership_type_person_id_random', + **base_fields['membership_person_type_id_random'], + alias = 'membership_person_type_id_random', default_factory = lambda:secrets.token_urlsafe(default_num_bytes), ) id: Optional[int] = Field( - alias = 'membership_type_person_id' + alias = 'membership_person_type_id' ) account_id_random: Optional[str] @@ -72,16 +72,16 @@ class Membership_Type_Person_Base(BaseModel): updated_on: Optional[datetime.datetime] = None # Including other related objects - membership_cfg: Optional[Membership_Cfg_Base] = Field( - alias = 'cfg', - ) + # membership_cfg: Optional[Membership_Cfg_Base] = Field( + # alias = 'cfg', + # ) membership_type: Optional[Membership_Type_Base] # The membership option they currently have product: Optional[Product_Base] # The product used to become a member? _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) - #@validator('membership_type_person_id_random', always=True) - def membership_type_person_id_random_copy(cls, v, values, **kwargs): + #@validator('membership_person_type_id_random', always=True) + def membership_person_type_id_random_copy(cls, v, values, **kwargs): log.setLevel(logging.WARNING) log.debug(locals()) @@ -90,12 +90,12 @@ class Membership_Type_Person_Base(BaseModel): return None @validator('id', always=True) - def membership_type_person_id_lookup(cls, v, values, **kwargs): + def membership_person_type_id_lookup(cls, v, values, **kwargs): log.setLevel(logging.WARNING) log.debug(locals()) if values['id_random']: - return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_type_person') + return redis_lookup_id_random(record_id_random=values['id_random'], table_name='membership_person_type') return None @validator('account_id', always=True) diff --git a/app/models/membership_type_models.py b/app/models/membership_type_models.py index 79e98ae..d84a8c5 100644 --- a/app/models/membership_type_models.py +++ b/app/models/membership_type_models.py @@ -72,7 +72,7 @@ class Membership_Type_Base(BaseModel): # Including other related objects cfg: Optional[Membership_Cfg_Base] - membership_type_person_list: Optional[list] # Membership_Type_Person_Base() List of people for membership type + membership_person_type_list: Optional[list] # Membership_Person_Type_Base() List of people for membership type product_list: Optional[list] # Product_Base() List of products (for_type and for_id) that get this membership option _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now) diff --git a/app/models/person_models.py b/app/models/person_models.py index fc99c6b..756f834 100644 --- a/app/models/person_models.py +++ b/app/models/person_models.py @@ -122,9 +122,9 @@ class Person_Base(BaseModel): contact: Optional[Union[Contact_Base, None]] membership_person: Optional[Membership_Person_Base] # Priority l2 member person record of the person membership_type_list: Optional[list] # Membership_Type_Base() list of member types the person has... for now this should be only one at most. - membership_type_person_list: Optional[list] # Membership_Type_Person_Base() list of member type person records... for now this should be only one at most. + membership_person_type_list: Optional[list] # Membership_Person_Type_Base() list of member type person records... for now this should be only one at most. membership_group_list: Optional[list] # Membership_Group_Base() list of member groups the person has - membership_group_person_list: Optional[list] # Membership_Group_Person_Base() list of member group person records + membership_person_group_list: Optional[list] # Membership_Person_Group_Base() list of member group person records orders_info: Optional[dict] # closed_count, etc order_list: Optional[list] # Order_Base() # Priority l2 order_cart: Optional[dict] # Order_Cart_Base() # Priority l2 diff --git a/app/routers/api_crud.py b/app/routers/api_crud.py index 7a1789b..768e083 100644 --- a/app/routers/api_crud.py +++ b/app/routers/api_crud.py @@ -38,11 +38,11 @@ from app.models.journal_entry_models import * from app.models.log_client_viewing_models import Log_Client_Viewing_Base from app.models.membership_cfg_models import * from app.models.membership_group_models import * -from app.models.membership_group_person_models import * +from app.models.membership_person_group_models import * from app.models.membership_person_models import * from app.models.membership_person_profile_models import * from app.models.membership_type_models import * -from app.models.membership_type_person_models import * +from app.models.membership_person_type_models import * from app.models.order_models import * from app.models.order_cart_models import * from app.models.organization_models import * @@ -97,11 +97,11 @@ obj_type_li['journal_entry'] = {'table_name': 'v_journal_entry', 'base_name': Jo obj_type_li['log_client_viewing'] = {'table_name': 'log_client_viewing', 'base_name': Log_Client_Viewing_Base} obj_type_li['membership_cfg'] = {'table_name': 'v_membership_cfg', 'base_name': Membership_Cfg_Base} obj_type_li['membership_group'] = {'table_name': 'v_membership_group', 'base_name': Membership_Group_Base} -obj_type_li['membership_group_person'] = {'table_name': 'v_membership_group_person', 'base_name': Membership_Group_Person_Base} +obj_type_li['membership_person_group'] = {'table_name': 'v_membership_person_group', 'base_name': Membership_Person_Group_Base} obj_type_li['membership_person'] = {'table_name': 'v_membership_person', 'base_name': Membership_Person_Base} obj_type_li['membership_person_profile'] = {'table_name': 'v_membership_person_profile', 'base_name': Membership_Person_Profile_Base} obj_type_li['membership_type'] = {'table_name': 'v_membership_type', 'base_name': Membership_Type_Base} -obj_type_li['membership_type_person'] = {'table_name': 'v_membership_type_person', 'base_name': Membership_Type_Person_Base} +obj_type_li['membership_person_type'] = {'table_name': 'v_membership_person_type', 'base_name': Membership_Person_Type_Base} #obj_type_li['message'] = {'table_name': 'message', 'base_name': Message_Base} #'v_message' obj_type_li['order'] = {'table_name': 'v_order', 'base_name': Order_Base} obj_type_li['order_cart'] = {'table_name': 'v_order_cart', 'base_name': Order_Cart_Base} diff --git a/app/routers/importing.py b/app/routers/importing.py index 8069c2e..14ddef6 100644 --- a/app/routers/importing.py +++ b/app/routers/importing.py @@ -25,56 +25,48 @@ router = APIRouter() ext_id_update_list = [ - 'ZE21VR86~Wolfe.aaron@gmail.com', - 'VG79LN79~pbrewer5326@gmail.com', - 'YE78WS38~docsaper@gmail.com', - 'BF91DK17~roseanne.andrews@pinerest.org', - 'EJ55WS41~tonyfalk@gmail.com', - 'SH19PV12~Karameyers92@gmail.com', - 'XG50WH30~skyost@gmail.com', - 'UK95WU97~jkerbles@gmail.com', - 'OM54NG97~bestavillo@msn.com', - 'BU28AA70~christylroberts@gmail.com', - 'JA47IN89~Accorbett@gmail.com', - 'MC52QH32~ferfe1966@gmail.com', - 'SB67KT77~Shavonsm22@gmail.com', - 'WB82SX13~donleo8455@gmail.com', - 'NQ12DP52~Jenny.glendrange@bvgsunglasses.com', - 'LD32UM92~Brendankduffy@gmail.com', - 'AH11RW36~drpleitz@gmail.com', - 'AL28VU80~Simons.olga@gmail.com', - 'NF15AW72~Kotchmd@me.com', - 'AC59CK71~michaelalvarezdds@gmail.com', - 'BL92EK73~sadpea2@GMAIL.COM', - 'GY65GW13~Geoffreydpm@gmail.com', - 'QQ93LI30~sarahrubin3733@gmail.com', - 'VP13AJ80~meredith.ann.vieira@gmail.com', - 'VB35RE20~leahod@gmail.com', - 'OB99TO12~Tim_kavanaugh@yahoo.com', - 'RR66CD90~m.capoc@gmail.com', - 'BL10TA67~docjeffrey@aol.com', - 'CB53IF82~wscurtice@gmail.com', - 'WE42VE66~ray.glendrange@bvgsunglasses.com', - 'TL33WC87~jpperlman@perlmancenter.com', - 'UO29CZ53~Kdcmdog@me.com', - 'CW83DK42~Colleenlenorebarnes@gmail.com', - 'AZ83NT69~walk1936@bellsouth.net', - 'HH85VO87~Bannon.9@gmail.com', - 'FQ91EE42~timothyjmiett@gmail.com', - 'XJ84QV29~wrightideas@comcast.net', - 'HU15CG82~Pedagoga77@gmail.com', - 'VE19IM26~agathaambrozy@gmail.com', - 'BH24NM18~kmartin@martindentistry.net', - 'DG72CH97~Activelifeortho2@gmail.com', - 'WH29FY81~Louisearle@gmail.com', - 'XD53QP68~Cwashi19@gmail.com', - 'ND69HA28~mmersereau@cvent.com', - 'YS47DQ81~steve@rutlen.net', - 'CY53NG16~bbowersmed@gmail.com', - 'CU79PO93~joewalkden@outlook.com', - 'NE44OA53~markdrabinski@comcast.net', - 'MU26HY85~ajl3212@gmail.com', - 'NS22YW81~vmartinez956@gmail.com', + 'MO69EB82~kstephan64@gmail.com', + 'ON67FX34~k8maguire@gmail.com', + 'MT62VR50~sdyanofsky@aol.com', + 'TF39YD57~clcochran92@gmail.com', + 'UY21HA29~drpsuski@gmail.com', + 'TB98GM51~amandalh89@gmail.com', + 'YY36MS82~paul@hopebiomed.us', + 'QJ96XK21~abjackson1103@gmail.com', + 'YE37SQ11~youellette@charter.net', + 'MI18UY96~Cynthia.allyse@gmail.com', + 'HI16RE87~Jamwen@comcast.net', + 'XF70ZW11~oversteerdriver@gmail.com', + 'BF75WK45~will@southtampapsychiatry.com', + 'PR72VQ78~enge0368@gmail.com', + 'JL24HM67~Fpmedicalconsulting@gmail.com', + 'TH94DZ12~gomezjonathandaniel@gmail.com', + 'BF33UZ69~tdrake38@icloud.com', + 'ET63JU61~Drjessicabokelman@gmail.com', + 'YN81XM59~Mrsbeason01@gmail.com', + 'JQ73UM57~anthonyjgrandelis@gmail.com', + 'HR75SP80~pnorris@med.miami.edu', + 'SN97HZ72~ajmiglic@gmail.com', + 'RA21CS48~Jacob.goldenberg22393@gmail.com', + 'NO28OF94~Kathymrs65@gmail.com', + 'IE25KZ46~stremickshannon@gmail.com', + 'XK22WI84~skmcardinal11@gmail.com', + 'ZO75WD68~mail@zensis.org', + 'DE73VS79~doccarlos123@gmail.com', + 'HT32CM64~marchese_31@yahoo.com', + 'WM97PX89~jeff@jeff-hirsch.com', + 'NJ32FW76~Louisearle@gmail.com', + 'XU23HP89~louissolis@hotmail.com', + 'TN90TO83~Ryan.d.odonnell@gmail.com', + 'YW91KD57~Wijekoon@gmail.com', + 'NR52NF96~Drjanehart@gmail.com', + 'XE18DK68~mackenzie.tray@gmail.com', + 'LD88CR61~cwsurgeon69@gmail.com', + 'HN93VC10~lepricano1@gmail.com', + 'PX67ST57~poojanparikh@outlook.com', + 'IP16BM33~fgoldberg@nlh.org', + 'DF87TA51~Nicolelfrost@gmail.com', + 'HY24IL79~tnelsonmd@yahoo.com', ] @@ -324,12 +316,12 @@ async def ins_up_person_contact_address_user_data( continue # This block should generally not be needed -Scott 2021-12-17 - # if external_id in ext_id_update_list: - # log.info('In list') - # pass - # else: - # # log.info('Not in list') - # continue + if external_id in ext_id_update_list: + log.info('In list') + pass + else: + # log.info('Not in list') + continue if source_id := record.get('source_id', None): pass else: @@ -872,7 +864,7 @@ async def ins_up_membership_person_data( user_id = None # person_profile_id = None membership_person_id = None - membership_type_person_id = None + membership_person_type_id = None person_data = {} person_data['account_id'] = account_id @@ -883,12 +875,12 @@ async def ins_up_membership_person_data( continue # This block should generally not be needed -Scott 2021-12-17 - # if external_id in ext_id_update_list: - # log.info('In list') - # pass - # else: - # # log.info('Not in list') - # continue + if external_id in ext_id_update_list: + log.info('In list') + pass + else: + # log.info('Not in list') + continue if source_id := record.get('source_id', None): pass else: @@ -942,59 +934,59 @@ async def ins_up_membership_person_data( continue membership_person_data = {} - membership_type_person_data = {} + membership_person_type_data = {} # datetime.datetime.strptime(date_time_str, '%m/%d/%Y') membership_person_data['first_approved_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') - # membership_type_person_data['first_approved_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') + # membership_person_type_data['first_approved_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') membership_person_data['first_start_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') - membership_type_person_data['first_start_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') + membership_person_type_data['first_start_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') if membership_type_last_renewal_date := record.get('membership_type_last_renewal_date', None): membership_person_data['start_on'] = datetime.datetime.strptime(membership_type_last_renewal_date, '%m/%d/%Y') - membership_type_person_data['start_on'] = datetime.datetime.strptime(membership_type_last_renewal_date, '%m/%d/%Y') + membership_person_type_data['start_on'] = datetime.datetime.strptime(membership_type_last_renewal_date, '%m/%d/%Y') else: membership_person_data['start_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') - membership_type_person_data['start_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') + membership_person_type_data['start_on'] = datetime.datetime.strptime(record.get('membership_type_join_date', None), '%m/%d/%Y') membership_person_data['end_on'] = datetime.datetime.strptime(record.get('membership_type_expiration_date', None), '%m/%d/%Y') - membership_type_person_data['end_on'] = datetime.datetime.strptime(record.get('membership_type_expiration_date', None), '%m/%d/%Y') + membership_person_type_data['end_on'] = datetime.datetime.strptime(record.get('membership_type_expiration_date', None), '%m/%d/%Y') membership_person_data['last_end_on'] = datetime.datetime.strptime(record.get('membership_type_expiration_date', None), '%m/%d/%Y') - membership_type_person_data['last_end_on'] = datetime.datetime.strptime(record.get('membership_type_expiration_date', None), '%m/%d/%Y') + membership_person_type_data['last_end_on'] = datetime.datetime.strptime(record.get('membership_type_expiration_date', None), '%m/%d/%Y') current_datetime = datetime.datetime.now() if membership_person_data['end_on'] >= current_datetime: membership_person_data['lu_membership_person_status_id'] = 5 # 5 = active; expiration is > now - membership_type_person_data['lu_membership_type_status_id'] = 5 # 5 = active; expiration is > now + membership_person_type_data['lu_membership_type_status_id'] = 5 # 5 = active; expiration is > now else: membership_person_data['lu_membership_person_status_id'] = 7 # 7 = inactive; expiration is < now - membership_type_person_data['lu_membership_type_status_id'] = 7 # 7 = inactive; expiration is > now + membership_person_type_data['lu_membership_type_status_id'] = 7 # 7 = inactive; expiration is > now - # membership_type_person_data['membership_person_id'] = membership_person_id + # membership_person_type_data['membership_person_id'] = membership_person_id if membership_type_name == 'Al-Anon Member' or membership_type_name == 'Al-Anon Members': - membership_type_person_data['membership_type_id'] = 6 - membership_type_person_data['product_id'] = 13 + membership_person_type_data['membership_type_id'] = 6 + membership_person_type_data['product_id'] = 13 membership_person_data['level'] = 1 - membership_type_person_data['level'] = 1 + membership_person_type_data['level'] = 1 elif membership_type_name == 'Annual Contribution' or membership_type_name == 'Annual Contributions': # Unsure... making affiliate - membership_type_person_data['membership_type_id'] = 8 - membership_type_person_data['product_id'] = 13 + membership_person_type_data['membership_type_id'] = 8 + membership_person_type_data['product_id'] = 13 membership_person_data['level'] = 3 - membership_type_person_data['level'] = 3 + membership_person_type_data['level'] = 3 elif membership_type_name == 'Doctoral Qualifying Member' or membership_type_name == 'Doctoral Qualifying Members': - membership_type_person_data['membership_type_id'] = 5 - membership_type_person_data['product_id'] = 4 + membership_person_type_data['membership_type_id'] = 5 + membership_person_type_data['product_id'] = 4 membership_person_data['level'] = 1 - membership_type_person_data['level'] = 1 + membership_person_type_data['level'] = 1 elif membership_type_name == 'Student Member' or membership_type_name == 'Student Members': - membership_type_person_data['membership_type_id'] = 7 - membership_type_person_data['product_id'] = 14 + membership_person_type_data['membership_type_id'] = 7 + membership_person_type_data['product_id'] = 14 membership_person_data['level'] = 1 - membership_type_person_data['level'] = 1 + membership_person_type_data['level'] = 1 membership_person_data['enable'] = True - membership_type_person_data['enable'] = True + membership_person_type_data['enable'] = True if membership_person_id: # Update the membership records membership_person_data['id'] = membership_person_id @@ -1006,8 +998,8 @@ async def ins_up_membership_person_data( log.warning(membership_person_obj_up_result) # continue # Something unexpected may have happened - # sql_update() # UPDATE membership_type_person - log.info('UPDATE membership_type_person...') + # sql_update() # UPDATE membership_person_type + log.info('UPDATE membership_person_type...') data = {} data['membership_person_id'] = membership_person_id sql = f""" @@ -1020,15 +1012,15 @@ async def ins_up_membership_person_data( # Pull out IDs of existing person record log.debug('Found one record') membership_person_rec = membership_person_rec_result - membership_type_person_id = membership_person_rec.get('membership_type_person_id', None) - log.info(f'Found membership_type_person_id: {membership_type_person_id}') + membership_person_type_id = membership_person_rec.get('membership_person_type_id', None) + log.info(f'Found membership_person_type_id: {membership_person_type_id}') else: continue - membership_type_person_data['id'] = membership_type_person_id - if membership_type_person_obj_up_result := sql_update(data=membership_type_person_data, table_name='membership_type_person'): - log.debug(membership_type_person_obj_up_result) + membership_person_type_data['id'] = membership_person_type_id + if membership_person_type_obj_up_result := sql_update(data=membership_person_type_data, table_name='membership_person_type'): + log.debug(membership_person_type_obj_up_result) else: - log.warning(membership_type_person_obj_up_result) + log.warning(membership_person_type_obj_up_result) continue # Something unexpected may have happened else: # Create new membership records membership_person_data['account_id'] = account_id @@ -1045,20 +1037,20 @@ async def ins_up_membership_person_data( log.warning(membership_person_obj_in_result) # continue # Something unexpected may have happened - # sql_insert() # INSERT new membership_type_person link using membership_person_id - log.info('INSERT new membership_type_person link using membership_person_id...') - membership_type_person_data['membership_person_id'] = membership_person_id - if membership_type_person_obj_in_result := sql_insert(data=membership_type_person_data, table_name='membership_type_person'): - log.debug(membership_type_person_obj_in_result) - membership_type_person_id = membership_type_person_obj_in_result # Should be an int - membership_type_person_new = True # Need to UPDATE this record after the membership type person data is processed + # sql_insert() # INSERT new membership_person_type link using membership_person_id + log.info('INSERT new membership_person_type link using membership_person_id...') + membership_person_type_data['membership_person_id'] = membership_person_id + if membership_person_type_obj_in_result := sql_insert(data=membership_person_type_data, table_name='membership_person_type'): + log.debug(membership_person_type_obj_in_result) + membership_person_type_id = membership_person_type_obj_in_result # Should be an int + membership_person_type_new = True # Need to UPDATE this record after the membership type person data is processed else: - log.warning(membership_type_person_obj_in_result) + log.warning(membership_person_type_obj_in_result) # continue # Something unexpected may have happened - membership_person_data['membership_type_person_id'] = membership_type_person_id - # sql_update() # UPDATE membership_person with new membership_type_person_id - log.info('UPDATE membership_person with new membership_type_person_id...') + membership_person_data['membership_person_type_id'] = membership_person_type_id + # sql_update() # UPDATE membership_person with new membership_person_type_id + log.info('UPDATE membership_person with new membership_person_type_id...') membership_person_data['id'] = membership_person_id if membership_person_obj_up_result := sql_update(data=membership_person_data, table_name='membership_person'): log.debug(membership_person_obj_up_result) @@ -1069,7 +1061,7 @@ async def ins_up_membership_person_data( person_data_min = {} person_data_min['person_id'] = person_id person_data_min['membership_person_id'] = membership_person_id - person_data_min['membership_type_person_id'] = membership_type_person_id + person_data_min['membership_person_type_id'] = membership_person_type_id person_data_min['membership_type_name'] = membership_type_name person_data_li.append(person_data_min) log.debug(f"Record processed: {person_id} {record['email']} External ID: {external_id}") diff --git a/app/routers/membership_group.py b/app/routers/membership_group.py index 72c1ae1..7879f7d 100644 --- a/app/routers/membership_group.py +++ b/app/routers/membership_group.py @@ -105,7 +105,7 @@ async def get_account_membership_group_obj_li( inc_address: bool = False, inc_contact: bool = False, inc_membership_cfg: bool = False, - inc_membership_group_person_list: bool = False, + inc_membership_person_group_list: bool = False, inc_organization: bool = False, inc_person: bool = False, inc_product_list: bool = False, @@ -138,7 +138,7 @@ async def get_account_membership_group_obj_li( inc_address = inc_address, inc_contact = inc_contact, inc_membership_cfg = inc_membership_cfg, - inc_membership_group_person_list = inc_membership_group_person_list, + inc_membership_person_group_list = inc_membership_person_group_list, inc_organization = inc_organization, inc_person = inc_person, inc_product_list = inc_product_list, @@ -258,7 +258,7 @@ async def get_membership_group_obj( inc_contact: bool = False, # Per member inc_membership_cfg: bool = False, inc_membership_group_list: bool = False, # List of groups per member - inc_membership_group_person_list: bool = False, # List of members belonging to this group + inc_membership_person_group_list: bool = False, # List of members belonging to this group inc_membership_person_profile: bool = False, # Per member inc_organization: bool = False, # Per member inc_person: bool = False, # Per member @@ -288,7 +288,7 @@ async def get_membership_group_obj( inc_contact = inc_contact, inc_membership_cfg = inc_membership_cfg, # inc_membership_group_list = inc_membership_group_list, - inc_membership_group_person_list = inc_membership_group_person_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, diff --git a/app/routers/membership_person.py b/app/routers/membership_person.py index 16f67a1..47cf9db 100644 --- a/app/routers/membership_person.py +++ b/app/routers/membership_person.py @@ -41,7 +41,7 @@ router = APIRouter() # ### BEGIN ### API Membership Person ### post_membership_person_obj() ### # Using create_membership_person_obj() -# Updated 2022-01-04 +# Updated 2022-01-11 @router.post('/membership/person', response_model=Resp_Body_Base) async def post_membership_person_obj( membership_person_obj: Membership_Person_Base, @@ -94,6 +94,7 @@ async def post_membership_person_obj( data['membership_person_id'] = membership_person_id data['membership_person_id_random'] = membership_person_id_random return mk_resp(data=data, response=commons.response) +# ### END ### API Membership Person ### post_membership_person_obj() ### # if isinstance(create_membership_person_obj_result, int): @@ -146,7 +147,7 @@ async def post_membership_person_obj( # ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ### # Using update_membership_person_obj() -# Updated 2022-01-04 +# Updated 2022-01-11 @router.patch('/membership/person/{membership_person_id}', response_model=Resp_Body_Base) async def patch_membership_person_obj_update( membership_person_obj: Membership_Person_Base, @@ -196,10 +197,11 @@ async def patch_membership_person_obj_update( data['membership_person_id'] = membership_person_id data['membership_person_id_random'] = membership_person_id_random return mk_resp(data=data, response=commons.response, status_message='The membership person was updated.') +# ### END ### API Membership Person ### patch_membership_person_obj_update() ### + # ### BEGIN ### API Membership Person ### patch_membership_person_obj_update() ### - # @router.get('/membership/person/list', response_model=Resp_Body_Base) # async def get_membership_person_obj_li( # for_obj_type: Optional[str] = Query(None, min_length=2, max_length=50), @@ -222,7 +224,7 @@ async def patch_membership_person_obj_update( # ### BEGIN ### API Membership Person ### get_account_obj_membership_person_list() ### -# Working well as of 2021-06-24. Using as a template for other routes. +# Updated 2022-01-11 @router.get('/account/{account_id}/membership/person/list', response_model=Resp_Body_Base) async def get_account_obj_membership_person_list( account_id: str = Query(..., min_length=1, max_length=22), @@ -276,7 +278,7 @@ async def get_account_obj_membership_person_list( # inc_contact = inc_contact, inc_membership_cfg = inc_membership_cfg, inc_membership_group_list = inc_membership_group_list, - # inc_membership_group_person_list = inc_membership_group_person_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, @@ -300,7 +302,7 @@ async def get_account_obj_membership_person_list( # ### BEGIN ### API Membership Person ### get_person_obj_membership_person() ### -# Updated 2022-01-10 +# Updated 2022-01-11 @router.get('/person/{person_id}/membership/person', response_model=Resp_Body_Base) async def get_person_obj_membership_person( person_id: str = Query(..., min_length=11, max_length=22), @@ -309,12 +311,12 @@ async def get_person_obj_membership_person( 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_group_person_list: bool = False, + # 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_type_list: bool = False, # The list of all membership types a person is a part of - # inc_membership_type_person: bool = False, + # inc_membership_person_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 @@ -359,6 +361,7 @@ async def get_person_obj_membership_person( # Look up is only for account, person, or user records +# Deprecated 2022-01-11 @router.get('/membership/person/lookup', response_model=Resp_Body_Base) async def lookup_membership_person_obj( for_obj_id: Union[int,str], @@ -442,7 +445,7 @@ async def lookup_membership_person_obj( # ### BEGIN ### API Membership Person ### get_membership_person_obj() ### -# Updated 2022-01-10 +# Updated 2022-01-11 @router.get('/membership/person/{membership_person_id}', response_model=Resp_Body_Base) async def get_membership_person_obj( membership_person_id: str = Query(..., min_length=11, max_length=22), @@ -456,7 +459,7 @@ async def get_membership_person_obj( 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_type_list: bool = False, # The list of all membership types a person is a part of - # inc_membership_type_person: bool = False, + # inc_membership_person_type: bool = False, # inc_order: bool = False, # inc_organization: bool = False, # inc_person: bool = False, @@ -487,8 +490,8 @@ async def get_membership_person_obj( 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_type_person = inc_membership_type_person, - # inc_membership_type_person_list = inc_membership_type_list, + # inc_membership_person_type = inc_membership_person_type, + # inc_membership_person_type_list = inc_membership_type_list, # inc_order = inc_order, # inc_organization = inc_organization, # inc_person = inc_person, diff --git a/app/routers/membership_group_person.py b/app/routers/membership_person_group.py similarity index 74% rename from app/routers/membership_group_person.py rename to app/routers/membership_person_group.py index f37c28a..db7f1bd 100644 --- a/app/routers/membership_group_person.py +++ b/app/routers/membership_person_group.py @@ -9,9 +9,9 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template -from app.methods.membership_group_person_methods import get_membership_group_person_rec_list, load_membership_group_person_obj +from app.methods.membership_person_group_methods import get_membership_person_group_rec_list, load_membership_person_group_obj -from app.models.membership_group_person_models import Membership_Group_Person_Base +from app.models.membership_person_group_models import Membership_Person_Group_Base from app.models.response_models import Resp_Body_Base, mk_resp @@ -19,8 +19,8 @@ router = APIRouter() @router.post('/membership/group/person', response_model=Resp_Body_Base) -async def post_membership_group_person_obj( - obj: Membership_Group_Person_Base, +async def post_membership_person_group_obj( + obj: Membership_Person_Group_Base, x_account_id: str = Header(...), return_obj: Optional[bool] = True, by_alias: Optional[bool] = True, @@ -30,7 +30,7 @@ async def post_membership_group_person_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - obj_type = 'membership_group_person' + obj_type = 'membership_person_group' obj_data_dict = obj.dict(by_alias=False, exclude_unset=True) result = post_obj_template( obj_type=obj_type, @@ -43,9 +43,9 @@ async def post_membership_group_person_obj( @router.patch('/membership/group/person/{obj_id}', response_model=Resp_Body_Base) -async def patch_membership_group_person_obj( +async def patch_membership_person_group_obj( obj_id: str = Query(..., min_length=1, max_length=22), - obj: Membership_Group_Person_Base = None, + obj: Membership_Person_Group_Base = None, #x_account_id: Optional[str] = Header(..., ), return_obj: Optional[bool] = True, by_alias: Optional[bool] = True, @@ -55,7 +55,7 @@ async def patch_membership_group_person_obj( log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - obj_type = 'membership_group_person' + obj_type = 'membership_person_group' obj_data_dict = obj.dict(by_alias=False, exclude_unset=True) obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type) obj_data_dict['id_random'] = obj_id @@ -70,11 +70,11 @@ async def patch_membership_group_person_obj( return result -# ### BEGIN ### API Membership Type Person ### get_membership_group_person_obj() ### +# ### BEGIN ### API Membership Type Person ### get_membership_person_group_obj() ### # Updated 2021-07-27 -@router.get('/membership/group/person/{membership_group_person_id}', response_model=Resp_Body_Base) -async def get_membership_group_person_obj( - membership_group_person_id: str = Query(..., min_length=1, max_length=22), +@router.get('/membership/group/person/{membership_person_group_id}', response_model=Resp_Body_Base) +async def get_membership_person_group_obj( + membership_person_group_id: str = Query(..., min_length=1, max_length=22), enabled: str = 'enabled', # For now this covers any included objects or object lists limit: int = 500, # For now this covers any included objects or object lists inc_product: bool = False, # Per member or group member belongs to @@ -86,11 +86,11 @@ async def get_membership_group_person_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if membership_group_person_id := redis_lookup_id_random(record_id_random=membership_group_person_id, table_name='membership_group_person'): pass + if membership_person_group_id := redis_lookup_id_random(record_id_random=membership_person_group_id, table_name='membership_person_group'): pass else: return mk_resp(data=None, status_code=404) - if membership_group_person_result := load_membership_group_person_obj( - membership_group_person_id = membership_group_person_id, + if membership_person_group_result := load_membership_person_group_obj( + membership_person_group_id = membership_person_group_id, limit = limit, by_alias = by_alias, exclude_unset = exclude_unset, @@ -98,16 +98,16 @@ async def get_membership_group_person_obj( enabled = enabled, inc_product = inc_product, ): - response_data = membership_group_person_result + response_data = membership_person_group_result else: return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=response_data) -# ### END ### API Membership Type Person ### get_membership_group_person_obj() ### +# ### END ### API Membership Type Person ### get_membership_person_group_obj() ### @router.delete('/membership/group/person/{obj_id}', response_model=Resp_Body_Base) -async def delete_membership_group_person_obj( +async def delete_membership_person_group_obj( obj_id: str = Query(..., min_length=1, max_length=22), x_account_id: str = Header(...), response: Response = Response, @@ -115,7 +115,7 @@ async def delete_membership_group_person_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - obj_type = 'membership_group_person' + obj_type = 'membership_person_group' result = delete_obj_template( obj_type=obj_type, obj_id=obj_id, diff --git a/app/routers/membership_type_person.py b/app/routers/membership_person_type.py similarity index 75% rename from app/routers/membership_type_person.py rename to app/routers/membership_person_type.py index 8039b3d..ad43761 100644 --- a/app/routers/membership_type_person.py +++ b/app/routers/membership_person_type.py @@ -9,9 +9,9 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template -from app.methods.membership_type_person_methods import get_membership_type_person_rec_list, load_membership_type_person_obj +from app.methods.membership_person_type_methods import get_membership_person_type_rec_list, load_membership_person_type_obj -from app.models.membership_type_person_models import Membership_Type_Person_Base +from app.models.membership_person_type_models import Membership_Person_Type_Base from app.models.response_models import Resp_Body_Base, mk_resp @@ -19,8 +19,8 @@ router = APIRouter() @router.post('/membership/type/person', response_model=Resp_Body_Base) -async def post_membership_type_person_obj( - obj: Membership_Type_Person_Base, +async def post_membership_person_type_obj( + obj: Membership_Person_Type_Base, x_account_id: str = Header(...), return_obj: Optional[bool] = True, by_alias: Optional[bool] = True, @@ -30,7 +30,7 @@ async def post_membership_type_person_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - obj_type = 'membership_type_person' + obj_type = 'membership_person_type' obj_data_dict = obj.dict(by_alias=False, exclude_unset=True) result = post_obj_template( obj_type=obj_type, @@ -43,9 +43,9 @@ async def post_membership_type_person_obj( @router.patch('/membership/type/person/{obj_id}', response_model=Resp_Body_Base) -async def patch_membership_type_person_obj( +async def patch_membership_person_type_obj( obj_id: str = Query(..., min_length=1, max_length=22), - obj: Membership_Type_Person_Base = None, + obj: Membership_Person_Type_Base = None, #x_account_id: Optional[str] = Header(..., ), return_obj: Optional[bool] = True, by_alias: Optional[bool] = True, @@ -55,7 +55,7 @@ async def patch_membership_type_person_obj( log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - obj_type = 'membership_type_person' + obj_type = 'membership_person_type' obj_data_dict = obj.dict(by_alias=False, exclude_unset=True) obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type) obj_data_dict['id_random'] = obj_id @@ -70,11 +70,11 @@ async def patch_membership_type_person_obj( return result -# ### BEGIN ### API Membership Type Person ### get_membership_type_person_obj() ### +# ### BEGIN ### API Membership Type Person ### get_membership_person_type_obj() ### # Updated 2021-07-27 -@router.get('/membership/type/person/{membership_type_person_id}', response_model=Resp_Body_Base) -async def get_membership_type_person_obj( - membership_type_person_id: str = Query(..., min_length=1, max_length=22), +@router.get('/membership/type/person/{membership_person_type_id}', response_model=Resp_Body_Base) +async def get_membership_person_type_obj( + membership_person_type_id: str = Query(..., min_length=1, max_length=22), enabled: str = 'enabled', # For now this covers any included objects or object lists limit: int = 500, # For now this covers any included objects or object lists inc_product: bool = False, # Per member or group member belongs to @@ -86,11 +86,11 @@ async def get_membership_type_person_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - if membership_type_person_id := redis_lookup_id_random(record_id_random=membership_type_person_id, table_name='membership_type_person'): pass + if membership_person_type_id := redis_lookup_id_random(record_id_random=membership_person_type_id, table_name='membership_person_type'): pass else: return mk_resp(data=None, status_code=404) - if membership_type_person_result := load_membership_type_person_obj( - membership_type_person_id = membership_type_person_id, + if membership_person_type_result := load_membership_person_type_obj( + membership_person_type_id = membership_person_type_id, limit = limit, by_alias = by_alias, exclude_unset = exclude_unset, @@ -98,16 +98,16 @@ async def get_membership_type_person_obj( enabled = enabled, inc_product = inc_product, ): - response_data = membership_type_person_result + response_data = membership_person_type_result else: return mk_resp(data=False, status_code=400, response=response) # Bad Request return mk_resp(data=response_data) -# ### END ### API Membership Type Person ### get_membership_type_person_obj() ### +# ### END ### API Membership Type Person ### get_membership_person_type_obj() ### @router.delete('/membership/type/person/{obj_id}', response_model=Resp_Body_Base) -async def delete_membership_type_person_obj( +async def delete_membership_person_type_obj( obj_id: str = Query(..., min_length=1, max_length=22), x_account_id: str = Header(...), response: Response = Response, @@ -115,7 +115,7 @@ async def delete_membership_type_person_obj( log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL log.debug(locals()) - obj_type = 'membership_type_person' + obj_type = 'membership_person_type' result = delete_obj_template( obj_type=obj_type, obj_id=obj_id, diff --git a/app/routers/person.py b/app/routers/person.py index a32b5df..b78c42d 100644 --- a/app/routers/person.py +++ b/app/routers/person.py @@ -519,15 +519,15 @@ async def get_person_obj( inc_journal_list: bool = False, # Priority l2 # inc_journal_entry_list: bool = False, # Priority l3 # inc_membership_group: bool = False, # The primary membership group - # inc_membership_group_person: bool = False, + # inc_membership_person_group: bool = False, inc_membership_group_list: bool = False, # The list of all membership groups a person is a part of - inc_membership_group_person_list: bool = False, + inc_membership_person_group_list: bool = False, inc_membership_person: bool = False, # Priority l2 inc_membership_person_profile: bool = False, # Priority l2 inc_membership_type: bool = False, # The primary membership type - inc_membership_type_person: bool = False, + 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_type_person_list: bool = False, + # inc_membership_person_type_list: bool = False, inc_order_closed_count: bool = False, # NEW Priority l1 inc_order_line_list: bool = False, # Priority l1 inc_order_list: bool = False, # Priority l1 @@ -561,11 +561,11 @@ async def get_person_obj( inc_journal_list = inc_journal_list, # inc_journal_entry_list = inc_journal_entry_list, inc_membership_group_list = inc_membership_group_list, - inc_membership_group_person_list = inc_membership_group_person_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_type_person = inc_membership_type_person, + inc_membership_person_type = inc_membership_person_type, inc_order_closed_count = inc_order_closed_count, inc_order_line_list = inc_order_line_list, inc_order_list = inc_order_list, @@ -606,7 +606,7 @@ async def get_account_obj_person_list( inc_contact: bool = False, # inc_membership_group_list: bool = False, # The list of all membership groups a person is a part of inc_membership_person: bool = False, - # inc_membership_type_person: bool = False, + # inc_membership_person_type: bool = False, # inc_order: bool = False, # inc_organization: bool = False, inc_user: bool = False,