From 60275f8c3afd754106b1a16869421a9f262bf12a Mon Sep 17 00:00:00 2001 From: richard-dds Date: Wed, 29 Aug 2018 12:52:20 -0400 Subject: [PATCH] Check that request is financially verified before approving --- atst/models/request.py | 8 ++++++++ atst/routes/requests/financial_verification.py | 3 +-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/atst/models/request.py b/atst/models/request.py index 3d79a706..9180e85e 100644 --- a/atst/models/request.py +++ b/atst/models/request.py @@ -35,3 +35,11 @@ class Request(Base): def annual_spend(self): monthly = self.body.get("details_of_use", {}).get("estimated_monthly_spend", 0) return monthly * 12 + + @property + def financial_verification(self): + return self.body.get("financial_verification") + + @property + def is_financially_verified(self): + return self.task_order is not None diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index d3606f3b..50f04102 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -39,8 +39,7 @@ def update_financial_verification(request_id): existing_request.body.get("financial_verification") ) updated_request = Requests.update_financial_verification(request_id, form.data) - if valid: - Requests.submit_financial_verification(request_id) + if valid and updated_request.is_financially_verified: new_workspace = Requests.approve_and_create_workspace(updated_request) return redirect( url_for(