Merge with master.

migrations/versions/0030_add_template_permission.py

@@ -31,6 +31,6 @@ def upgrade():
 def downgrade():
     ### commands auto generated by Alembic - please adjust! ###
     conn = op.get_bind()
-    conn.execute("DELETE FROM permissions where permission='manage_templates")
+    conn.execute("DELETE FROM permissions where permission='manage_templates'")
 
     ### end Alembic commands ###

migrations/versions/0031_add_manage_team_permission.py

@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: 0031_add_manage_team_permission
+Revises: 0030_add_template_permission
+Create Date: 2016-02-26 10:33:20.536362
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0031_add_manage_team_permission'
+down_revision = '0030_add_template_permission'
+import uuid
+from datetime import datetime
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    user_services = conn.execute("SELECT * FROM user_to_service").fetchall()
+    for entry in user_services:
+        id_ = uuid.uuid4()
+        created_at = datetime.now().isoformat().replace('T', ' ')
+        conn.execute((
+            "INSERT INTO permissions (id, user_id, service_id, permission, created_at)"
+            " VALUES ('{}', '{}', '{}', 'manage_team', '{}')").format(id_, entry[0], entry[1], created_at))
+        id_ = uuid.uuid4()
+        conn.execute((
+            "INSERT INTO permissions (id, user_id, service_id, permission, created_at)"
+            " VALUES ('{}', '{}', '{}', 'view_activity', '{}')").format(id_, entry[0], entry[1], created_at))
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    conn.execute("DELETE FROM permissions where permission='manage_team'")
+    conn.execute("DELETE FROM permissions where permission='view_activity'")
+
+    ### end Alembic commands ###

migrations/versions/0032_update_permission_to_enum.py

@@ -0,0 +1,41 @@
+"""empty message
+
+Revision ID: 49380ad07c88
+Revises: 0031_add_manage_team_permission
+Create Date: 2016-03-01 17:08:12.184393
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '49380ad07c88'
+down_revision = '0031_add_manage_team_permission'
+
+from alembic import op
+import sqlalchemy as sa
+
+
+def upgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    permissions = conn.execute("SELECT (id, permission) FROM permissions").fetchall()
+    print(permissions)
+    op.drop_column('permissions', 'permission')
+    op.drop_constraint('uix_service_user_permission', 'permissions', type_='unique')
+    op.add_column('permissions', sa.Column('permission', sa.Enum('manage_service', 'send_messages', 'manage_api_keys', 'manage_templates', 'manage_team', 'view_activity', name='permission_types'), nullable=False))
+    for p in permissions:
+    	conn.execute("UPDATE permissions SET permission='{}' WHERE ID='{}'".format(p[1], p[0]))
+    op.create_unique_constraint('uix_service_user_permission', 'permissions', ['service_id', 'user_id', '_permission'])
+    ### end Alembic commands ###
+
+
+def downgrade():
+    ### commands auto generated by Alembic - please adjust! ###
+    conn = op.get_bind()
+    permissions = conn.execute("SELECT (id, permission) FROM permissions").fetchall()
+    op.drop_column('permissions', 'permission')
+    op.drop_constraint('uix_service_user_permission', 'permissions', type_='unique')
+    op.add_column('permissions', sa.Column('permission', sa.VARCHAR(length=255), autoincrement=False, nullable=False))
+    for p in permissions:
+    	conn.execute("UPDATE permissions SET permission='{}' WHERE ID='{}'".format(p[1], p[0]))
+    op.create_unique_constraint('uix_service_user_permission', 'permissions', ['service_id', 'user_id', 'permission'])
+    ### end Alembic commands ###