From 965c5f3e0010866a2dbf9c2620f63d20270c5473 Mon Sep 17 00:00:00 2001 From: richard-dds Date: Mon, 15 Oct 2018 16:39:49 -0400 Subject: [PATCH] Pass field data, not field --- atst/domain/requests/financial_verification.py | 14 +++++++------- atst/routes/requests/financial_verification.py | 6 ++---- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/atst/domain/requests/financial_verification.py b/atst/domain/requests/financial_verification.py index cf3d5896..3197c53e 100644 --- a/atst/domain/requests/financial_verification.py +++ b/atst/domain/requests/financial_verification.py @@ -17,12 +17,12 @@ class PENumberValidator(object): re.X, ) - def validate(self, request, field): - if self._same_as_previous(request, field): + def validate(self, request, pe_id): + if self._same_as_previous(request, pe_id): return True try: - PENumbers.get(field.data) + PENumbers.get(pe_id) except NotFoundError: return False @@ -43,14 +43,14 @@ class PENumberValidator(object): return suggestion return None - def _same_as_previous(self, request, field): - return request.pe_number == field.data + def _same_as_previous(self, request, pe_id): + return request.pe_number == pe_id class TaskOrderNumberValidator(object): - def validate(self, field): + def validate(self, task_order_number): try: - TaskOrders.get(field.data) + TaskOrders.get(task_order_number) except NotFoundError: return False diff --git a/atst/routes/requests/financial_verification.py b/atst/routes/requests/financial_verification.py index c79dcecc..d2c6242e 100644 --- a/atst/routes/requests/financial_verification.py +++ b/atst/routes/requests/financial_verification.py @@ -92,7 +92,7 @@ class UpdateFinancialVerification(object): if not form.validate(): should_update = False - if not self.pe_validator.validate(self.request, form.pe_id): + if not self.pe_validator.validate(self.request, form.pe_id.data): suggestion = self.pe_validator.suggest_pe_id(form.pe_id.data) error_str = ( "We couldn't find that PE number. {}" @@ -102,7 +102,7 @@ class UpdateFinancialVerification(object): form.pe_id.errors += (error_str,) should_submit = False - if not self.task_order_validator.validate(form.task_order_number): + if not self.task_order_validator.validate(form.task_order_number.data): form.task_order_number.errors += ("Task Order number not found",) should_submit = False @@ -155,8 +155,6 @@ def update_financial_verification(request_id): fv_data = http_request.form is_extended = http_request.args.get("extended") - import ipdb; ipdb.set_trace() - try: response_context = UpdateFinancialVerification( PENumberValidator(),