From 3a5d8036a1d399209967a414e8ecf93dac3f9c1b Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Wed, 31 Oct 2018 09:21:29 -0400
Subject: [PATCH] some cleanup for invitation changes

---
 atst/domain/workspaces/query.py | 9 ---------
 atst/models/invitation.py       | 4 ++--
 atst/routes/errors.py           | 2 +-
 3 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/atst/domain/workspaces/query.py b/atst/domain/workspaces/query.py
index 021edf9d..6ac00d8a 100644
--- a/atst/domain/workspaces/query.py
+++ b/atst/domain/workspaces/query.py
@@ -32,12 +32,3 @@ class WorkspacesQuery(Query):
     @classmethod
     def create_workspace_role(cls, user, role, workspace, **kwargs):
         return WorkspaceRole(user=user, role=role, workspace=workspace, **kwargs)
-
-    @classmethod
-    def get_role_for_workspace_and_user(cls, workspace, user):
-        return (
-            db.session.query(WorkspaceRole)
-            .filter(WorkspaceRole.user == user)
-            .filter(WorkspaceRole.workspace == workspace)
-            .one()
-        )
diff --git a/atst/models/invitation.py b/atst/models/invitation.py
index 63fc74a9..60f03b3c 100644
--- a/atst/models/invitation.py
+++ b/atst/models/invitation.py
@@ -41,8 +41,8 @@ class Invitation(Base, TimestampsMixin, AuditableMixin):
     token = Column(String(), index=True, default=lambda: secrets.token_urlsafe())
 
     def __repr__(self):
-        return "<Invitation(user='{}', workspace='{}', id='{}')>".format(
-            self.user.id, self.workspace.id, self.id
+        return "<Invitation(user='{}', workspace_role='{}', id='{}')>".format(
+            self.user_id, self.workspace_role_id, self.id
         )
 
     @property
diff --git a/atst/routes/errors.py b/atst/routes/errors.py
index ef1b3397..4871f89d 100644
--- a/atst/routes/errors.py
+++ b/atst/routes/errors.py
@@ -44,7 +44,7 @@ def make_error_pages(app):
 
     @app.errorhandler(InvitationError)
     # pylint: disable=unused-variable
-    def expired_invitation(e):
+    def invalid_invitation(e):
         log_error(e)
         return (
             render_template(