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

pass request directly to FinancialVerification class

Browse Source
This commit is contained in:
dandds 2018-10-09 10:49:08 -04:00
parent 39c5f3e00e
commit 1329cd8206
2 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -7,8 +7,8 @@ from atst.forms.financial import FinancialForm, ExtendedFinancialForm
class FinancialVerification: class FinancialVerification:
def __init__(self, user, request_id, extended=False, post_data=None): def __init__(self, request, extended=False, post_data=None):
self.request = Requests.get(user, request_id) self.request = request
self._extended = extended self._extended = extended
self._post_data = post_data self._post_data = post_data
self._form = None self._form = None
@ -91,9 +91,8 @@ class FinancialVerification:
@requests_bp.route("/requests/verify/<string:request_id>", methods=["GET"]) @requests_bp.route("/requests/verify/<string:request_id>", methods=["GET"])
def financial_verification(request_id): def financial_verification(request_id):
finver = FinancialVerification( request = Requests.get(g.current_user, request_id)
g.current_user, request_id, extended=http_request.args.get("extended") finver = FinancialVerification(request, extended=http_request.args.get("extended"))
)
return render_template( return render_template(
"requests/financial_verification.html", "requests/financial_verification.html",
@ -106,11 +105,9 @@ def financial_verification(request_id):
@requests_bp.route("/requests/verify/<string:request_id>", methods=["POST"]) @requests_bp.route("/requests/verify/<string:request_id>", methods=["POST"])
def update_financial_verification(request_id): def update_financial_verification(request_id):
request = Requests.get(g.current_user, request_id)
finver = FinancialVerification( finver = FinancialVerification(
g.current_user, request, extended=http_request.args.get("extended"), post_data=http_request.form
request_id,
extended=http_request.args.get("extended"),
post_data=http_request.form,
) )
finver.validate() finver.validate()

11
tests/routes/test_financial_verification.py
View File

@ -176,12 +176,6 @@ def test_displays_ccpo_review_comment(user_session, client):
class TestFinancialVerification: 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={}): def _service_object(self, request=None, extended=False, post_data={}):
if not request: if not request:
self.request = RequestFactory.create() self.request = RequestFactory.create()
@ -189,10 +183,7 @@ class TestFinancialVerification:
self.request = request self.request = request
return FinancialVerification( return FinancialVerification(
UserFactory.create(), self.request, extended=extended, post_data=post_data
self.request.id,
extended=extended,
post_data=post_data,
) )
def test_is_extended(self): def test_is_extended(self):