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

Code clean up. Membership tables, views, routes, methods, and models renamed.

Browse Source
This commit is contained in:
Scott Idem
2022-01-11 14:12:51 -05:00
parent 253ed6c19b
commit 8953fc32d8
24 changed files with 485 additions and 489 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/routers/api_crud.py
View File

@@ -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}

204
app/routers/importing.py
View File

@@ -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}")

8
app/routers/membership_group.py
View File

@@ -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,

27
app/routers/membership_person.py
View File

@@ -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,

38
app/routers/membership_group_person.py → app/routers/membership_person_group.py
View File

@@ -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,

38
app/routers/membership_type_person.py → app/routers/membership_person_type.py
View File

@@ -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,

14
app/routers/person.py
View File

@@ -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,