track invitation state by status enum

tests/domain/test_invitations.py

@@ -1,7 +1,8 @@
 import datetime
 import pytest
 
-from atst.domain.invitations import Invitations, InvitationExpired
+from atst.domain.invitations import Invitations, InvitationError
+from atst.models.invitation import Status
 
 from tests.factories import WorkspaceFactory, UserFactory, InvitationFactory
 
@@ -13,16 +14,16 @@ def test_create_invitation():
     assert invite.user == user
     assert invite.workspace == workspace
     assert invite.inviter == workspace.owner
-    assert invite.valid
+    assert invite.status == Status.PENDING
 
 
 def test_accept_invitation():
     workspace = WorkspaceFactory.create()
     user = UserFactory.create()
     invite = Invitations.create(workspace, workspace.owner, user)
-    assert invite.valid
+    assert invite.is_pending
     accepted_invite = Invitations.accept(invite.id)
-    assert not accepted_invite.valid
+    assert accepted_invite.is_accepted
 
 
 def test_accept_expired_invitation():
@@ -31,19 +32,32 @@ def test_accept_expired_invitation():
     increment = Invitations.EXPIRATION_LIMIT_MINUTES + 1
     created_at = datetime.datetime.now() - datetime.timedelta(minutes=increment)
     invite = InvitationFactory.create(
-        workspace_id=workspace.id, user_id=user.id, time_created=created_at, valid=True
+        workspace_id=workspace.id,
+        user_id=user.id,
+        time_created=created_at,
+        status=Status.PENDING,
     )
-    with pytest.raises(InvitationExpired):
+    with pytest.raises(InvitationError):
         Invitations.accept(invite.id)
 
-    assert not invite.valid
+    assert invite.is_rejected
 
 
-def test_accept_invalid_invite():
+def test_accept_rejected_invite():
     workspace = WorkspaceFactory.create()
     user = UserFactory.create()
     invite = InvitationFactory.create(
-        workspace_id=workspace.id, user_id=user.id, valid=False
+        workspace_id=workspace.id, user_id=user.id, status=Status.REJECTED
     )
-    with pytest.raises(InvitationExpired):
+    with pytest.raises(InvitationError):
+        Invitations.accept(invite.id)
+
+
+def test_accept_revoked_invite():
+    workspace = WorkspaceFactory.create()
+    user = UserFactory.create()
+    invite = InvitationFactory.create(
+        workspace_id=workspace.id, user_id=user.id, status=Status.REVOKED
+    )
+    with pytest.raises(InvitationError):
         Invitations.accept(invite.id)

tests/factories.py

@@ -20,7 +20,7 @@ from atst.models.workspace import Workspace
 from atst.domain.roles import Roles
 from atst.models.workspace_role import WorkspaceRole
 from atst.models.environment_role import EnvironmentRole
-from atst.models.invitation import Invitation
+from atst.models.invitation import Invitation, Status as InvitationStatus
 from atst.domain.workspaces import Workspaces
 
 
@@ -339,3 +339,5 @@ class EnvironmentRoleFactory(Base):
 class InvitationFactory(Base):
     class Meta:
         model = Invitation
+
+    status = InvitationStatus.PENDING

tests/routes/test_workspaces.py

@@ -8,6 +8,7 @@ from atst.domain.environments import Environments
 from atst.domain.environment_roles import EnvironmentRoles
 from atst.domain.invitations import Invitations
 from atst.models.workspace_user import WorkspaceUser
+from atst.models.invitation import Status as InvitationStatus
 from atst.queue import queue
 
 
@@ -316,7 +317,7 @@ def test_new_member_accepts_valid_invite(client, user_session):
         in response.headers["Location"]
     )
     # the one-time use invite is no longer usable
-    assert invite.valid == False
+    assert invite.is_accepted
     # the user has access to the workspace
     assert len(Workspaces.for_user(user)) == 1
 
@@ -327,7 +328,9 @@ def test_new_member_accept_invalid_invite(client, user_session):
     user = UserFactory.create()
     member = WorkspaceUsers.add(user, workspace.id, "developer")
     invite = InvitationFactory.create(
-        user_id=member.user.id, workspace_id=workspace.id, valid=False
+        user_id=member.user.id,
+        workspace_id=workspace.id,
+        status=InvitationStatus.REJECTED,
     )
     user_session(user)
     response = client.get(url_for("workspaces.accept_invitation", invite_id=invite.id))