Merge branch 'develop' into 2137-ally-frontend-footer

raft-tech · Dec 9, 2024 · 9a1cfd1 · 9a1cfd1
2 parents 39ea357 + 0f10b0d
commit 9a1cfd1
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.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/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py
@@ -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',
@@ -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',

diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py
@@ -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