diff --git a/alembic/versions/7958cca588a1_add_view_audit_log_permission.py b/alembic/versions/7958cca588a1_add_view_audit_log_permission.py deleted file mode 100644 index 9aa1a0ee..00000000 --- a/alembic/versions/7958cca588a1_add_view_audit_log_permission.py +++ /dev/null @@ -1,39 +0,0 @@ -"""add view_audit_log permission - -Revision ID: 7958cca588a1 -Revises: 875841fac207 -Create Date: 2018-09-14 10:20:20.016575 - -""" -from alembic import op -from sqlalchemy.orm.session import Session - -from atst.models.role import Role -from atst.models.permissions import Permissions - - -# revision identifiers, used by Alembic. -revision = '7958cca588a1' -down_revision = '875841fac207' -branch_labels = None -depends_on = None - - -def upgrade(): - session = Session(bind=op.get_bind()) - admin_roles = session.query(Role).filter(Role.name.in_(["ccpo", "security_auditor"])).all() - for role in admin_roles: - role.add_permission(Permissions.VIEW_AUDIT_LOG) - session.add(role) - - session.commit() - - -def downgrade(): - session = Session(bind=op.get_bind()) - admin_roles = session.query(Role).filter(Role.name.in_(["ccpo", "security_auditor"])).all() - for role in admin_roles: - role.remove_permission(Permissions.VIEW_AUDIT_LOG) - session.add(role) - - session.commit() diff --git a/alembic/versions/903d7c66ff1d_remove_workspaces_name_unique_constraint.py b/alembic/versions/903d7c66ff1d_remove_workspaces_name_unique_constraint.py index 539dc01d..672f1e64 100644 --- a/alembic/versions/903d7c66ff1d_remove_workspaces_name_unique_constraint.py +++ b/alembic/versions/903d7c66ff1d_remove_workspaces_name_unique_constraint.py @@ -1,7 +1,7 @@ """remove workspaces.name unique constraint Revision ID: 903d7c66ff1d -Revises: 7958cca588a1 +Revises: 875841fac207 Create Date: 2018-09-26 10:19:13.230064 """ @@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = '903d7c66ff1d' -down_revision = '7958cca588a1' +down_revision = '875841fac207' branch_labels = None depends_on = None diff --git a/alembic/versions/e1081cf01780_adjust_invitation_status.py b/alembic/versions/e1081cf01780_adjust_invitation_status.py index a2c552cc..368f39b8 100644 --- a/alembic/versions/e1081cf01780_adjust_invitation_status.py +++ b/alembic/versions/e1081cf01780_adjust_invitation_status.py @@ -7,10 +7,8 @@ Create Date: 2018-11-01 12:24:10.970963 """ from alembic import op import sqlalchemy as sa -from atst.models.invitation import Status from enum import Enum - # revision identifiers, used by Alembic. revision = 'e1081cf01780' down_revision = 'a9d8c6b6221c' @@ -18,6 +16,13 @@ branch_labels = None depends_on = None +class Status(Enum): + ACCEPTED = "accepted" + REVOKED = "revoked" + PENDING = "pending" + REJECTED_WRONG_USER = "rejected_wrong_user" + REJECTED_EXPIRED = "rejected_expired" + def upgrade(): conn = op.get_bind() constraints = ", ".join(["'{}'::character varying::text".format(s.name) for s in Status])