pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rebase fixes

Browse Source
This commit is contained in:
richard-dds 2018-10-19 15:33:59 -04:00
parent 99a61aa9a6
commit da7b02d4f0
3 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
alembic/versions/9c24c609878a_resource_attachments.py
View File

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

24
atst/domain/requests/requests.py
View File

@ -1,7 +1,5 @@
from werkzeug.datastructures import FileStorage
import dateutil import dateutil
from atst.domain.task_orders import TaskOrders
from atst.domain.workspaces import Workspaces from atst.domain.workspaces import Workspaces
from atst.models.request_revision import RequestRevision from atst.models.request_revision import RequestRevision
from atst.models.request_status_event import RequestStatusEvent, RequestStatus from atst.models.request_status_event import RequestStatusEvent, RequestStatus
@ -166,26 +164,6 @@ class Requests(object):
): ):
request = RequestsQuery.get_with_lock(request_id) 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( delta = pick(
[ [
"uii_ids", "uii_ids",
@ -203,7 +181,7 @@ class Requests(object):
], ],
financial_data, financial_data,
) )
delta = {**delta, "extended": extended} delta["extended"] = extended
if task_order: if task_order:
request.task_order = task_order request.task_order = task_order

4
atst/domain/task_orders.py
View File

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