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

fix requests methods after rebase

Browse Source
This commit is contained in:
dandds 2018-08-23 09:28:08 -04:00
parent b2ec0764a7
commit 40320baf10
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
atst/domain/requests.py
View File

@ -106,6 +106,8 @@ class Requests(object):
db.session.add(request) db.session.add(request)
db.session.commit() db.session.commit()
return request
@classmethod @classmethod
def _get_with_lock(cls, request_id): def _get_with_lock(cls, request_id):
try: try:
@ -130,8 +132,6 @@ class Requests(object):
return request return request
return request
@classmethod @classmethod
def approve_and_create_workspace(cls, request): def approve_and_create_workspace(cls, request):
approved_request = Requests.set_status(request, RequestStatus.APPROVED) approved_request = Requests.set_status(request, RequestStatus.APPROVED)
@ -247,11 +247,13 @@ WHERE requests_with_status.status = :status
request.task_order = task_order request.task_order = task_order
db.session.add(task_order) db.session.add(task_order)
Requests._merge_body(request, {"financial_verification": request_data}) request = Requests._merge_body(request, {"financial_verification": request_data})
db.session.add(request) db.session.add(request)
db.session.commit() db.session.commit()
return request
@classmethod @classmethod
def _get_or_create_task_order(cls, number, task_order_data=None): def _get_or_create_task_order(cls, number, task_order_data=None):
if task_order_data: if task_order_data: