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

More updates for Cvent and IDAA custom status field. Only using pending status if it is specificially passed. Otherwise using unknown or whatever is passed.

Browse Source
This commit is contained in:
Scott Idem
2022-03-16 09:25:32 -04:00
parent 6a969e0991
commit 212d69cbe3
2 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/methods/e_cvent_methods.py
View File

@@ -632,20 +632,21 @@ def create_update_aether_person(
membership_person_type_data['last_end_on'] = datetime.datetime.strptime(cvent_contact_obj.get('membership').get('expiration'), '%Y-%m-%d') membership_person_type_data['last_end_on'] = datetime.datetime.strptime(cvent_contact_obj.get('membership').get('expiration'), '%Y-%m-%d')
current_datetime = datetime.datetime.now() current_datetime = datetime.datetime.now()
log.debug(status)
if status == 'unknown': # log.debug(status)
log.debug(current_datetime) # if status == 'unknown':
buffer_datetime = current_datetime - datetime.timedelta(minutes=1440) # 720 min = 12 hours # log.debug(current_datetime)
log.debug(buffer_datetime) # buffer_datetime = current_datetime - datetime.timedelta(minutes=1440) # 720 min = 12 hours
log.debug(membership_person_type_data['first_start_on']) # log.debug(buffer_datetime)
log.info('Status is unknown. Going to try and make a guess...') # log.debug(membership_person_type_data['first_start_on'])
if membership_person_type_data['first_start_on'] < buffer_datetime and membership_person_type_data['end_on'] >= current_datetime: # log.info('Status is unknown. Going to try and make a guess...')
person_data['status'] = 'approved' # approved and current # if membership_person_type_data['first_start_on'] < buffer_datetime and membership_person_type_data['end_on'] >= current_datetime:
elif membership_person_type_data['first_start_on'] < current_datetime and membership_person_type_data['end_on'] < current_datetime: # person_data['status'] = 'approved' # approved and current
person_data['status'] = 'approved' # approved but expired # elif membership_person_type_data['first_start_on'] < current_datetime and membership_person_type_data['end_on'] < current_datetime:
else: # person_data['status'] = 'approved' # approved but expired
person_data['status'] = 'pending' # likely new? # else:
log.debug(person_data['status']) # person_data['status'] = 'pending' # likely new?
# log.debug(person_data['status'])
if membership_person_type_data['end_on'] >= current_datetime: if membership_person_type_data['end_on'] >= current_datetime:
membership_person_type_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

4
app/routers/c_idaa.py
View File

@@ -52,7 +52,7 @@ async def refresh_membership_status(
INNER JOIN membership_person ON person.id = membership_person.person_id INNER JOIN membership_person ON person.id = membership_person.person_id
SET user.email_verified = 1, user.enable = 1, user.enable_from = membership_person.start_on, user.enable_to = membership_person.end_on, user.verified = 1, user.group = 'current_member' SET user.email_verified = 1, user.enable = 1, user.enable_from = membership_person.start_on, user.enable_to = membership_person.end_on, user.verified = 1, user.group = 'current_member'
WHERE user.account_id = 13 AND membership_person.end_on >= NOW() WHERE user.account_id = 13 AND membership_person.end_on >= NOW()
AND (person.status IS NULL OR person.status = 'approved'); AND (person.status IS NULL OR person.status = '' OR person.status = 'approved' OR person.status = 'unknown');
""" """
if user_update_result := sql_update(sql=sql): if user_update_result := sql_update(sql=sql):
# Pull out IDs of existing person record # Pull out IDs of existing person record
@@ -125,7 +125,7 @@ async def refresh_membership_status(
INNER JOIN membership_person ON person.id = membership_person.person_id INNER JOIN membership_person ON person.id = membership_person.person_id
SET person.enable = 1, person.group = 'current_member' SET person.enable = 1, person.group = 'current_member'
WHERE person.account_id = 13 AND membership_person.end_on >= NOW() WHERE person.account_id = 13 AND membership_person.end_on >= NOW()
AND (person.status IS NULL OR person.status = 'approved'); AND (person.status IS NULL OR person.status = '' OR person.status = 'approved' OR person.status = 'unknown');
""" """
if person_update_result := sql_update(sql=sql): if person_update_result := sql_update(sql=sql):
# Pull out IDs of existing person record # Pull out IDs of existing person record