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

Simplify return values

Browse Source
This commit is contained in:
richard-dds 2018-10-16 16:34:36 -04:00
parent 96c0378277
commit 4f1a3e8d0f
2 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
atst/routes/requests/financial_verification.py
View File

@ -56,8 +56,7 @@ class GetFinancialVerificationForm(FinancialVerificationBase):
self.is_extended = is_extended
def execute(self):
form = self._get_form(self.request, self.is_extended)
return {"form": form}
return self._get_form(self.request, self.is_extended)
class UpdateFinancialVerification(FinancialVerificationBase):
@ -83,8 +82,6 @@ class UpdateFinancialVerification(FinancialVerificationBase):
should_update = True
should_submit = True
updated_request = None
submitted = False
workspace = None
if not form.validate():
should_update = False
@ -101,25 +98,10 @@ class UpdateFinancialVerification(FinancialVerificationBase):
updated_request = Requests.update_financial_verification(
self.request.id, form.data
)
else:
self._raise(form)
if should_submit:
return Requests.submit_financial_verification(updated_request)
if should_submit:
updated_request = Requests.submit_financial_verification(updated_request)
if updated_request.is_financially_verified:
workspace = Requests.approve_and_create_workspace(updated_request)
submitted = True
else:
self._raise(form)
if submitted:
return {
"state": "submitted",
"workspace": workspace,
"request": updated_request,
}
else:
return {"state": "pending", "request": updated_request}
self._raise(form)
class SaveFinancialVerificationDraft(FinancialVerificationBase):
@ -163,7 +145,7 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase):
)
if valid:
return {"request": updated_request}
return updated_request
else:
self._raise(form)
@ -173,13 +155,13 @@ def financial_verification(request_id):
request = Requests.get(g.current_user, request_id)
is_extended = http_request.args.get("extended")
response_context = GetFinancialVerificationForm(
form = GetFinancialVerificationForm(
g.current_user, request, is_extended=is_extended
).execute()
return render_template(
"requests/financial_verification.html",
f=response_context["form"],
f=form,
jedi_request=request,
review_comment=request.review_comment,
extended=is_extended,
@ -193,7 +175,7 @@ def update_financial_verification(request_id):
is_extended = http_request.args.get("extended")
try:
response_context = UpdateFinancialVerification(
updated_request = UpdateFinancialVerification(
PENumberValidator(),
TaskOrderNumberValidator(),
g.current_user,
@ -209,14 +191,14 @@ def update_financial_verification(request_id):
extended=is_extended,
)
if response_context["state"] == "submitted":
workspace = response_context["workspace"]
if updated_request.is_pending_ccpo_approval:
workspace = Requests.approve_and_create_workspace(updated_request)
return redirect(
url_for(
"workspaces.new_project", workspace_id=workspace.id, newWorkspace=True
)
)
elif response_context["state"] == "pending":
else:
return redirect(url_for("requests.requests_index", modal="pendingCCPOApproval"))

18
tests/routes/test_financial_verification.py
View File

@ -54,11 +54,12 @@ def test_update_fv(fv_data):
user = UserFactory.create()
data = {**fv_data, "pe_id": MOCK_VALID_PE_ID}
response_context = UpdateFinancialVerification(
updated_request = UpdateFinancialVerification(
TrueValidator, TrueValidator, user, request, data, is_extended=False
).execute()
assert response_context.get("workspace")
assert updated_request.is_pending_ccpo_approval
def test_update_fv_re_enter_pe_number(fv_data):
@ -71,9 +72,9 @@ def test_update_fv_re_enter_pe_number(fv_data):
with pytest.raises(FormValidationError):
update_fv.execute()
response_context = update_fv.execute()
updated_request = update_fv.execute()
assert response_context.get("status", "submitted")
assert updated_request.is_pending_ccpo_approval
def test_update_fv_invalid_task_order_number(fv_data):
@ -123,10 +124,10 @@ def test_update_fv_missing_extended_data(fv_data):
def test_update_fv_submission(fv_data):
request = RequestFactory.create()
user = UserFactory.create()
response_context = UpdateFinancialVerification(
updated_request = UpdateFinancialVerification(
TrueValidator, TrueValidator, user, request, fv_data
).execute()
assert response_context
assert updated_request
def test_save_empty_draft():
@ -147,8 +148,7 @@ def test_save_draft_with_ba_code():
TrueValidator, TrueValidator, user, request, data, is_extended=False
)
response_context = save_draft.execute()
request = response_context["request"]
assert save_draft.execute()
def test_save_draft_with_invalid_task_order(fv_data):
@ -183,7 +183,7 @@ def test_save_draft_re_enter_pe_number(fv_data):
with pytest.raises(FormValidationError):
save_fv.execute()
response_context = save_fv.execute()
save_fv.execute()
def test_update_fv_route(client, user_session, fv_data):