From 8994b3086c7507df7786b0f9d62eedc88927ee7a Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 15 Oct 2018 17:13:22 -0400 Subject: [PATCH] Formatting --- atst/domain/task_orders.py | 6 ++- .../routes/requests/financial_verification.py | 33 +++++++++---- tests/routes/test_financial_verification.py | 49 +++++-------------- 3 files changed, 40 insertions(+), 48 deletions(-) diff --git a/atst/domain/task_orders.py b/atst/domain/task_orders.py index b214293b..943447c2 100644 --- a/atst/domain/task_orders.py +++ b/atst/domain/task_orders.py @@ -29,7 +29,11 @@ class TaskOrders(object): to_data = TaskOrders._client().get_contract(order_number, status="y") if to_data: # TODO: we need to determine exactly what we're getting and storing from the EDA client - return TaskOrders.create(number=to_data["contract_no"], source=Source.EDA, funding_type=FundingType.PROC) + return TaskOrders.create( + number=to_data["contract_no"], + source=Source.EDA, + funding_type=FundingType.PROC, + ) else: raise NotFoundError("task_order") diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index 03518fe1..e9edcb78 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -13,7 +13,6 @@ from atst.domain.requests.financial_verification import ( class FinancialVerificationBase(object): - def _get_form(self, request, is_extended, input_data): data = input_data @@ -22,10 +21,12 @@ class FinancialVerificationBase(object): if request.task_order: task_order_dict = request.task_order.to_dictionary() - task_order_dict.update({ - "task_order_number": request.task_order.number, - "funding_type": request.task_order.funding_type.value - }) + task_order_dict.update( + { + "task_order_number": request.task_order.number, + "funding_type": request.task_order.funding_type.value, + } + ) data = {**data, **task_order_dict} mdict = ImmutableMultiDict(data) @@ -46,6 +47,7 @@ class FinancialVerificationBase(object): def _apply_task_order_number_error(self, field): field.errors += ("Task Order number not found",) + class GetFinancialVerificationForm(FinancialVerificationBase): def __init__(self, user, request, is_extended=False): self.user = user @@ -145,11 +147,19 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase): if not form.validate_draft(): valid = False - if valid and form.pe_id.data and not self.pe_validator.validate(self.request, form.pe_id.data): + if ( + valid + and form.pe_id.data + and not self.pe_validator.validate(self.request, form.pe_id.data) + ): self._apply_pe_number_error(form.pe_id) valid = False - if valid and form.task_order_number.data and not self.task_order_validator.validate(form.task_order_number.data): + if ( + valid + and form.task_order_number.data + and not self.task_order_validator.validate(form.task_order_number.data) + ): self._apply_task_order_number_error(form.task_order_number) valid = False @@ -157,17 +167,20 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase): form.reset() raise FormValidationError(form) else: - updated_request = Requests.update_financial_verification(self.request.id, form.data) + updated_request = Requests.update_financial_verification( + self.request.id, form.data + ) return {"request": updated_request} - @requests_bp.route("/requests/verify/", methods=["GET"]) def financial_verification(request_id): request = Requests.get(g.current_user, request_id) is_extended = http_request.args.get("extended") - response_context = GetFinancialVerificationForm(g.current_user, request, is_extended=is_extended).execute() + response_context = GetFinancialVerificationForm( + g.current_user, request, is_extended=is_extended + ).execute() return render_template( "requests/financial_verification.html", diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py index a800869c..3b290205 100644 --- a/tests/routes/test_financial_verification.py +++ b/tests/routes/test_financial_verification.py @@ -2,7 +2,10 @@ import pytest from unittest.mock import MagicMock from atst.eda_client import MockEDAClient -from atst.routes.requests.financial_verification import UpdateFinancialVerification, SaveFinancialVerificationDraft +from atst.routes.requests.financial_verification import ( + UpdateFinancialVerification, + SaveFinancialVerificationDraft, +) from tests.mocks import MOCK_REQUEST, MOCK_USER, MOCK_VALID_PE_ID from tests.factories import ( @@ -18,6 +21,7 @@ from atst.domain.requests.financial_verification import ( TaskOrderNumberValidator, ) + @pytest.fixture def fv_data(): return { @@ -43,6 +47,7 @@ TrueValidator.validate = MagicMock(return_value=True) FalseValidator = MagicMock() FalseValidator.validate = MagicMock(return_value=False) + class MockPEValidator(object): def validate(self, request, field): return True @@ -59,12 +64,7 @@ def test_update(fv_data): data = {**fv_data, "pe_id": MOCK_VALID_PE_ID} response_context = UpdateFinancialVerification( - TrueValidator, - TrueValidator, - user, - request, - data, - is_extended=False, + TrueValidator, TrueValidator, user, request, data, is_extended=False ).execute() assert response_context.get("workspace") @@ -75,12 +75,7 @@ def test_re_enter_pe_number(fv_data): user = UserFactory.create() data = {**fv_data, "pe_id": "0101228M"} update_fv = UpdateFinancialVerification( - PENumberValidator(), - TrueValidator, - user, - request, - data, - is_extended=False, + PENumberValidator(), TrueValidator, user, request, data, is_extended=False ) with pytest.raises(FormValidationError): @@ -112,12 +107,7 @@ def test_extended_fv_data(fv_data, extended_financial_verification_data): user = UserFactory.create() data = {**fv_data, **extended_financial_verification_data} update_fv = UpdateFinancialVerification( - TrueValidator, - TaskOrderNumberValidator(), - user, - request, - data, - is_extended=True, + TrueValidator, TaskOrderNumberValidator(), user, request, data, is_extended=True ) assert update_fv.execute() @@ -143,12 +133,7 @@ def test_save_empty_draft(): request = RequestFactory.create() user = UserFactory.create() save_draft = SaveFinancialVerificationDraft( - TrueValidator, - TrueValidator, - user, - request, - {}, - is_extended=False, + TrueValidator, TrueValidator, user, request, {}, is_extended=False ) assert save_draft.execute() @@ -158,12 +143,7 @@ def test_save_draft_with_invalid_task_order(fv_data): request = RequestFactory.create() user = UserFactory.create() save_draft = SaveFinancialVerificationDraft( - TrueValidator, - FalseValidator, - user, - request, - fv_data, - is_extended=False, + TrueValidator, FalseValidator, user, request, fv_data, is_extended=False ) with pytest.raises(FormValidationError): @@ -174,12 +154,7 @@ def test_save_draft_with_invalid_pe_number(fv_data): request = RequestFactory.create() user = UserFactory.create() save_draft = SaveFinancialVerificationDraft( - FalseValidator, - TrueValidator, - user, - request, - fv_data, - is_extended=False, + FalseValidator, TrueValidator, user, request, fv_data, is_extended=False ) with pytest.raises(FormValidationError):