From d19cabed90e7eb5f9b2835d77ca9d6bdecfbbbef Mon Sep 17 00:00:00 2001 From: Cliff Hill Date: Wed, 8 Nov 2023 16:53:53 -0500 Subject: [PATCH] Removed "expired" flag. Signed-off-by: Cliff Hill --- app/dao/invited_user_dao.py | 4 ++-- app/models.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app/dao/invited_user_dao.py b/app/dao/invited_user_dao.py index 4f49ef36c..5b9b63947 100644 --- a/app/dao/invited_user_dao.py +++ b/app/dao/invited_user_dao.py @@ -1,7 +1,7 @@ from datetime import datetime, timedelta from app import db -from app.models import InvitedUser +from app.models import INVITE_EXPIRED, InvitedUser def save_invited_user(invited_user): @@ -25,7 +25,7 @@ def expire_invitations_created_more_than_two_days_ago(): expired = ( db.session.query(InvitedUser) .filter(InvitedUser.created_at <= datetime.utcnow() - timedelta(days=2)) - .update({InvitedUser.expired: True, InvitedUser.status: "expired"}) + .update({InvitedUser.status: INVITE_EXPIRED}) ) db.session.commit() return expired diff --git a/app/models.py b/app/models.py index f0bca7dcb..7fe596a61 100644 --- a/app/models.py +++ b/app/models.py @@ -1931,7 +1931,6 @@ class InvitedUser(db.Model): default=SMS_AUTH_TYPE, ) folder_permissions = db.Column(JSONB(none_as_null=True), nullable=False, default=[]) - expired = db.Column(db.Boolean, nullable=False, default=False) # would like to have used properties for this but haven't found a way to make them # play nice with marshmallow yet