Rebase fixes

alembic/versions/9c24c609878a_resource_attachments.py

@@ -11,7 +11,7 @@ from sqlalchemy.dialects import postgresql
 
 # revision identifiers, used by Alembic.
 revision = '9c24c609878a'
-down_revision = '903d7c66ff1d'
+down_revision = 'c99026ab9918'
 branch_labels = None
 depends_on = None
 

atst/domain/requests/requests.py

@@ -1,7 +1,5 @@
-from werkzeug.datastructures import FileStorage
 import dateutil
 
-from atst.domain.task_orders import TaskOrders
 from atst.domain.workspaces import Workspaces
 from atst.models.request_revision import RequestRevision
 from atst.models.request_status_event import RequestStatusEvent, RequestStatus
@@ -166,26 +164,6 @@ class Requests(object):
     ):
         request = RequestsQuery.get_with_lock(request_id)
 
-        # request_data = financial_data.copy()
-        # task_order_data = {
-        #     k: request_data.pop(k)
-        #     for (k, v) in financial_data.items()
-        #     if k in TaskOrders.TASK_ORDER_DATA
-        # }
-
-        # if task_order_data:
-        #     task_order_number = request_data.pop("task_order_number")
-        # else:
-        #     task_order_number = request_data.get("task_order_number")
-
-        # task_order_file = request_data.pop("task_order", None)
-        # if isinstance(task_order_file, FileStorage):
-        #     task_order_data["pdf"] = task_order_file
-
-        # task_order = TaskOrders.get_or_create_task_order(
-        #     task_order_number, task_order_data
-        # )
-
         delta = pick(
             [
                 "uii_ids",
@@ -203,7 +181,7 @@ class Requests(object):
             ],
             financial_data,
         )
-        delta = {**delta, "extended": extended}
+        delta["extended"] = extended
 
         if task_order:
             request.task_order = task_order

atst/domain/task_orders.py

@@ -30,9 +30,7 @@ class TaskOrders(object):
         if to_data:
             # TODO: we need to determine exactly what we're getting and storing from the EDA client
             return TaskOrders.create(
-                number=to_data["contract_no"],
-                source=Source.EDA,
-                funding_type=FundingType.PROC,
+                source=Source.EDA, funding_type=FundingType.PROC, **to_data
             )
 
         else: