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

DRY out pe_number and task_order_number errors

Browse Source
This commit is contained in:
richard-dds 2018-10-15 17:12:43 -04:00
parent 789e5c0906
commit aef4878a39
1 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,6 +34,17 @@ class FinancialVerificationBase(object):
else:
return FinancialForm(formdata=mdict)
def _apply_pe_number_error(self, field):
suggestion = self.pe_validator.suggest_pe_id(field.data)
error_str = (
"We couldn't find that PE number. {}"
"If you have double checked it you can submit anyway. "
"Your request will need to go through a manual review."
).format('Did you mean "{}"? '.format(suggestion) if suggestion else "")
field.errors += (error_str,)
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):
@ -76,17 +87,11 @@ class UpdateFinancialVerification(FinancialVerificationBase):
should_update = False
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. {}"
"If you have double checked it you can submit anyway. "
"Your request will need to go through a manual review."
).format('Did you mean "{}"? '.format(suggestion) if suggestion else "")
form.pe_id.errors += (error_str,)
self._apply_pe_number_error(form.pe_id)
should_submit = False
if not self.task_order_validator.validate(form.task_order_number.data):
form.task_order_number.errors += ("Task Order number not found",)
self._apply_task_order_number_error(form.task_order_number)
should_submit = False
if should_update:
@ -141,17 +146,11 @@ class SaveFinancialVerificationDraft(FinancialVerificationBase):
valid = False
if valid and form.pe_id.data and 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. {}"
"If you have double checked it you can submit anyway. "
"Your request will need to go through a manual review."
).format('Did you mean "{}"? '.format(suggestion) if suggestion else "")
form.pe_id.errors += (error_str,)
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):
form.task_order_number.errors += ("Task Order number not found",)
self._apply_task_order_number_error(form.task_order_number)
valid = False
if not valid: