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

Report the user's name and company to Marketo

Browse source 
Also fixes the API to report the other changes (username and email) as well
This commit is contained in:
Joseph Schorr 2016-11-09 15:29:53 -05:00
parent 860942ece1
commit 1a61ef4e04
8 changed files with 78 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

3
data/database.py
View file

@ -337,7 +337,8 @@ class User(BaseModel):
enabled = BooleanField(default=True)
invoice_email_address = CharField(null=True, index=True)
name = CharField(null=True)
given_name = CharField(null=True)
family_name = CharField(null=True)
company = CharField(null=True)
def delete_instance(self, recursive=False, delete_nullable=False):

13
data/migrations/versions/491a530df230_add_user_metadata_fields.py → data/migrations/versions/faf752bd2e0a_add_user_metadata_fields.py
View file

@ -1,23 +1,25 @@
"""Add user metadata fields
Revision ID: 491a530df230
Revision ID: faf752bd2e0a
Revises: 6c7014e84a5e
Create Date: 2016-11-04 18:03:05.237408
Create Date: 2016-11-14 17:29:03.984665
"""
# revision identifiers, used by Alembic.
revision = '491a530df230'
revision = 'faf752bd2e0a'
down_revision = '6c7014e84a5e'
from alembic import op
import sqlalchemy as sa
from util.migrate import UTF8CharField
def upgrade(tables):
### commands auto generated by Alembic - please adjust! ###
op.add_column('user', sa.Column('company', UTF8CharField(length=255), nullable=True))
op.add_column('user', sa.Column('name', UTF8CharField(length=255), nullable=True))
op.add_column('user', sa.Column('family_name', UTF8CharField(length=255), nullable=True))
op.add_column('user', sa.Column('given_name', UTF8CharField(length=255), nullable=True))
### end Alembic commands ###
op.bulk_insert(tables.userpromptkind,
@ -29,7 +31,8 @@ def upgrade(tables):
def downgrade(tables):
### commands auto generated by Alembic - please adjust! ###
op.drop_column('user', 'name')
op.drop_column('user', 'given_name')
op.drop_column('user', 'family_name')
op.drop_column('user', 'company')
### end Alembic commands ###

5
data/model/user.py
View file

@ -355,10 +355,11 @@ def list_entity_robot_permission_teams(entity_name, include_permissions=False):
return TupleSelector(query, fields)
def update_user_metadata(user, name=None, company=None):
def update_user_metadata(user, given_name=None, family_name=None, company=None):
""" Updates the metadata associated with the user, including his/her name and company. """
with db_transaction():
user.name = name or user.name
user.given_name = given_name or user.given_name
user.family_name = family_name or user.family_name
user.company = company or user.company
user.save()