From 32a705d1d3db1b5e86fbd63e28de767c8b1dbcd8 Mon Sep 17 00:00:00 2001 From: leigh-mil Date: Fri, 15 Mar 2019 14:33:38 -0400 Subject: [PATCH] Move NotFoundError into the lookup method --- atst/domain/invitations.py | 4 ++++ atst/routes/portfolios/task_orders.py | 3 --- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/atst/domain/invitations.py b/atst/domain/invitations.py index 06dab623..6d23c241 100644 --- a/atst/domain/invitations.py +++ b/atst/domain/invitations.py @@ -111,6 +111,10 @@ class Invitations(object): @classmethod def lookup_by_portfolio_and_user(cls, portfolio, user): portfolio_role = PortfolioRoles.get(portfolio.id, user.id) + + if portfolio_role.latest_invitation is None: + raise NotFoundError("invitation") + return portfolio_role.latest_invitation @classmethod diff --git a/atst/routes/portfolios/task_orders.py b/atst/routes/portfolios/task_orders.py index 6f2be63f..385b4124 100644 --- a/atst/routes/portfolios/task_orders.py +++ b/atst/routes/portfolios/task_orders.py @@ -126,9 +126,6 @@ def resend_invite(portfolio_id, task_order_id, form=None): invitation = Invitations.lookup_by_portfolio_and_user(portfolio, officer) - if not invitation: - raise NotFoundError("invitation") - if invitation.status is not InvitationStatus.PENDING: raise NoAccessError("invitation")