From 1329cd82064bb545c1f7d8fb5355a5fb796dd2dc Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Tue, 9 Oct 2018 10:49:08 -0400
Subject: [PATCH] pass request directly to FinancialVerification class

---
 atst/routes/requests/financial_verification.py | 15 ++++++---------
 tests/routes/test_financial_verification.py    | 11 +----------
 2 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py
index 46d43b25..5b84392e 100644
--- a/atst/routes/requests/financial_verification.py
+++ b/atst/routes/requests/financial_verification.py
@@ -7,8 +7,8 @@ from atst.forms.financial import FinancialForm, ExtendedFinancialForm
 
 
 class FinancialVerification:
-    def __init__(self, user, request_id, extended=False, post_data=None):
-        self.request = Requests.get(user, request_id)
+    def __init__(self, request, extended=False, post_data=None):
+        self.request = request
         self._extended = extended
         self._post_data = post_data
         self._form = None
@@ -91,9 +91,8 @@ class FinancialVerification:
 
 @requests_bp.route("/requests/verify/<string:request_id>", methods=["GET"])
 def financial_verification(request_id):
-    finver = FinancialVerification(
-        g.current_user, request_id, extended=http_request.args.get("extended")
-    )
+    request = Requests.get(g.current_user, request_id)
+    finver = FinancialVerification(request, extended=http_request.args.get("extended"))
 
     return render_template(
         "requests/financial_verification.html",
@@ -106,11 +105,9 @@ def financial_verification(request_id):
 
 @requests_bp.route("/requests/verify/<string:request_id>", methods=["POST"])
 def update_financial_verification(request_id):
+    request = Requests.get(g.current_user, request_id)
     finver = FinancialVerification(
-        g.current_user,
-        request_id,
-        extended=http_request.args.get("extended"),
-        post_data=http_request.form,
+        request, extended=http_request.args.get("extended"), post_data=http_request.form
     )
 
     finver.validate()
diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py
index 0c20d7d4..91630abe 100644
--- a/tests/routes/test_financial_verification.py
+++ b/tests/routes/test_financial_verification.py
@@ -176,12 +176,6 @@ def test_displays_ccpo_review_comment(user_session, client):
 
 
 class TestFinancialVerification:
-    @pytest.fixture(scope="function", autouse=True)
-    def apply_monkeypath(self, monkeypatch):
-        monkeypatch.setattr(
-            "atst.domain.requests.Requests.get", lambda *args: self.request
-        )
-
     def _service_object(self, request=None, extended=False, post_data={}):
         if not request:
             self.request = RequestFactory.create()
@@ -189,10 +183,7 @@ class TestFinancialVerification:
             self.request = request
 
         return FinancialVerification(
-            UserFactory.create(),
-            self.request.id,
-            extended=extended,
-            post_data=post_data,
+            self.request, extended=extended, post_data=post_data
         )
 
     def test_is_extended(self):