From 3c23c8ce09145f9e15d8604b9be03597745b82bd Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Wed, 14 Jun 2023 16:06:10 +0200 Subject: [PATCH] add rols to user --- .../5169765e2653_add_new_erase_data_wipe.py | 2 +- .../versions/a8a86dbd5f51_add_rols_to_user.py | 35 +++++++++++++++++++ ereuse_devicehub/resources/user/models.py | 1 + 3 files changed, 37 insertions(+), 1 deletion(-) create mode 100644 ereuse_devicehub/migrations/versions/a8a86dbd5f51_add_rols_to_user.py diff --git a/ereuse_devicehub/migrations/versions/5169765e2653_add_new_erase_data_wipe.py b/ereuse_devicehub/migrations/versions/5169765e2653_add_new_erase_data_wipe.py index 1621a547..1b35b469 100644 --- a/ereuse_devicehub/migrations/versions/5169765e2653_add_new_erase_data_wipe.py +++ b/ereuse_devicehub/migrations/versions/5169765e2653_add_new_erase_data_wipe.py @@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql # revision identifiers, used by Alembic. revision = '5169765e2653' -down_revision = '2f2ef041483a' +down_revision = 'a8a86dbd5f51' branch_labels = None depends_on = None diff --git a/ereuse_devicehub/migrations/versions/a8a86dbd5f51_add_rols_to_user.py b/ereuse_devicehub/migrations/versions/a8a86dbd5f51_add_rols_to_user.py new file mode 100644 index 00000000..37424108 --- /dev/null +++ b/ereuse_devicehub/migrations/versions/a8a86dbd5f51_add_rols_to_user.py @@ -0,0 +1,35 @@ +"""add rols to user + +Revision ID: a8a86dbd5f51 +Revises: 5169765e2653 +Create Date: 2023-06-14 15:04:03.478157 + +""" +import citext +import sqlalchemy as sa +from alembic import context, op + +# revision identifiers, used by Alembic. +revision = 'a8a86dbd5f51' +down_revision = '2f2ef041483a' +branch_labels = None +depends_on = None + + +def get_inv(): + INV = context.get_x_argument(as_dictionary=True).get('inventory') + if not INV: + raise ValueError("Inventory value is not specified") + return INV + + +def upgrade(): + op.add_column( + 'user', + sa.Column('rols_dlt', type_=citext.CIText(), nullable=True), + schema='common', + ) + + +def downgrade(): + op.drop_column('user', 'rols_dlt', schema='common') diff --git a/ereuse_devicehub/resources/user/models.py b/ereuse_devicehub/resources/user/models.py index fee89686..d1caf715 100644 --- a/ereuse_devicehub/resources/user/models.py +++ b/ereuse_devicehub/resources/user/models.py @@ -33,6 +33,7 @@ class User(UserMixin, Thing): active = Column(Boolean, default=True, nullable=False) phantom = Column(Boolean, default=False, nullable=False) api_keys_dlt = Column(CIText(), nullable=True) + rols_dlt = Column(CIText(), nullable=True) inventories = db.relationship( Inventory, backref=db.backref('users', lazy=True, collection_class=set),