WIP on #773.

mjordan · May 14, 2024 · 4eb35e7 · 4eb35e7
1 parent fe70000
commit 4eb35e7
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 9 deletions.
diff --git a/tests/unit_tests.py b/tests/unit_tests.py
@@ -844,6 +844,11 @@ def test_value_is_numeric(self):
             res = workbench_utils.value_is_numeric(value)
             self.assertTrue(res, "Value " + str(value) + " is not numeric.")
 
+        values = ["200.23", "0.5", 999.999]
+        for value in values:
+            res = workbench_utils.value_is_numeric(value, allow_decimals=True)
+            self.assertTrue(res, "Value " + str(value) + " is not numeric.")
+
     def test_value_is_not_numeric(self):
         values = ["n200", False, "999-1000"]
         for value in values:

diff --git a/workbench_fields.py b/workbench_fields.py
@@ -86,9 +86,13 @@ def create(self, config, field_definitions, entity, row, field_name):
             ):
                 field_values.append({"value": subvalue, "format": text_format})
             else:
-                if field_definitions[field_name]["field_type"] == "integer":
+                if field_definitions[field_name][
+                    "field_type"
+                ] == "integer" and value_is_numeric(subvalue):
                     subvalue = int(subvalue)
-                if field_definitions[field_name]["field_type"] == "float":
+                if field_definitions[field_name][
+                    "field_type"
+                ] == "float" and value_is_numeric(subvalue, allow_decimals=True):
                     subvalue = float(subvalue)
                 field_values.append({"value": subvalue})
         field_values = self.dedupe_values(field_values)
@@ -163,9 +167,13 @@ def update(
                         {"value": subvalue, "format": text_format}
                     )
                 else:
-                    if field_definitions[field_name]["field_type"] == "integer":
+                    if field_definitions[field_name][
+                        "field_type"
+                    ] == "integer" and value_is_numeric(subvalue):
                         subvalue = int(subvalue)
-                    if field_definitions[field_name]["field_type"] == "float":
+                    if field_definitions[field_name][
+                        "field_type"
+                    ] == "float" and value_is_numeric(subvalue, allow_decimals=True):
                         subvalue = float(subvalue)
                     entity[field_name].append({"value": subvalue})
             entity[field_name] = self.dedupe_values(entity[field_name])
@@ -199,9 +207,13 @@ def update(
                 ):
                     field_values.append({"value": subvalue, "format": text_format})
                 else:
-                    if field_definitions[field_name]["field_type"] == "integer":
+                    if field_definitions[field_name][
+                        "field_type"
+                    ] == "integer" and value_is_numeric(subvalue):
                         subvalue = int(subvalue)
-                    if field_definitions[field_name]["field_type"] == "float":
+                    if field_definitions[field_name][
+                        "field_type"
+                    ] == "float" and value_is_numeric(subvalue, allow_decimals=True):
                         subvalue = float(subvalue)
                     entity[field_name].append({"value": subvalue})
                     field_values.append({"value": subvalue})
@@ -259,6 +271,38 @@ def remove_invalid_values(self, config, field_definitions, field_name, values):
                     )
                     logging.warning(message)
             return valid_values
+        elif field_definitions[field_name]["field_type"] == "integer":
+            valid_values = list()
+            for subvalue in values:
+                if value_is_numeric(subvalue) is True:
+                    valid_values.append(subvalue)
+                else:
+                    message = (
+                        'Value "'
+                        + subvalue
+                        + '" in field "'
+                        + field_name
+                        + '" is not a valid integer field value.'
+                    )
+                    logging.warning(message)
+            return valid_values
+        elif field_definitions[field_name]["field_type"] in ["decimal", "float"]:
+            valid_values = list()
+            for subvalue in values:
+                if value_is_numeric(subvalue, allow_decimals=True) is True:
+                    valid_values.append(subvalue)
+                else:
+                    message = (
+                        'Value "'
+                        + subvalue
+                        + '" in field "'
+                        + field_name
+                        + '" is not a valid '
+                        + field_definitions[field_name]["field_type"]
+                        + " field value."
+                    )
+                    logging.warning(message)
+            return valid_values
         elif field_definitions[field_name]["field_type"] == "list_string":
             valid_values = list()
             for subvalue in values:

diff --git a/workbench_utils.py b/workbench_utils.py
@@ -6483,9 +6483,26 @@ def get_field_vocabularies(config, field_definitions, field_name):
         return False
 
 
-def value_is_numeric(value):
-    """Tests to see if value is numeric."""
-    var = str(value)
+def value_is_numeric(value, allow_decimals=False):
+    """Tests to see if value  is numeric."""
+
+    """Parameters
+    ----------
+    value : varies
+        The value to check. By design, we don't know what data type it is.
+    allow_decimals: boolean
+        Whether or not to allow '.' in the value. Decimal and float number types have decimals.
+
+    Returns
+    -------
+    boolean
+    """
+    if allow_decimals is True:
+        if "." in str(value):
+            var = str(value).replace(".", "")
+    else:
+        var = str(value)
+
     var = var.strip()
     if var.isnumeric():
         return True