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

change name of request relationship to legacy task order

Browse Source
This commit is contained in:
dandds
2018-12-12 16:42:40 -05:00
parent 2f515d7b47
commit e509c34cdd
27 changed files with 215 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
atst/domain/reports.py
View File

@@ -203,8 +203,8 @@ class Reports:
if workspace.name in REPORT_FIXTURE_MAP:
budget = REPORT_FIXTURE_MAP[workspace.name]["budget"]
spent = _sum_monthly_spend(REPORT_FIXTURE_MAP[workspace.name]["monthly"])
elif workspace.request and workspace.request.task_order:
ws_to = workspace.request.task_order
elif workspace.request and workspace.request.legacy_task_order:
ws_to = workspace.request.legacy_task_order
budget = ws_to.budget
# spent will be derived from CSP data
spent = 0

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

@@ -187,10 +187,12 @@ class Requests(object):
return Requests.status_count(RequestStatus.APPROVED)
@classmethod
def update_financial_verification(cls, request_id, financial_data, task_order=None):
def update_financial_verification(
cls, request_id, financial_data, legacy_task_order=None
):
request = RequestsQuery.get_with_lock(request_id)
if task_order:
request.task_order = task_order
if legacy_task_order:
request.legacy_task_order = legacy_task_order
request = Requests._update(request, {"financial_verification": financial_data})
return request

22
atst/domain/task_orders.py
View File

@@ -15,16 +15,16 @@ class TaskOrders(object):
@classmethod
def get(cls, order_number):
try:
task_order = (
legacy_task_order = (
db.session.query(LegacyTaskOrder).filter_by(number=order_number).one()
)
except NoResultFound:
if TaskOrders._client():
task_order = TaskOrders.get_from_eda(order_number)
legacy_task_order = TaskOrders.get_from_eda(order_number)
else:
raise NotFoundError("task_order")
raise NotFoundError("legacy_task_order")
return task_order
return legacy_task_order
@classmethod
def get_from_eda(cls, order_number):
@@ -36,25 +36,27 @@ class TaskOrders(object):
)
else:
raise NotFoundError("task_order")
raise NotFoundError("legacy_task_order")
@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 = LegacyTaskOrder(source=source, **to_data)
legacy_task_order = LegacyTaskOrder(source=source, **to_data)
db.session.add(task_order)
db.session.add(legacy_task_order)
db.session.commit()
return task_order
return legacy_task_order
@classmethod
def _client(cls):
return app.eda_client
@classmethod
def update(cls, task_order, dct):
updated = update_obj(task_order, dct, ignore_vals=lambda v: v in ["", None])
def update(cls, legacy_task_order, dct):
updated = update_obj(
legacy_task_order, dct, ignore_vals=lambda v: v in ["", None]
)
db.session.add(updated)
db.session.commit()
return updated