From ed7d508e305af30af08aed5f0170e0fa3d0c96d4 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 15 Oct 2018 15:16:20 -0400 Subject: [PATCH] Add funding type for task order --- atst/domain/task_orders.py | 4 ++-- atst/routes/requests/financial_verification.py | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index b8653af5..b214293b 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -2,7 +2,7 @@ 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 +from atst.models.task_order import TaskOrder, Source, FundingType from atst.models.attachment import Attachment from .exceptions import NotFoundError @@ -29,7 +29,7 @@ class TaskOrders(object): 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 - return TaskOrders.create(source=Source.EDA, **to_data) + return TaskOrders.create(number=to_data["contract_no"], source=Source.EDA, funding_type=FundingType.PROC) else: raise NotFoundError("task_order") diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index f4486e7a..2ec1b4da 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -19,6 +19,11 @@ class GetFinancialVerificationForm(object): def _get_form(self): data = {} + + fv_data = self.request.body.get("financial_verification") + if fv_data: + data = {**data, **fv_data} + if self.request.task_order: task_order_dict = self.request.task_order.to_dictionary() task_order_dict.update({