From 083104b4b48335df5b7d4cd828020230eed9f0ed Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Wed, 15 Jan 2025 13:32:21 -0700 Subject: [PATCH 1/3] - Add new value to appropriate schemas - Update test message --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 2 +- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py | 4 ++-- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py | 2 +- tdrs-backend/tdpservice/parsers/test/test_parse.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 98ebebd06..c21532718 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -415,7 +415,7 @@ startIndex=57, endIndex=58, required=False, - validators=[category2.isOneOf([0, 1, 2, 9])], + validators=[category2.isOneOf([0, 1, 2, 3, 9])], ), Field( item="43", diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 531e92af7..916cd30c1 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -300,7 +300,7 @@ startIndex=51, endIndex=52, required=False, - validators=[category2.isOneOf([1, 2, 9])], + validators=[category2.isOneOf([1, 2, 3, 9])], ), Field( item="77A", @@ -616,7 +616,7 @@ startIndex=92, endIndex=93, required=False, - validators=[category2.isOneOf([1, 2, 9])], + validators=[category2.isOneOf([1, 2, 3, 9])], ), Field( item="77A", diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index 206d18e48..acd6d133b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -364,7 +364,7 @@ required=False, validators=[ category3.orValidators([ - category3.isBetween(0, 2, inclusive=True), + category3.isBetween(0, 3, inclusive=True), category3.isEqual(9) ]) ], diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index 1e9cd3840..44ea9fe8b 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -1619,7 +1619,7 @@ def test_parse_t3_cat2_invalid_citizenship(t3_cat2_invalid_citizenship_file, dfs assert parser_errors.count() == 2 for e in parser_errors: - assert e.error_message == "T3 Item 76 (Citizenship/Immigration Status): 0 is not in [1, 2, 9]." + assert e.error_message == "T3 Item 76 (Citizenship/Immigration Status): 0 is not in [1, 2, 3, 9]." @pytest.mark.django_db() From da27e041019f5d435ca6a7e31210336da49714a8 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 17 Jan 2025 22:24:50 -0500 Subject: [PATCH 2/3] - updated cat3 validators --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 2 +- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py | 8 ++++---- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index c21532718..3ff3ec346 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -94,7 +94,7 @@ condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(1), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isOneOf((1, 2)), + result_function=category3.isOneOf((1, 2, 3)), ), category3.ifThenAlso( condition_field_name="FAMILY_AFFILIATION", diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 916cd30c1..e108bc298 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -91,13 +91,13 @@ condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(1), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isOneOf((1, 2)), + result_function=category3.isOneOf((1, 2, 3)), ), category3.ifThenAlso( condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(2), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isOneOf((1, 2, 9)), + result_function=category3.isOneOf((1, 2, 3, 9)), ), ], fields=[ @@ -407,13 +407,13 @@ condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(1), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isOneOf((1, 2)), + result_function=category3.isOneOf((1, 23, )), ), category3.ifThenAlso( condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(2), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isOneOf((1, 2, 9)), + result_function=category3.isOneOf((1, 2, 3, 9)), ), ], fields=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index acd6d133b..818bc02e3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -94,7 +94,7 @@ condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(1), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isBetween(1, 2, inclusive=True), + result_function=category3.isBetween(1, 3, inclusive=True), ), category3.ifThenAlso( condition_field_name="DATE_OF_BIRTH", From 6871ea64b7e787c2bad2e02e9e76ae4489d24a60 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 21 Jan 2025 11:26:54 -0500 Subject: [PATCH 3/3] - Fix fat fingered value --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index e108bc298..14341ada6 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -407,7 +407,7 @@ condition_field_name="FAMILY_AFFILIATION", condition_function=category3.isEqual(1), result_field_name="CITIZENSHIP_STATUS", - result_function=category3.isOneOf((1, 23, )), + result_function=category3.isOneOf((1, 2, 3)), ), category3.ifThenAlso( condition_field_name="FAMILY_AFFILIATION",