Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/3431, allow 3 as citizenship value #3447

Open
wants to merge 8 commits into
base: develop
Choose a base branch
from
+4 −4
Open

Feat/3431, allow 3 as citizenship value #3447

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
2e8b6be
citizenship, allow 3 as value
andrew-jameson Jan 28, 2025
7fe32c2
updating cat 3 error message
andrew-jameson Jan 28, 2025
7c0ade3
uses in-between, not oneOf
andrew-jameson Jan 28, 2025
1f07824
changing error message assertion to match new values
andrew-jameson Jan 29, 2025
becbc66
updating validator for 3
andrew-jameson Jan 29, 2025
5f2cf80
fix linting
andrew-jameson Jan 29, 2025
28a2ef6
fixing spaces in err msg
andrew-jameson Jan 31, 2025
c34df26
Merge branch 'develop' into feat/3386-immigrant-status
ADPennington Feb 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
12 changes: 6 additions & 6 deletions tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=[
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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, 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=[
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -364,7 +364,7 @@
required=False,
validators=[
category3.orValidators([
category3.isBetween(0, 2, inclusive=True),
category3.isBetween(0, 3, inclusive=True),
category3.isEqual(9)
])
],
Expand Down
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/parsers/test/test_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
6 changes: 3 additions & 3 deletions tdrs-backend/tdpservice/parsers/validators/category3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ def validate__FAM_AFF__SSN():
"""
Validate social security number provided.

Since item FAMILY_AFFILIATION ==2 and item CITIZENSHIP_STATUS ==1 or 2,
Since item FAMILY_AFFILIATION ==2 and item CITIZENSHIP_STATUS ==1 or 2 or 3,
then item SSN != 000000000 -- 999999999.
"""
# value is instance
Expand Down Expand Up @@ -299,13 +299,13 @@ def validate(record, row_schema):
)

if FAMILY_AFFILIATION == 2 and (
CITIZENSHIP_STATUS == 1 or CITIZENSHIP_STATUS == 2
CITIZENSHIP_STATUS == 1 or CITIZENSHIP_STATUS == 2 or CITIZENSHIP_STATUS == 3
):
if SSN in [str(i) * 9 for i in range(10)]:
return Result(
valid=False,
error=(f"{row_schema.record_type}: Since {format_error_context(fam_affil_eargs)} is 2 "
f"and {format_error_context(cit_stat_eargs)} is 1 or 2, "
f"and {format_error_context(cit_stat_eargs)} is 1 - 3, "
f"then {format_error_context(ssn_eargs)} must not be in 000000000 -- 999999999."),
field_names=["FAMILY_AFFILIATION", "CITIZENSHIP_STATUS", "SSN"],
)
Expand Down
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/parsers/validators/test/test_category3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ def test_validate__FAM_AFF__SSN():
}
result = category3.validate__FAM_AFF__SSN()(instance, schema)
assert result.valid is False
assert result.error == ('T1: Since Item 1 (family affiliation) is 2 and Item 2 (citizenship status) is 1 or 2, '
assert result.error == ('T1: Since Item 1 (family affiliation) is 2 and Item 2 (citizenship status) is 1 - 3, '
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was at linter limit length 120 characters, just did this range instead of 1 or 2 or 3

'then Item 3 (social security number) must not be in 000000000 -- 999999999.')
assert result.field_names == ['FAMILY_AFFILIATION', 'CITIZENSHIP_STATUS', 'SSN']

Expand Down