From 35b3565c0f4d68993045792d6cc4e276217cf462 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Mon, 26 Nov 2018 15:38:32 -0500
Subject: [PATCH 1/2] Add is_revokable property to Invitation

---
 atst/models/invitation.py              | 4 ++++
 templates/workspaces/members/edit.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/atst/models/invitation.py b/atst/models/invitation.py
index 6097361a..a6a2964d 100644
--- a/atst/models/invitation.py
+++ b/atst/models/invitation.py
@@ -87,3 +87,7 @@ class Invitation(Base, TimestampsMixin, AuditableMixin):
     @property
     def user_name(self):
         return self.workspace_role.user.full_name
+
+    @property
+    def is_revokable(self):
+        return self.is_pending and not self.is_expired
diff --git a/templates/workspaces/members/edit.html b/templates/workspaces/members/edit.html
index 0b609e5b..f83149d3 100644
--- a/templates/workspaces/members/edit.html
+++ b/templates/workspaces/members/edit.html
@@ -40,7 +40,7 @@
         <a href='{{ url_for("users.user") }}' class='icon-link'>edit account details</a>
       {% endif %}
       <div>
-      {% if member.latest_invitation.is_pending %}
+      {% if member.latest_invitation.is_revokable %}
         {{ ConfirmationButton(
               "Revoke Invitation",
               url_for("workspaces.revoke_invitation", workspace_id=workspace.id, token=member.latest_invitation.token),

From 451d4a5ac093e74689daf668a9984623a8362eb9 Mon Sep 17 00:00:00 2001
From: leigh-mil <leigh-ctr@friends.dds.mil>
Date: Wed, 28 Nov 2018 14:39:03 -0500
Subject: [PATCH 2/2] Add tests

---
 tests/models/test_invitation.py | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 tests/models/test_invitation.py

diff --git a/tests/models/test_invitation.py b/tests/models/test_invitation.py
new file mode 100644
index 00000000..44fb30fb
--- /dev/null
+++ b/tests/models/test_invitation.py
@@ -0,0 +1,23 @@
+import pytest
+import datetime
+
+from atst.models.invitation import Invitation, Status
+
+from tests.factories import InvitationFactory
+
+
+def test_expired_invite_is_not_revokable():
+    invite = InvitationFactory.create(
+        expiration_time=datetime.datetime.now() - datetime.timedelta(minutes=60)
+    )
+    assert not invite.is_revokable
+
+
+def test_unexpired_invite_is_revokable():
+    invite = InvitationFactory.create()
+    assert invite.is_revokable
+
+
+def test_invite_is_not_revokable_if_invite_is_not_pending():
+    invite = InvitationFactory.create(status=Status.ACCEPTED)
+    assert not invite.is_revokable