From a31d285f17ae57be93f84ec37fe9d4d759d44b4b Mon Sep 17 00:00:00 2001
From: richard-dds <richard-ctr@friends.dds.mil>
Date: Wed, 24 Oct 2018 12:17:43 -0400
Subject: [PATCH] Requests pending CCPO apprval should not be given workspaces

---
 .../routes/requests/financial_verification.py |  2 +-
 tests/routes/test_financial_verification.py   | 27 +++++++++++++------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py
index 67008734..a2eb5d51 100644
--- a/atst/routes/requests/financial_verification.py
+++ b/atst/routes/requests/financial_verification.py
@@ -241,7 +241,7 @@ def update_financial_verification(request_id):
             extended=is_extended,
         )
 
-    if updated_request.is_pending_ccpo_approval:
+    if updated_request.is_approved:
         workspace = Requests.approve_and_create_workspace(updated_request)
         return redirect(
             url_for(
diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py
index 72be9d82..0b635962 100644
--- a/tests/routes/test_financial_verification.py
+++ b/tests/routes/test_financial_verification.py
@@ -10,20 +10,16 @@ from atst.routes.requests.financial_verification import (
     SaveFinancialVerificationDraft,
 )
 
-from tests.mocks import MOCK_REQUEST, MOCK_USER, MOCK_VALID_PE_ID
-from tests.factories import (
-    PENumberFactory,
-    RequestFactory,
-    UserFactory,
-    RequestStatusEventFactory,
-    RequestReviewFactory,
-)
+from tests.mocks import MOCK_VALID_PE_ID
+from tests.factories import RequestFactory, UserFactory
 from atst.forms.exceptions import FormValidationError
 from atst.domain.requests.financial_verification import (
     PENumberValidator,
     TaskOrderNumberValidator,
 )
 from atst.utils import pick
+from atst.models.request_status_event import RequestStatus
+from atst.domain.requests.query import RequestsQuery
 
 
 @pytest.fixture
@@ -347,3 +343,18 @@ def test_manual_task_order_triggers_extended_form(
         follow_redirects=False,
     )
     assert "extended" in response.headers["Location"]
+
+
+def test_manual_to_does_not_trigger_approval(client, user_session, fv_data, e_fv_data):
+    user = UserFactory.create()
+    request = RequestFactory.create(creator=user)
+    data = {**fv_data, **e_fv_data, "request-pe_id": "0101228N"}
+    user_session(user)
+    client.post(
+        url_for("requests.financial_verification", request_id=request.id, extended=True),
+        data=data,
+        follow_redirects=True
+    )
+
+    updated_request = RequestsQuery.get(request.id)
+    assert updated_request.status != RequestStatus.APPROVED