From 9a43ab00973846e7335fc5004f7381a4e30f43b0 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Thu, 8 Apr 2021 19:13:28 +0200 Subject: [PATCH] add new columns in user model, (active and phantom fields) --- ereuse_devicehub/resources/user/models.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ereuse_devicehub/resources/user/models.py b/ereuse_devicehub/resources/user/models.py index 0ab670c8..18e4efc8 100644 --- a/ereuse_devicehub/resources/user/models.py +++ b/ereuse_devicehub/resources/user/models.py @@ -2,7 +2,7 @@ from uuid import uuid4 from citext import CIText from flask import current_app as app -from sqlalchemy import Column +from sqlalchemy import Column, Boolean from sqlalchemy.dialects.postgresql import UUID from sqlalchemy_utils import EmailType, PasswordType @@ -21,6 +21,8 @@ class User(Thing): **kwargs ))) token = Column(UUID(as_uuid=True), default=uuid4, unique=True, nullable=False) + active = Column(Boolean, default=True, nullable=False) + phantom = Column(Boolean, default=False, nullable=False) inventories = db.relationship(Inventory, backref=db.backref('users', lazy=True, collection_class=set), secondary=lambda: UserInventory.__table__, @@ -28,16 +30,20 @@ class User(Thing): # todo set restriction that user has, at least, one active db - def __init__(self, email, password=None, inventories=None) -> None: + def __init__(self, email, password=None, inventories=None, active=True, phantom=False) -> None: """Creates an user. :param email: :param password: :param inventories: A set of Inventory where the user has access to. If none, the user is granted access to the current inventory. + :param active: allow active and deactive one account without delete the account + :param phantom: it's util for identify the phantom accounts + create during the trade actions """ inventories = inventories or {Inventory.current} - super().__init__(email=email, password=password, inventories=inventories) + super().__init__(email=email, password=password, inventories=inventories, + active=active, phantom=phantom) def __repr__(self) -> str: return ''.format(self)