pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #708 from dod-ccpo/use-noaccesserror

Browse Source 
Use NoAccessError instead of NotFoundError
This commit is contained in:
montana-mil 2019-03-18 09:39:57 -04:00 committed by GitHub
commit 6d43153785
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/invitations.py
View File

@ -111,6 +111,10 @@ class Invitations(object):
@classmethod @classmethod
def lookup_by_portfolio_and_user(cls, portfolio, user): def lookup_by_portfolio_and_user(cls, portfolio, user):
portfolio_role = PortfolioRoles.get(portfolio.id, user.id) portfolio_role = PortfolioRoles.get(portfolio.id, user.id)
if portfolio_role.latest_invitation is None:
raise NotFoundError("invitation")
return portfolio_role.latest_invitation return portfolio_role.latest_invitation
@classmethod @classmethod

6
atst/routes/portfolios/task_orders.py
View File

@ -126,8 +126,8 @@ def resend_invite(portfolio_id, task_order_id, form=None):
invitation = Invitations.lookup_by_portfolio_and_user(portfolio, officer) invitation = Invitations.lookup_by_portfolio_and_user(portfolio, officer)
if not invitation or (invitation.status is not InvitationStatus.PENDING): if invitation.status is not InvitationStatus.PENDING:
raise NotFoundError("invitation") raise NoAccessError("invitation")
Invitations.revoke(token=invitation.token) Invitations.revoke(token=invitation.token)
@ -210,7 +210,7 @@ def task_order_invitations(portfolio_id, task_order_id):
form=form, form=form,
) )
else: else:
raise NotFoundError("task_order") raise NoAccessError("task_order")
@portfolios_bp.route( @portfolios_bp.route(