From eb22d5ec1e49f35ba9cac0eb9a8876d226eac08e Mon Sep 17 00:00:00 2001
From: graham-dds <graham.beckley-ctr@friends.dds.mil>
Date: Mon, 28 Oct 2019 13:27:57 -0400
Subject: [PATCH] Invitation revoking & role disabling to base class

---
 atst/domain/invitations.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/atst/domain/invitations.py b/atst/domain/invitations.py
index 4b89917a..069be936 100644
--- a/atst/domain/invitations.py
+++ b/atst/domain/invitations.py
@@ -114,7 +114,9 @@ class BaseInvitations(object):
     @classmethod
     def revoke(cls, token):
         invite = cls._get(token)
-        return cls._update_status(invite, InvitationStatus.REVOKED)
+        invite = cls._update_status(invite, InvitationStatus.REVOKED)
+        cls.role_domain_class.disable(invite.role)
+        return invite
 
     @classmethod
     def resend(cls, inviter, token, user_info=None):
@@ -138,19 +140,7 @@ class PortfolioInvitations(BaseInvitations):
     model = PortfolioInvitation
     role_domain_class = PortfolioRoles
 
-    @classmethod
-    def revoke(cls, token):
-        invite = super().revoke(token)
-        PortfolioRoles.disable(invite.role)
-        return invite
-
 
 class ApplicationInvitations(BaseInvitations):
     model = ApplicationInvitation
     role_domain_class = ApplicationRoles
-
-    @classmethod
-    def revoke(cls, token):
-        invite = super().revoke(token)
-        ApplicationRoles.disable(invite.role)
-        return invite