From e30d4e238c315a8cdc979b7827bcf3b73df5e507 Mon Sep 17 00:00:00 2001
From: dandds <dan-ctr@friends.dds.mil>
Date: Thu, 23 Aug 2018 10:11:00 -0400
Subject: [PATCH] expect CLIN data with no commas from the financial
 verification form

---
 atst/forms/financial.py                     | 20 +++++++++-----------
 tests/routes/test_financial_verification.py | 12 ++++++------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/atst/forms/financial.py b/atst/forms/financial.py
index 1402daa7..83ee7e37 100644
--- a/atst/forms/financial.py
+++ b/atst/forms/financial.py
@@ -68,11 +68,9 @@ def validate_task_order_number(field):
     return True
 
 
-def formatted_number_to_int(num):
-    if not num:
-        return
-    else:
-        return int(num.replace(",",""))
+def number_to_int(num):
+    if num:
+        return int(num)
 
 
 class BaseFinancialForm(ValidatedForm):
@@ -171,40 +169,40 @@ class ExtendedFinancialForm(BaseFinancialForm):
         "<dl><dt>CLIN 0001</dt> - <dd>Unclassified IaaS and PaaS Amount</dd></dl>",
         validators=[Required()],
         description="Review your task order document, the amounts for each CLIN must match exactly here",
-        filters=[formatted_number_to_int]
+        filters=[number_to_int]
     )
 
     clin_0003 = StringField(
         "<dl><dt>CLIN 0003</dt> - <dd>Unclassified Cloud Support Package</dd></dl>",
         validators=[Required()],
         description="Review your task order document, the amounts for each CLIN must match exactly here",
-        filters=[formatted_number_to_int]
+        filters=[number_to_int]
     )
 
     clin_1001 = StringField(
         "<dl><dt>CLIN 1001</dt> - <dd>Unclassified IaaS and PaaS Amount <br> OPTION PERIOD 1</dd></dl>",
         validators=[Required()],
         description="Review your task order document, the amounts for each CLIN must match exactly here",
-        filters=[formatted_number_to_int]
+        filters=[number_to_int]
     )
 
     clin_1003 = StringField(
         "<dl><dt>CLIN 1003</dt> - <dd>Unclassified Cloud Support Package <br> OPTION PERIOD 1</dd></dl>",
         validators=[Required()],
         description="Review your task order document, the amounts for each CLIN must match exactly here",
-        filters=[formatted_number_to_int]
+        filters=[number_to_int]
     )
 
     clin_2001 = StringField(
         "<dl><dt>CLIN 2001</dt> - <dd>Unclassified IaaS and PaaS Amount <br> OPTION PERIOD 2</dd></dl>",
         validators=[Required()],
         description="Review your task order document, the amounts for each CLIN must match exactly here",
-        filters=[formatted_number_to_int]
+        filters=[number_to_int]
     )
 
     clin_2003 = StringField(
         "<dl><dt>CLIN 2003</dt> - <dd>Unclassified Cloud Support Package <br> OPTION PERIOD 2</dd></dl>",
         validators=[Required()],
         description="Review your task order document, the amounts for each CLIN must match exactly here",
-        filters=[formatted_number_to_int]
+        filters=[number_to_int]
     )
diff --git a/tests/routes/test_financial_verification.py b/tests/routes/test_financial_verification.py
index d6552846..ccb8c119 100644
--- a/tests/routes/test_financial_verification.py
+++ b/tests/routes/test_financial_verification.py
@@ -27,12 +27,12 @@ class TestPENumberInForm:
     extended_data = {
         "funding_type": "RDTE",
         "funding_type_other": "other",
-        "clin_0001": "50,000",
-        "clin_0003": "13,000",
-        "clin_1001": "30,000",
-        "clin_1003": "7,000",
-        "clin_2001": "30,000",
-        "clin_2003": "7,000",
+        "clin_0001": "50000",
+        "clin_0003": "13000",
+        "clin_1001": "30000",
+        "clin_1003": "7000",
+        "clin_2001": "30000",
+        "clin_2003": "7000",
     }
 
     def _set_monkeypatches(self, monkeypatch):