change current task order table name

rename existing task order factory

fix legacy task order repr

atst/models/__init__.py

@@ -9,7 +9,7 @@ from .role import Role
 from .user import User
 from .workspace_role import WorkspaceRole
 from .pe_number import PENumber
-from .task_order import TaskOrder
+from .legacy_task_order import LegacyTaskOrder
 from .workspace import Workspace
 from .project import Project
 from .environment import Environment

atst/models/legacy_task_order.py

@@ -18,8 +18,8 @@ class FundingType(Enum):
     OTHER = "OTHER"
 
 
-class TaskOrder(Base, mixins.TimestampsMixin):
-    __tablename__ = "task_orders"
+class LegacyTaskOrder(Base, mixins.TimestampsMixin):
+    __tablename__ = "legacy_task_orders"
 
     id = types.Id()
     number = Column(String, unique=True)
@@ -65,7 +65,7 @@ class TaskOrder(Base, mixins.TimestampsMixin):
         )
 
     def __repr__(self):
-        return "<TaskOrder(number='{}', verified='{}', budget='{}', expiration_date='{}', pdf='{}', id='{}')>".format(
+        return "<LegacyTaskOrder(number='{}', verified='{}', budget='{}', expiration_date='{}', pdf='{}', id='{}')>".format(
             self.number,
             self.verified,
             self.budget,

atst/models/request.py

@@ -6,7 +6,7 @@ from atst.models import Base, types, mixins
 from atst.models.request_status_event import RequestStatus
 from atst.utils import first_or_none
 from atst.models.request_revision import RequestRevision
-from atst.models.task_order import Source as TaskOrderSource
+from atst.models.legacy_task_order import Source as TaskOrderSource
 
 
 def map_properties_to_dict(properties, instance):
@@ -39,8 +39,8 @@ class Request(Base, mixins.TimestampsMixin, mixins.AuditableMixin):
     user_id = Column(ForeignKey("users.id"), nullable=False)
     creator = relationship("User", backref="owned_requests")
 
-    task_order_id = Column(ForeignKey("task_orders.id"))
-    task_order = relationship("TaskOrder")
+    task_order_id = Column(ForeignKey("legacy_task_orders.id"))
+    task_order = relationship("LegacyTaskOrder")
 
     revisions = relationship(
         "RequestRevision", back_populates="request", order_by="RequestRevision.sequence"