change current task order table name

rename existing task order factory

fix legacy task order repr

atst/domain/task_orders.py

@@ -2,19 +2,21 @@ from sqlalchemy.orm.exc import NoResultFound
 from flask import current_app as app
 
 from atst.database import db
-from atst.models.task_order import TaskOrder, Source, FundingType
+from atst.models.legacy_task_order import LegacyTaskOrder, Source, FundingType
 from .exceptions import NotFoundError
 from atst.utils import update_obj
 
 
 class TaskOrders(object):
-    TASK_ORDER_DATA = [col.name for col in TaskOrder.__table__.c if col.name != "id"]
+    TASK_ORDER_DATA = [
+        col.name for col in LegacyTaskOrder.__table__.c if col.name != "id"
+    ]
 
     @classmethod
     def get(cls, order_number):
         try:
             task_order = (
-                db.session.query(TaskOrder).filter_by(number=order_number).one()
+                db.session.query(LegacyTaskOrder).filter_by(number=order_number).one()
             )
         except NoResultFound:
             if TaskOrders._client():
@@ -39,7 +41,7 @@ class TaskOrders(object):
     @classmethod
     def create(cls, source=Source.MANUAL, **kwargs):
         to_data = {k: v for k, v in kwargs.items() if v not in ["", None]}
-        task_order = TaskOrder(source=source, **to_data)
+        task_order = LegacyTaskOrder(source=source, **to_data)
 
         db.session.add(task_order)
         db.session.commit()

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"