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

Check if invite cannot be resent before raising error

Browse Source
This commit is contained in:
leigh-mil 2019-03-14 14:51:32 -04:00 committed by Montana
parent 6d43153785
commit e2bf820de6
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
atst/models/invitation.py
View File

@ -103,6 +103,10 @@ class Invitation(Base, TimestampsMixin, AuditableMixin):
def is_revokable(self): def is_revokable(self):
return self.is_pending and not self.is_expired return self.is_pending and not self.is_expired
@property
def can_resend(self):
return self.is_pending or self.is_expired
@property @property
def user_dod_id(self): def user_dod_id(self):
return self.user.dod_id if self.user is not None else None return self.user.dod_id if self.user is not None else None

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

@ -14,7 +14,6 @@ from atst.forms.dd_254 import DD254Form
from atst.forms.ko_review import KOReviewForm from atst.forms.ko_review import KOReviewForm
from atst.forms.officers import EditTaskOrderOfficersForm from atst.forms.officers import EditTaskOrderOfficersForm
from atst.models.task_order import Status as TaskOrderStatus from atst.models.task_order import Status as TaskOrderStatus
from atst.models.invitation import Status as InvitationStatus
from atst.utils.flash import formatted_flash as flash from atst.utils.flash import formatted_flash as flash
from atst.services.invitation import ( from atst.services.invitation import (
update_officer_invitations, update_officer_invitations,
@ -126,7 +125,10 @@ 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 invitation.status is not InvitationStatus.PENDING: if not invitation:
raise NotFoundError("invitation")
if not invitation.can_resend:
raise NoAccessError("invitation") raise NoAccessError("invitation")
Invitations.revoke(token=invitation.token) Invitations.revoke(token=invitation.token)
@ -210,7 +212,7 @@ def task_order_invitations(portfolio_id, task_order_id):
form=form, form=form,
) )
else: else:
raise NoAccessError("task_order") raise NotFoundError("task_order")
@portfolios_bp.route( @portfolios_bp.route(