diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index 473ca127..63239679 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -14,10 +14,6 @@ class TaskOrderError(Exception): pass -class InvalidOfficerError(Exception): - pass - - class TaskOrders(object): SECTIONS = { "app_info": [ @@ -149,15 +145,6 @@ class TaskOrders(object): "security_officer", ] - @classmethod - def remove_officer(cls, task_order, officer_type): - if officer_type in TaskOrders.OFFICERS: - setattr(task_order, officer_type, None) - db.session.add(task_order) - db.session.commit() - else: - raise (InvalidOfficerError) - @classmethod def add_officer(cls, user, task_order, officer_type, officer_data): Authorization.check_portfolio_permission( diff --git a/tests/domain/test_task_orders.py b/tests/domain/test_task_orders.py index 36bac810..c7d2d371 100644 --- a/tests/domain/test_task_orders.py +++ b/tests/domain/test_task_orders.py @@ -1,11 +1,6 @@ import pytest -from atst.domain.task_orders import ( - TaskOrders, - TaskOrderError, - InvalidOfficerError, - DD254s, -) +from atst.domain.task_orders import TaskOrders, TaskOrderError, DD254s from atst.domain.exceptions import UnauthorizedError from atst.models.attachment import Attachment @@ -132,26 +127,6 @@ def test_task_order_access(): ) -def test_remove_valid_officer(): - task_order = TaskOrderFactory.create() - owner = task_order.portfolio.owner - TaskOrders.add_officer( - owner, task_order, "contracting_officer", owner.to_dictionary() - ) - - assert task_order.contracting_officer == owner - - TaskOrders.remove_officer(task_order, "contracting_officer") - assert task_order.contracting_officer is None - - -def test_remove_invalid_officer(): - task_order = TaskOrderFactory.create() - - with pytest.raises(InvalidOfficerError): - TaskOrders.remove_officer(task_order, "invalid_officer_type") - - def test_dd254_complete(): finished = DD254Factory.create() unfinished = DD254Factory.create(certifying_official=None)