openstack
/
election
Code Issues Proposed changes

Merge "Add affiliations and country to structured data"

This commit is contained in:
Zuul 2019-11-21 21:33:18 +00:00 committed by Gerrit Code Review
parent 56d6173ebc 8eda687ac1
commit aa3588596b
2 changed files with 26 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
openstack_election/owners.py
View File

@ -540,17 +540,31 @@ def main(options):
continue
# Record OSF member profile ID when it exists
for email in [owners[owner]['preferred']] + owners[owner]['extra']:
member = utils.lookup_member(email, verbose=options.verbose)
if member['data']:
owners[owner]['member'] = member['data'][0]['id']
profile = utils.lookup_member(email, verbose=options.verbose)
if profile['data']:
owners[owner]['member'] = profile['data'][0]['id']
break
# If not a member, record non-member OSF profile ID when there is one
if 'member' not in owners[owner]:
if not profile['data']:
for email in [owners[owner]['preferred']] + owners[owner]['extra']:
nonmember = utils.lookup_osf(email, verbose=options.verbose)
if nonmember['data']:
owners[owner]['nonmember'] = nonmember['data'][0]['id']
profile = utils.lookup_osf(email, verbose=options.verbose)
if profile['data']:
owners[owner]['nonmember'] = profile['data'][0]['id']
break
# Extract country and affiliations from the OSF profile
if profile['data']:
if 'country' in profile['data'][0]:
owners[owner]['country'] = profile['data'][0]['country']
if 'affiliations' in profile['data'][0]:
affiliations = profile['data'][0]['affiliations']
if affiliations:
owners[owner]['affiliations'] = []
for affiliation in affiliations:
if (not affiliation['end_date']
or datetime.datetime.fromtmiestamp(
affiliation['end_date']) > after):
owners[owner]['affiliations'].append(
affiliation['organization']['name'])
invite = [owners[owner].get(
'member', owners[owner].get('nonmember', 0))]
invite.append(owners[owner]['name'])

6
openstack_election/utils.py
View File

@ -113,7 +113,11 @@ def get_schedule_data(series):
def lookup_osf(email, group_slug=None, verbose=0):
"""A requests wrapper to querying the OSF member directory API"""
params = {'filter[]': ['email==%s' % email]}
params = {
'expand': 'groups',
'filter[]': ['email==%s' % email],
'relations': 'affiliations,groups',
}
if group_slug:
params['filter[]'].append('group_slug==%s' % group_slug)