vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #2999 from bison/user-location

Browse source 
Add user location metadata filed
This commit is contained in:
Brad Ison 2018-02-20 16:48:37 -05:00 • committed by GitHub
commit 62971b7f20
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
11 changed files with 79 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
endpoints/api/user.py
View file

@ -135,6 +135,7 @@ def user_view(user, previous_username=None):
'company': user.company,
'family_name': user.family_name,
'given_name': user.given_name,
'location': user.location,
})
analytics_metadata = user_analytics.get_user_analytics_metadata(user)
@ -246,6 +247,10 @@ class User(ApiResource):
'type': 'string',
'description': 'The optional entered company for the user',
},
'location': {
'type': 'string',
'description': 'The optional entered location for the user',
},
},
},
'UserView': {
@ -362,14 +367,21 @@ class User(ApiResource):
model.user.update_email(user, new_email, auto_verify=not features.MAILING)
if features.USER_METADATA:
if 'given_name' in user_data or 'family_name' in user_data or 'company' in user_data:
model.user.update_user_metadata(user, user_data.get('given_name'),
user_data.get('family_name'), user_data.get('company'))
metadata_fields = ('given_name', 'family_name', 'company', 'location')
if any(field in user_data for field in metadata_fields):
model.user.update_user_metadata(user, {
'given_name': user_data.get('given_name'),
'family_name': user_data.get('family_name'),
'company': user_data.get('company'),
'location': user_data.get('location'),
})
ua_mdata_future = user_analytics.change_metadata(
user.email,
user_data.get('given_name'),
user_data.get('family_name'),
user_data.get('company'),
user_data.get('location'),
)
ua_mdata_future.add_done_callback(build_error_callback('Change metadata failed'))