diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index 63e5dd401f..590ca4ea1e 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -31,7 +31,7 @@ required=True, validators=[]), Field(item="9", name='FAMILY_TYPE', type='number', startIndex=32, endIndex=33, required=True, validators=[]), - Field(item="10", name='TANF_ASST_IN_6MONTHS', type='number', startIndex=33, endIndex=34, + Field(item="10", name='TANF_ASST_IN_6MONTHS', type='number', startIndex=33, endIndex=34, required=True, validators=[]), Field(item="11", name='RECEIVES_SUB_HOUSING', type='number', startIndex=34, endIndex=35, required=True, validators=[]), diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 081cef16bb..c14e8068f0 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -14,76 +14,76 @@ postparsing_validators=[ cat3_validate_t1, validators.if_then_validator( - condition_field='DISPOSITION', condition_function=validators.matches(2), - result_field='RPT_MONTH_YEAR', result_function=validators.notEmpty(), + condition_field='DISPOSITION', condition_function=validators.matches(2), + result_field='RPT_MONTH_YEAR', result_function=validators.notEmpty(), ), validators.if_then_validator( - condition_field='DISPOSITION', condition_function=validators.matches(2), - result_field='STRATUM', result_function=validators.notEmpty(), + condition_field='DISPOSITION', condition_function=validators.matches(2), + result_field='STRATUM', result_function=validators.notEmpty(), ), validators.if_then_validator( - condition_field='DISPOSITION', condition_function=validators.matches(2), - result_field='CASE_NUMBER', result_function=validators.notEmpty(), + condition_field='DISPOSITION', condition_function=validators.matches(2), + result_field='CASE_NUMBER', result_function=validators.notEmpty(), ), validators.if_then_validator( - condition_field='CASH_AMOUNT', condition_function=validators.isLargerThan(0), - result_field='NBR_MONTHS', result_function=validators.isLargerThan(0), + condition_field='CASH_AMOUNT', condition_function=validators.isLargerThan(0), + result_field='NBR_MONTHS', result_function=validators.isLargerThan(0), ), validators.if_then_validator( - condition_field='CC_AMOUNT', condition_function=validators.isLargerThan(0), - result_field='CC_NBR_MONTHS', result_function=validators.isLargerThan(0), + condition_field='CC_AMOUNT', condition_function=validators.isLargerThan(0), + result_field='CC_NBR_MONTHS', result_function=validators.isLargerThan(0), ), validators.if_then_validator( condition_field='CC_AMOUNT', condition_function=validators.isLargerThan(0), result_field='CHILDREN_COVERED', result_function=validators.isLargerThan(0), ), validators.if_then_validator( - condition_field='TRANS_AMOUNT', condition_function=validators.isLargerThan(0), - result_field='TRANSP_NBR_MONTHS', result_function=validators.isLargerThan(0), + condition_field='TRANS_AMOUNT', condition_function=validators.isLargerThan(0), + result_field='TRANSP_NBR_MONTHS', result_function=validators.isLargerThan(0), ), validators.if_then_validator( - condition_field='TRANSITION_SERVICES_AMOUNT', condition_function=validators.isLargerThan(0), - result_field='TRANSITION_NBR_MONTHS', result_function=validators.isLargerThan(0), + condition_field='TRANSITION_SERVICES_AMOUNT', condition_function=validators.isLargerThan(0), + result_field='TRANSITION_NBR_MONTHS', result_function=validators.isLargerThan(0), ), validators.if_then_validator( condition_field='OTHER_AMOUNT', condition_function=validators.isLargerThan(0), - result_field='OTHER_NBR_MONTHS', result_function=validators.isLargerThan(0), + result_field='OTHER_NBR_MONTHS', result_function=validators.isLargerThan(0), ), validators.if_then_validator( - condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), - result_field='WORK_REQ_SANCTION', result_function=validators.oneOf(1,2), + condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), + result_field='WORK_REQ_SANCTION', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( - condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), - result_field='FAMILY_SANC_ADULT', result_function=validators.oneOf(1,2), + condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), + result_field='FAMILY_SANC_ADULT', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( - condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), - result_field='SANC_TEEN_PARENT', result_function=validators.oneOf(1,2), + condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), + result_field='SANC_TEEN_PARENT', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( - condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), - result_field='NON_COOPERATION_CSE', result_function=validators.oneOf(1,2), + condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), + result_field='NON_COOPERATION_CSE', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( - condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), - result_field='FAILURE_TO_COMPLY', result_function=validators.oneOf(1,2), - ), + condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), + result_field='FAILURE_TO_COMPLY', result_function=validators.oneOf([1, 2]), + ), validators.if_then_validator( - condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), - result_field='OTHER_SANCTION', result_function=validators.oneOf(1,2), + condition_field='SANC_REDUCTION_AMT', condition_function=validators.isLargerThan(0), + result_field='OTHER_SANCTION', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='OTHER_TOTAL_REDUCTIONS', condition_function=validators.isLargerThan(0), - result_field='FAMILY_CAP', result_function=validators.oneOf(1,2), + result_field='FAMILY_CAP', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='OTHER_TOTAL_REDUCTIONS', condition_function=validators.isLargerThan(0), - result_field='REDUCTIONS_ON_RECEIPTS', result_function=validators.oneOf(1,2), + result_field='REDUCTIONS_ON_RECEIPTS', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( - condition_field='OTHER_TOTAL_REDUCTIONS', condition_function=validators.isLargerThan(0), - result_field='OTHER_NON_SANCTION', result_function=validators.oneOf(1,2), + condition_field='OTHER_TOTAL_REDUCTIONS', condition_function=validators.isLargerThan(0), + result_field='OTHER_NON_SANCTION', result_function=validators.oneOf([1, 2]), ) ], fields=[ @@ -226,7 +226,7 @@ required=True, validators=[]), Field(item="26CIII", name='REDUCTIONS_ON_RECEIPTS', type='number', startIndex=111, endIndex=112, required=True, validators=[]), - Field(item="26CIV", name='OTHER_NON_SANCTION', type='number', startIndex=112, endIndex=113, #CiV + Field(item="26CIV", name='OTHER_NON_SANCTION', type='number', startIndex=112, endIndex=113, required=True, validators=[]), Field(item="27", name='WAIVER_EVAL_CONTROL_GRPS', type='number', startIndex=113, endIndex=114, required=True, validators=[ @@ -234,12 +234,12 @@ ]), Field(item="28", name='FAMILY_EXEMPT_TIME_LIMITS', type='number', startIndex=114, endIndex=116, required=True, validators=[ - validators.oneOf([1,2,3,4, - 6,7,8,9]) + validators.oneOf([1, 2, 3, 4, + 6, 7, 8, 9]) ]), Field(item="29", name='FAMILY_NEW_CHILD', type='number', startIndex=116, endIndex=117, required=True, validators=[ - validators.oneOf([1,2]), + validators.oneOf([1, 2]), ]), Field(item="-1", name='BLANK', type='string', startIndex=117, endIndex=156, required=False, validators=[]), ], diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 57ccf42822..4de39f0c0c 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -16,87 +16,87 @@ cat3_validate_t2, validators.if_then_validator( condition_field='DATE_OF_BIRTH', condition_function=validators.matches('99999999'), - result_field='FAMILY_AFFILIATION', result_function=validators.isInLimits(2,5), + result_field='FAMILY_AFFILIATION', result_function=validators.isInLimits(2, 5), ), validators.if_then_validator( condition_field='SSN', condition_function=validators.matches('999999999'), - result_field='FAMILY_AFFILIATION', result_function=validators.isInLimits(2,5), + result_field='FAMILY_AFFILIATION', result_function=validators.isInLimits(2, 5), ), validators.if_then_validator( condition_field='RACE_HISPANIC', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='RACE_HISPANIC', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='RACE_HISPANIC', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='RACE_AMER_INDIAN', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='RACE_AMER_INDIAN', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='RACE_AMER_INDIAN', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='RACE_ASIAN', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='RACE_ASIAN', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='RACE_ASIAN', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='RACE_BLACK', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='RACE_BLACK', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='RACE_BLACK', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='RACE_HAWAIIAN', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='RACE_HAWAIIAN', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='RACE_HAWAIIAN', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='RACE_WHITE', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='RACE_WHITE', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='RACE_WHITE', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( condition_field='MARITAL_STATUS', condition_function=validators.isBlank(), result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='MARITAL_STATUS', result_function=validators.oneOf([1,2,3,4,5]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='MARITAL_STATUS', result_function=validators.oneOf([1, 2, 3, 4, 5]), ), validators.if_then_validator( - condition_fields='FAMILY_AFFILIATION', condition_function=validators.oneOf([1,2,4]), - result_field='PARENT_WITH_MINOR_CHILD', result_function=validators.isInLimits(1,3), + condition_field='FAMILY_AFFILIATION', condition_function=validators.oneOf([1, 2, 4]), + result_field='PARENT_WITH_MINOR_CHILD', result_function=validators.isInLimits(1, 3), ), validators.if_then_validator( condition_field='PARENT_WITH_MINOR_CHILD', condition_function=validators.isBlank(), - result_field='FAMILY_AFFILIATION', result_function=validators.oneOf([3,5]), + result_field='FAMILY_AFFILIATION', result_function=validators.oneOf([3, 5]), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(2,5), - result_fields='EDUCATION_LEVEL', result_function=validators.oneOf( - [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,98,99] + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(2, 5), + result_field='EDUCATION_LEVEL', result_function=validators.oneOf( + [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 98, 99] ) ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(2,5), - result_fields='EDUCATION_LEVEL', result_function=validators.oneOf( - [1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,98] - ) + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(2, 5), + result_field='EDUCATION_LEVEL', result_function=validators.oneOf( + [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 98] + ) ), validators.if_then_validator( condition_field='EDUCATION_LEVEL', condition_function=validators.isBlank(), @@ -107,8 +107,8 @@ result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1,4), - result_field='CITIZENSHIP_STATUS', result_function=validators.oneOf([1,2,9]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.isInLimits(1, 4), + result_field='CITIZENSHIP_STATUS', result_function=validators.oneOf([1, 2, 9]), ), validators.if_then_validator( condition_field='COOPERATION_CHILD_SUPPORT', condition_function=validators.isBlank(), @@ -116,43 +116,43 @@ ), validators.if_then_validator( condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), - result_field='EMPLOYMENT_STATUS', result_function=validators.between(1,3), + result_field='EMPLOYMENT_STATUS', result_function=validators.between(1, 3), ), validators.if_then_validator( - condition_field='EMPLYMENT_STATUS', condition_function=validators.isBlank(), - result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), + condition_field='EMPLYMENT_STATUS', condition_function=validators.isBlank(), + result_field='FAMILY_AFFILIATION', result_function=validators.matches(5), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.oneOf([1,2]), - result_field='WORK_PART_STATUS', result_function=validators.oneOf( - [1,2, - 5,6,7,8,9,10,11,12,13,14,15,16,17,18,19, + condition_field='FAMILY_AFFILIATION', condition_function=validators.oneOf([1, 2]), + result_field='WORK_PART_STATUS', result_function=validators.oneOf( + [1, 2, + 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 99] - ) + ) ), validators.if_then_validator( condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), - result_field='UNSUB_EMPLOYMENT', result_function=validators.isLargerThanOrEqual(0), + result_field='UNSUB_EMPLOYMENT', result_function=validators.isLargerThanOrEqualTo(0), ), validators.if_then_validator( condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), - result_field='SUB_PRIVATE_EMPLOYMENT', result_function=validators.isLargerThanOrEqual(0), + result_field='SUB_PRIVATE_EMPLOYMENT', result_function=validators.isLargerThanOrEqualTo(0), ), validators.if_then_validator( condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), - result_field='SUB_PUBLIC_EMPLOYMENT', result_function=validators.isLargerThanOrEqual(0), + result_field='SUB_PUBLIC_EMPLOYMENT', result_function=validators.isLargerThanOrEqualTo(0), ), validators.if_then_validator( condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), - result_field='OJT', result_function=validators.isLargerThanOrEqual(0), + result_field='OJT', result_function=validators.isLargerThanOrEqualTo(0), ), validators.if_then_validator( - condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), - result_field='NEEDS_PREGNANT_WOMAN', result_function=validators.oneOf([1,2]), + condition_field='FAMILY_AFFILIATION', condition_function=validators.matches(1), + result_field='NEEDS_PREGNANT_WOMAN', result_function=validators.oneOf([1, 2]), ), validators.if_then_validator( - condition_field='NEEDS_PREGNANT_WOMAN', condition_function=validators.isBlank(), - result_field='FAMILY_AFFILIATION', result_function=validators.oneOf([2,5]), + condition_field='NEEDS_PREGNANT_WOMAN', condition_function=validators.isBlank(), + result_field='FAMILY_AFFILIATION', result_function=validators.oneOf([2, 5]), ) ], fields=[ @@ -173,7 +173,7 @@ ]), Field(item="31", name='NONCUSTODIAL_PARENT', type='number', startIndex=20, endIndex=21, required=True, validators=[ - validators.oneOf([1,2]) + validators.oneOf([1, 2]) ]), Field(item="32", name='DATE_OF_BIRTH', type='number', startIndex=21, endIndex=29, required=True, validators=[ @@ -199,36 +199,36 @@ required=True, validators=[]), Field(item="35", name='GENDER', type='number', startIndex=44, endIndex=45, required=True, validators=[ - validators.oneOf([1,2]) + validators.oneOf([1, 2]) ]), Field(item="36A", name='FED_OASDI_PROGRAM', type='string', startIndex=45, endIndex=46, required=True, validators=[ - validators.oneOf([1,2]) + validators.oneOf([1, 2]) ]), Field(item="36B", name='FED_DISABILITY_STATUS', type='string', startIndex=46, endIndex=47, required=True, validators=[ - validators.oneOf([1,2]) + validators.oneOf([1, 2]) ]), Field(item="36C", name='DISABLED_TITLE_XIVAPDT', type='string', startIndex=47, endIndex=48, required=True, validators=[ validators.or_validators( - validators.oneOf([1,2]), + validators.oneOf([1, 2]), validators.isBlank() ) ]), Field(item="36D", name='AID_AGED_BLIND', type='string', startIndex=48, endIndex=49, required=True, validators=[ validators.or_validators( - validators.oneOf([1,2]), + validators.oneOf([1, 2]), validators.isBlank() ) ]), Field(item="36E", name='RECEIVE_SSI', type='string', startIndex=49, endIndex=50, required=True, validators=[ validators.or_validators( - validators.oneOf([1,2]), + validators.oneOf([1, 2]), validators.isBlank() - ) + ) ]), Field(item="37", name='MARITAL_STATUS', type='string', startIndex=50, endIndex=51, required=True, validators=[]), @@ -246,7 +246,7 @@ required=True, validators=[]), Field(item="43", name='COOPERATION_CHILD_SUPPORT', type='string', startIndex=58, endIndex=59, required=True, validators=[ - validators.isOneOf([1, 2, 9]), + validators.oneOf([1, 2, 9]), ]), Field(item="44", name='MONTHS_FED_TIME_LIMIT', type='string', startIndex=59, endIndex=62, required=True, validators=[]), diff --git a/tdrs-backend/tdpservice/parsers/test/test_validators.py b/tdrs-backend/tdpservice/parsers/test/test_validators.py index 27a08dcd3e..89ad709dec 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_validators.py +++ b/tdrs-backend/tdpservice/parsers/test/test_validators.py @@ -7,34 +7,38 @@ def test_or_validators(): + """Test `or_validators` gives a valid result.""" value = "2" - validator = validators.or_validators(validators.matches(("2")), validators.matches(("3","4"))) - assert validator(value)==(True, None) + validator = validators.or_validators(validators.matches(("2")), validators.matches(("3", "4"))) + assert validator(value) == (True, None) - validator = validators.or_validators(validators.matches(("5")), validators.matches(("3","4"))) + validator = validators.or_validators(validators.matches(("5")), validators.matches(("3", "4"))) print(validator(value)) - assert validator(value)==(False, "2 does not match 5. and 2 does not match ('3', '4').") + assert validator(value) == (False, "2 does not match 5. and 2 does not match ('3', '4').") def test_if_validators(): + """Test `if_then_validator` gives a valid result.""" value = "2" - validator = validators.if_then_validator(validators.matches(("2")), validators.matches(("3","4"))) - assert validator(value)==(False, "2 does not match ('3', '4').") + validator = validators.if_then_validator(validators.matches(("2")), validators.matches(("3", "4"))) + assert validator(value) == (False, "2 does not match ('3', '4').") - validator = validators.if_then_validator(validators.matches(("3")), validators.matches(("3","4"))) - assert validator(value)==(True, None) + validator = validators.if_then_validator(validators.matches(("3")), validators.matches(("3", "4"))) + assert validator(value) == (True, None) def test_or_cross_field_validators(): + """Test `or_cross_field_validators` gives a valid result.""" value1 = "2" value2 = "3" validator = validators.or_validators(validators.matches(("4")), validators.matches(("4"))) - assert validator(value1, value2)==(False, '2 does not match 4. and 3 does not match 4.') + assert validator(value1, value2) == (False, '2 does not match 4. and 3 does not match 4.') def test_month_year_yearIsLargerThan(): + """Test `month_year_yearIsLargerThan` gives a valid result.""" value = "061998" validator = validators.month_year_yearIsLargerThan(1999) - assert validator(value)==(False, '1998 year must be larger than 1999.') + assert validator(value) == (False, '1998 year must be larger than 1999.') def test_matches_returns_valid(): diff --git a/tdrs-backend/tdpservice/parsers/validators.py b/tdrs-backend/tdpservice/parsers/validators.py index 2a8d5a5674..ac759a0d4f 100644 --- a/tdrs-backend/tdpservice/parsers/validators.py +++ b/tdrs-backend/tdpservice/parsers/validators.py @@ -15,12 +15,14 @@ def make_validator(validator_func, error_func): def or_validators(validator1, validator2): """Return a validator that is true only if one of the two validators is true.""" - return lambda value: (True, None) if validator1(value)[0] or validator2(value)[0] else (False, validator1(value)[1] + ' or ' + validator2(value)[1]) + return lambda value: (True, None) if (validator1(value)[0] or validator2(value)[0])\ + else (False, validator1(value)[1] + ' or ' + validator2(value)[1]) -def if_then_validator(condition_field, condition_function, +def if_then_validator(condition_field, condition_function, result_field, result_function): """Return second validation if the first validator is true. + :param validator1: function that returns (bool, string) to represent validation state :param validator2: function that returns (bool, string) to represent validation state :param args: list of two strings representing the keys of the values to be validated @@ -87,10 +89,10 @@ def startsWith(substring): ) -def isNumber(substring): +def isNumber(): """Validate that value can be casted to a number.""" return make_validator( - lambda value: value.isnumeric(substring), + lambda value: value.isnumeric(), lambda value: f'{value} is not a number.' ) @@ -179,7 +181,7 @@ def month_year_yearIsLargerThan(year): ) -def validate_single_header_trailer(file): +def validate_single_header_trailer(datafile): """Validate that a raw datafile has one trailer and one footer.""" line_number = 0 headers = 0