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.

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

SSP M2 CITIZENSHIP_STATUS Cat3 Update #3338

Merged
merged 8 commits into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py
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
4 changes: 2 additions & 2 deletions tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,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 @@ -409,7 +409,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
2 changes: 1 addition & 1 deletion tdrs-backend/tdpservice/parsers/test/test_parse.py
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ def test_parse_ssp_section1_datafile(ssp_section1_datafile, dfs):
assert cat4_errors[1].error_message == "Duplicate record detected with record type M3 at line 3273. " + \
"Record is a duplicate of the record at line number 3272."

assert parser_errors.count() == 32488
assert parser_errors.count() == 32455

assert SSP_M1.objects.count() == expected_m1_record_count
assert SSP_M2.objects.count() == expected_m2_record_count
Expand Down
Loading