diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index 3aa5ba88..63239679 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -185,17 +185,6 @@ class TaskOrders(object): "{} is not an officer role on task orders".format(officer_type) ) - @classmethod - def is_officer_for_to(cls, task_order, user): - if ( - user == task_order.contracting_officer - or user == task_order.contracting_officer_representative - or user == task_order.security_officer - ): - return True - else: - return False - @classmethod def add_dd_254(user, task_order, dd_254_data): dd_254 = DD254(**dd_254_data) diff --git a/atst/routes/portfolios/invitations.py b/atst/routes/portfolios/invitations.py index d2d992b8..269ca21d 100644 --- a/atst/routes/portfolios/invitations.py +++ b/atst/routes/portfolios/invitations.py @@ -3,7 +3,6 @@ from flask import g, redirect, url_for, render_template from . import portfolios_bp from atst.domain.portfolios import Portfolios from atst.domain.invitations import Invitations -from atst.domain.task_orders import TaskOrders from atst.queue import queue from atst.utils.flash import formatted_flash as flash @@ -27,7 +26,7 @@ def accept_invitation(token): # - the logged-in user has multiple roles on the TO (e.g., KO and COR) # - the logged-in user has officer roles on multiple unsigned TOs for task_order in invite.portfolio.task_orders: - if TaskOrders.is_officer_for_to(task_order, g.current_user): + if g.current_user in task_order.officers: return redirect( url_for( "portfolios.view_task_order",