Raise instead of returning None

This commit is contained in:
richard-dds 2018-08-27 14:54:45 -04:00
parent a2d4602f0c
commit 3ab528f192

View File

@ -99,9 +99,6 @@ class Requests(object):
@classmethod @classmethod
def update(cls, request_id, request_delta): def update(cls, request_id, request_delta):
request = Requests._get_with_lock(request_id) request = Requests._get_with_lock(request_id)
if not request:
return
request = Requests._merge_body(request, request_delta) request = Requests._merge_body(request, request_delta)
db.session.add(request) db.session.add(request)
@ -122,7 +119,7 @@ class Requests(object):
) )
except NoResultFound: except NoResultFound:
return raise NotFoundError()
@classmethod @classmethod
def _merge_body(cls, request, request_delta): def _merge_body(cls, request, request_delta):
@ -236,8 +233,6 @@ WHERE requests_with_status.status = :status
@classmethod @classmethod
def update_financial_verification(cls, request_id, financial_data): def update_financial_verification(cls, request_id, financial_data):
request = Requests._get_with_lock(request_id) request = Requests._get_with_lock(request_id)
if not request:
return
request_data = financial_data.copy() request_data = financial_data.copy()
task_order_data = { task_order_data = {
@ -275,10 +270,9 @@ WHERE requests_with_status.status = :status
@classmethod @classmethod
def submit_financial_verification(cls, request_id): def submit_financial_verification(cls, request_id):
request = Requests._get_with_lock(request_id) request = Requests._get_with_lock(request_id)
if not request:
return
Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL) Requests.set_status(request, RequestStatus.PENDING_CCPO_APPROVAL)
db.session.add(request) db.session.add(request)
db.session.commit() db.session.commit()
return request