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

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