- Integrating Jans changes. Parametrizing values_is_empty

tdrs-backend/tdpservice/parsers/parse.py

@@ -46,7 +46,7 @@ def parse_datafile(datafile):
         return errors
 
     is_encrypted = field_values["encryption"] == "E"
-    is_tribal = util.is_string_field_valid(field_values["tribe_code"], 3)
+    is_tribal = not validators.value_is_empty(field_values["tribe_code"], 3, extra_vals={'0'*3})
 
     logger.debug(f"Datafile has encrypted fields: {is_encrypted}.")
     logger.debug(f"Datafile: {datafile.__repr__()}, is Tribal: {is_tribal}.")

tdrs-backend/tdpservice/parsers/util.py

@@ -110,10 +110,6 @@ def update_encrypted_fields(self, is_encrypted):
                 if type(field) == TransformField and "is_encrypted" in field.kwargs:
                     field.kwargs['is_encrypted'] = is_encrypted
 
-def is_string_field_valid(val, field_length):
-    """Determine if the field's value is valid."""
-    return val not in {" "*field_length, None, "0"*field_length}
-
 def get_schema_options(program, section, query=None, model=None, model_name=None):
     """Centralized function to return the appropriate schema for a given program, section, and query.
 

tdrs-backend/tdpservice/parsers/validators.py

@@ -1,21 +1,22 @@
 """Generic parser validator functions for use in schema definitions."""
 
 from .models import ParserErrorCategoryChoices
-from .util import is_string_field_valid
 from datetime import date
 import logging
 
 logger = logging.getLogger(__name__)
 
 
-def value_is_empty(value, length):
+def value_is_empty(value, length, extra_vals={}):
     """Handle 'empty' values as field inputs."""
-    empty_values = [
+    empty_values = {
         '',
         ' '*length,  # '     '
         '#'*length,  # '#####'
         '_'*length,  # '_____'
-    ]
+    }
+
+    empty_values = empty_values.union(extra_vals)
 
     return value is None or value in empty_values
 
@@ -554,10 +555,10 @@ def validate_tribe_fips_program_agree(program_type, tribe_code, state_fips_code,
     """Validate tribe code, fips code, and program type all agree with eachother."""
     is_valid = False
 
-    if program_type == 'TAN' and (not is_string_field_valid(state_fips_code, 2)):
-        is_valid = is_string_field_valid(tribe_code, 3)
+    if program_type == 'TAN' and value_is_empty(state_fips_code, 2, extra_vals={'0'*2}):
+        is_valid = not value_is_empty(tribe_code, 3, extra_vals={'0'*3})
     else:
-        is_valid = not is_string_field_valid(tribe_code, 3)
+        is_valid = value_is_empty(tribe_code, 3, extra_vals={'0'*3})
 
     error = None
     if not is_valid: