change current task order table name

rename existing task order factory

fix legacy task order repr

tests/domain/test_reports.py

@@ -1,12 +1,12 @@
 from atst.domain.reports import Reports
 
-from tests.factories import RequestFactory, TaskOrderFactory, WorkspaceFactory
+from tests.factories import RequestFactory, LegacyTaskOrderFactory, WorkspaceFactory
 
 CLIN_NUMS = ["0001", "0003", "1001", "1003", "2001", "2003"]
 
 
 def test_workspace_totals():
-    task_order = TaskOrderFactory.create()
+    task_order = LegacyTaskOrderFactory.create()
 
     for num in CLIN_NUMS:
         setattr(task_order, "clin_{}".format(num), 200)

tests/domain/test_task_orders.py

@@ -4,11 +4,11 @@ from atst.domain.exceptions import NotFoundError
 from atst.domain.task_orders import TaskOrders
 from atst.eda_client import MockEDAClient
 
-from tests.factories import TaskOrderFactory
+from tests.factories import LegacyTaskOrderFactory
 
 
 def test_can_get_task_order():
-    new_to = TaskOrderFactory.create(number="0101969F")
+    new_to = LegacyTaskOrderFactory.create(number="0101969F")
     to = TaskOrders.get(new_to.number)
 
     assert to.id == to.id

tests/factories.py

@@ -13,7 +13,7 @@ from atst.models.request_review import RequestReview
 from atst.models.request_status_event import RequestStatusEvent, RequestStatus
 from atst.models.pe_number import PENumber
 from atst.models.project import Project
-from atst.models.task_order import TaskOrder, Source, FundingType
+from atst.models.legacy_task_order import LegacyTaskOrder, Source, FundingType
 from atst.models.user import User
 from atst.models.role import Role
 from atst.models.workspace import Workspace
@@ -123,7 +123,7 @@ class RequestFactory(Base):
     @classmethod
     def _adjust_kwargs(cls, **kwargs):
         if kwargs.pop("with_task_order", False) and "task_order" not in kwargs:
-            kwargs["task_order"] = TaskOrderFactory.build()
+            kwargs["task_order"] = LegacyTaskOrderFactory.build()
         return kwargs
 
     @classmethod
@@ -212,9 +212,9 @@ class PENumberFactory(Base):
         model = PENumber
 
 
-class TaskOrderFactory(Base):
+class LegacyTaskOrderFactory(Base):
     class Meta:
-        model = TaskOrder
+        model = LegacyTaskOrder
 
     source = Source.MANUAL
     funding_type = FundingType.PROC

tests/models/test_task_order.py

@@ -1,15 +1,15 @@
-from tests.factories import TaskOrderFactory
+from tests.factories import LegacyTaskOrderFactory
 from tests.assert_util import dict_contains
 
 
 def test_as_dictionary():
-    data = TaskOrderFactory.dictionary()
-    real_task_order = TaskOrderFactory.create(**data)
+    data = LegacyTaskOrderFactory.dictionary()
+    real_task_order = LegacyTaskOrderFactory.create(**data)
     assert dict_contains(real_task_order.to_dictionary(), data)
 
 
 def test_budget():
-    task_order = TaskOrderFactory.create(
+    task_order = LegacyTaskOrderFactory.create(
         clin_0001=500,
         clin_0003=200,
         clin_1001=None,

tests/routes/requests/requests_form/test_details.py

@@ -3,14 +3,14 @@ from flask import url_for
 
 from atst.models.request_status_event import RequestStatus
 
-from tests.factories import RequestFactory, TaskOrderFactory, UserFactory
+from tests.factories import RequestFactory, LegacyTaskOrderFactory, UserFactory
 
 
 def test_can_show_financial_data(client, user_session):
     user = UserFactory.create()
     user_session(user)
 
-    task_order = TaskOrderFactory.create()
+    task_order = LegacyTaskOrderFactory.create()
     request = RequestFactory.create_with_status(
         status=RequestStatus.PENDING_CCPO_APPROVAL, task_order=task_order, creator=user
     )

tests/routes/requests/test_approval.py

@@ -7,7 +7,7 @@ from atst.domain.roles import Roles
 
 from tests.factories import (
     RequestFactory,
-    TaskOrderFactory,
+    LegacyTaskOrderFactory,
     UserFactory,
     RequestReviewFactory,
     RequestStatusEventFactory,
@@ -46,7 +46,7 @@ def test_non_ccpo_cannot_view_approval(user_session, client):
 
 
 def prepare_request_pending_approval(creator, pdf_attachment=None):
-    task_order = TaskOrderFactory.create(number="abc123", pdf=pdf_attachment)
+    task_order = LegacyTaskOrderFactory.create(number="abc123", pdf=pdf_attachment)
     return RequestFactory.create_with_status(
         status=RequestStatus.PENDING_CCPO_APPROVAL,
         task_order=task_order,
@@ -86,7 +86,7 @@ def test_task_order_download(app, client, user_session, pdf_upload):
     user_session(user)
 
     attachment = Attachment.attach(pdf_upload)
-    task_order = TaskOrderFactory.create(number="abc123", pdf=attachment)
+    task_order = LegacyTaskOrderFactory.create(number="abc123", pdf=attachment)
     request = RequestFactory.create(task_order=task_order, creator=user)
 
     # ensure that real data for pdf upload has been flushed to disk

tests/routes/requests/test_financial_verification.py

@@ -11,7 +11,7 @@ from atst.routes.requests.financial_verification import (
 )
 
 from tests.mocks import MOCK_VALID_PE_ID
-from tests.factories import RequestFactory, UserFactory, TaskOrderFactory
+from tests.factories import RequestFactory, UserFactory, LegacyTaskOrderFactory
 from atst.forms.exceptions import FormValidationError
 from atst.domain.requests.financial_verification import (
     PENumberValidator,
@@ -525,7 +525,7 @@ def test_always_derives_pdf_filename(fv_data, e_fv_data, pdf_upload):
     attachment = Attachment.attach(
         pdf_upload, resource="task_order", resource_id=request_one.id
     )
-    task_order = TaskOrderFactory.create(pdf=attachment)
+    task_order = LegacyTaskOrderFactory.create(pdf=attachment)
     request_two = RequestFactory.create(creator=user, task_order=task_order)
 
     form_one = GetFinancialVerificationForm(