record expiration time on the invitation

atst/domain/invitations.py

@@ -36,6 +36,7 @@ class Invitations(object):
             inviter=inviter,
             user=user,
             status=InvitationStatus.PENDING,
+            expiration_time=Invitations.current_expiration_time(),
         )
         db.session.add(invite)
         db.session.commit()
@@ -46,7 +47,7 @@ class Invitations(object):
     def accept(cls, invite_id):
         invite = Invitations._get(invite_id)
 
-        if Invitations._is_expired(invite):
+        if invite.is_expired:
             invite.status = InvitationStatus.REJECTED
         elif invite.is_pending:
             invite.status = InvitationStatus.ACCEPTED
@@ -60,9 +61,7 @@ class Invitations(object):
         return invite
 
     @classmethod
-    def _is_expired(cls, invite):
-        time_created = invite.time_created
-        expiration = datetime.datetime.now(time_created.tzinfo) - datetime.timedelta(
+    def current_expiration_time(cls):
+        return datetime.datetime.now() + datetime.timedelta(
             minutes=Invitations.EXPIRATION_LIMIT_MINUTES
         )
-        return invite.time_created < expiration

atst/models/invitation.py

@@ -1,6 +1,7 @@
+import datetime
 from enum import Enum
 
-from sqlalchemy import Column, ForeignKey, Enum as SQLAEnum
+from sqlalchemy import Column, ForeignKey, Enum as SQLAEnum, TIMESTAMP
 from sqlalchemy.dialects.postgresql import UUID
 from sqlalchemy.orm import relationship
 
@@ -31,6 +32,8 @@ class Invitation(Base, TimestampsMixin):
 
     status = Column(SQLAEnum(Status, native_enum=False, default=Status.PENDING))
 
+    expiration_time = Column(TIMESTAMP(timezone=True))
+
     def __repr__(self):
         return "<Invitation(user='{}', workspace='{}', id='{}')>".format(
             self.user.id, self.workspace.id, self.id
@@ -51,3 +54,7 @@ class Invitation(Base, TimestampsMixin):
     @property
     def is_rejected(self):
         return self.status == Status.REJECTED
+
+    @property
+    def is_expired(self):
+        return datetime.datetime.now(self.expiration_time.tzinfo) > self.expiration_time