Refactor fv form to separate TO from request

atst/domain/requests/requests.py

@@ -82,9 +82,7 @@ class Requests(object):
         revision = create_revision_from_request_body(new_body)
         request.revisions.append(revision)
 
-        request = RequestsQuery.add_and_commit(request)
-
-        return request
+        return RequestsQuery.add_and_commit(request)
 
     @classmethod
     def approve_and_create_workspace(cls, request):
@@ -160,29 +158,10 @@ class Requests(object):
     def update_financial_verification(cls, request_id, financial_data, task_order=None):
         request = RequestsQuery.get_with_lock(request_id)
 
-        delta = pick(
-            [
-                "uii_ids",
-                "pe_id",
-                "treasury_code",
-                "ba_code",
-                "fname_co",
-                "lname_co",
-                "email_co",
-                "office_co",
-                "fname_cor",
-                "lname_cor",
-                "email_cor",
-                "office_cor",
-            ],
-            financial_data,
-        )
-
         if task_order:
             request.task_order = task_order
 
-        request = Requests._update(request, {"financial_verification": delta})
-
+        request = Requests._update(request, {"financial_verification": financial_data})
         return request
 
     @classmethod

atst/domain/task_orders.py

@@ -19,14 +19,14 @@ class TaskOrders(object):
             )
         except NoResultFound:
             if TaskOrders._client():
-                task_order = TaskOrders._get_from_eda(order_number)
+                task_order = TaskOrders.get_from_eda(order_number)
             else:
                 raise NotFoundError("task_order")
 
         return task_order
 
     @classmethod
-    def _get_from_eda(cls, order_number):
+    def get_from_eda(cls, order_number):
         to_data = TaskOrders._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
@@ -38,9 +38,9 @@ class TaskOrders(object):
             raise NotFoundError("task_order")
 
     @classmethod
-    def create(cls, **kwargs):
-        to_data = drop(["source"], kwargs)
-        task_order = TaskOrder(source=Source.MANUAL, **to_data)
+    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)
 
         db.session.add(task_order)
         db.session.commit()
@@ -51,33 +51,6 @@ class TaskOrders(object):
     def _client(cls):
         return app.eda_client
 
-    @classmethod
-    def get_or_create_task_order(cls, number, task_order_data=None):
-        try:
-            return TaskOrders.get(number)
-
-        except NotFoundError:
-            if task_order_data:
-                pdf_file = task_order_data.pop("pdf")
-                # should catch the error here
-                attachment = Attachment.attach(pdf_file)
-                return TaskOrders.create(
-                    **task_order_data,
-                    number=number,
-                    source=Source.MANUAL,
-                    pdf=attachment,
-                )
-
-    @classmethod
-    def get_or_create(cls, number, attachment=None, data=None):
-        try:
-            return TaskOrders.get(number)
-        except NotFoundError:
-            data = data or {}
-            return TaskOrders.create(
-                **data, number=number, pdf=attachment, source=Source.MANUAL
-            )
-
     @classmethod
     def update(cls, task_order, dct):
         updated = update_obj(task_order, dct)