change task orders domain class name

This commit is contained in:
dandds 2018-12-12 16:48:18 -05:00
parent e509c34cdd
commit 15d0db01b6
4 changed files with 20 additions and 17 deletions

View File

@ -7,7 +7,7 @@ from .exceptions import NotFoundError
from atst.utils import update_obj
class TaskOrders(object):
class LegacyTaskOrders(object):
TASK_ORDER_DATA = [
col.name for col in LegacyTaskOrder.__table__.c if col.name != "id"
]
@ -19,8 +19,8 @@ class TaskOrders(object):
db.session.query(LegacyTaskOrder).filter_by(number=order_number).one()
)
except NoResultFound:
if TaskOrders._client():
legacy_task_order = TaskOrders.get_from_eda(order_number)
if LegacyTaskOrders._client():
legacy_task_order = LegacyTaskOrders.get_from_eda(order_number)
else:
raise NotFoundError("legacy_task_order")
@ -28,10 +28,10 @@ class TaskOrders(object):
@classmethod
def get_from_eda(cls, order_number):
to_data = TaskOrders._client().get_contract(order_number, status="y")
to_data = LegacyTaskOrders._client().get_contract(order_number, status="y")
if to_data:
# TODO: we need to determine exactly what we're getting and storing from the EDA client
return TaskOrders.create(
return LegacyTaskOrders.create(
source=Source.EDA, funding_type=FundingType.PROC, **to_data
)

View File

@ -1,6 +1,6 @@
import re
from atst.domain.task_orders import TaskOrders
from atst.domain.legacy_task_orders import LegacyTaskOrders
from atst.domain.pe_numbers import PENumbers
from atst.domain.exceptions import NotFoundError
@ -63,7 +63,7 @@ class PENumberValidator(object):
class TaskOrderNumberValidator(object):
def validate(self, field):
try:
TaskOrders.get(field.data)
LegacyTaskOrders.get(field.data)
except NotFoundError:
self._apply_error(field)
return False

View File

@ -12,7 +12,7 @@ from atst.domain.requests.financial_verification import (
TaskOrderNumberValidator,
)
from atst.models.attachment import Attachment
from atst.domain.task_orders import TaskOrders
from atst.domain.legacy_task_orders import LegacyTaskOrders
from atst.utils.flash import formatted_flash as flash
@ -83,18 +83,20 @@ class FinancialVerificationBase(object):
task_order_data["pdf"] = attachment
try:
legacy_task_order = TaskOrders.get(task_order_number)
legacy_task_order = TaskOrders.update(legacy_task_order, task_order_data)
legacy_task_order = LegacyTaskOrders.get(task_order_number)
legacy_task_order = LegacyTaskOrders.update(
legacy_task_order, task_order_data
)
return legacy_task_order
except NotFoundError:
pass
try:
return TaskOrders.get_from_eda(task_order_number)
return LegacyTaskOrders.get_from_eda(task_order_number)
except NotFoundError:
pass
return TaskOrders.create(**task_order_data)
return LegacyTaskOrders.create(**task_order_data)
def _raise(self, form):
form.reset()

View File

@ -1,7 +1,7 @@
import pytest
from atst.domain.exceptions import NotFoundError
from atst.domain.task_orders import TaskOrders
from atst.domain.legacy_task_orders import LegacyTaskOrders
from atst.eda_client import MockEDAClient
from tests.factories import LegacyTaskOrderFactory
@ -9,19 +9,20 @@ from tests.factories import LegacyTaskOrderFactory
def test_can_get_task_order():
new_to = LegacyTaskOrderFactory.create(number="0101969F")
to = TaskOrders.get(new_to.number)
to = LegacyTaskOrders.get(new_to.number)
assert to.id == to.id
def test_nonexistent_task_order_raises_without_client():
with pytest.raises(NotFoundError):
TaskOrders.get("some fake number")
LegacyTaskOrders.get("some fake number")
def test_nonexistent_task_order_raises_with_client(monkeypatch):
monkeypatch.setattr(
"atst.domain.task_orders.TaskOrders._client", lambda: MockEDAClient()
"atst.domain.legacy_task_orders.LegacyTaskOrders._client",
lambda: MockEDAClient(),
)
with pytest.raises(NotFoundError):
TaskOrders.get("some other fake numer")
LegacyTaskOrders.get("some other fake numer")