2681 s1 enhancements

tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py

@@ -116,8 +116,6 @@
                         "CASH_AMOUNT",
                         "CC_AMOUNT",
                         "TRANSP_AMOUNT",
-                        "TRANSITION_SERVICES_AMOUNT",
-                        "OTHER_AMOUNT",
                     ),
                     0,
                 ),
@@ -201,7 +199,7 @@
                     endIndex=30,
                     required=True,
                     validators=[
-                        validators.isInLimits(1, 3),
+                        validators.isInLimits(1, 2),
                     ],
                 ),
                 Field(
@@ -213,7 +211,7 @@
                     endIndex=31,
                     required=True,
                     validators=[
-                        validators.oneOf([1, 2]),
+                        validators.matches(1)
                     ],
                 ),
                 Field(
@@ -261,7 +259,7 @@
                     endIndex=36,
                     required=True,
                     validators=[
-                        validators.isInLimits(1, 3),
+                        validators.isInLimits(1, 2),
                     ],
                 ),
                 Field(

tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py

@@ -126,6 +126,7 @@
                     result_field="WORK_PART_STATUS",
                     result_function=validators.notMatches("99"),
                 ),
+                validators.validate__WORK_ELIGIBLE_INDICATOR__HOH__AGE(),
             ],
             fields=[
                 Field(
@@ -493,7 +494,7 @@
                     type="string",
                     startIndex=68,
                     endIndex=70,
-                    required=False,
+                    required=True,
                     validators=[
                         validators.oneOf(
                             [
@@ -506,7 +507,6 @@
                                 "16",
                                 "17",
                                 "18",
-                                "19",
                                 "99",
                             ]
                         )

tdrs-backend/tdpservice/parsers/test/data/small_correct_file.txt

@@ -1,3 +1,3 @@
 HEADER20204A06   TAN1 N
-T12020101111111111223003403361110213120000300000000000008730010000000000000000000000000000000000222222000000002229012                                       
+T12020101111111111223003403361110212120000300000000000008730010000000000000000000000000000000000222222000000002229012                                       
 TRAILER0000001         

tdrs-backend/tdpservice/parsers/test/data/small_tanf_section1.txt

@@ -1,17 +1,17 @@
 HEADER20204A06   TAN1EN
-T12020101111111111223003403361110213120000300000000000008730010000000000000000000000000000000000222222000000002229012                                       
+T12020101111111111223003403361110212120000300000000000008730010000000000000000000000000000000000222222000000002229012                                       
 T2202010111111111121219740114WTTTTTY@W2221222222221012212110014722011500000000000000000000000000000000000000000000000000000000000000000000000000000000000291
 T320201011111111112120190127WTTTT90W022212222204398100000000                                                                                                
-T12020101111111111524503401311110233110374300000000000005450320000000000000000000000000000000000222222000000002229021                                       
+T12020101111111111524503401311110232110374300000000000005450320000000000000000000000000000000000222222000000002229021                                       
 T2202010111111111152219730113WTTTT@#Z@2221222122211012210110630023080700000000000000000000000000000000000000000000000000000000000000000000000551019700000000
 T320201011111111115120160401WTTTT@BTB22212212204398100000000                                                                                                
-T12020101111111114023001401101120213110336300000000000002910410000000000000000000000000000000000222222000000002229012                                       
+T12020101111111114023001401101120212110336300000000000002910410000000000000000000000000000000000222222000000002229012                                       
 T2202010111111111401219910501WTTTT@9#T2221222222221012212210421322011500000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 T320201011111111140120170423WTTTT@@T#22212222204398100000000                                                                                                
 T12020101111111114721801401711120212110374300000000000003820060000000000000000000000000000000000222222000000002229012                                       
 T2202010111111111471219800223WTTTT@TTW2222212222221012212110065423010700000000000000000000000000000000000000000000000000000000000000000000000000000000000000
 T320201011111111147120201101WTTTTTZWY22222112204398100000000                                                                                                
-T12020101111111115124501404961120313110384300000000000002560420000000000000003000000000000050000222222000000002229012                                       
+T12020101111111115124501404961120312110384300000000000002560420000000000000003000000000000050000222222000000002229012                                       
 T2202010111111111511219970201WTTTT@Y0Y1222212222221012211110421021011932000000000000000000000000000000000000000000000000000000000000124800000000000000000000
 T320201011111111151120170525WTTTT@B#Y12222112204398100000000120151113WTTTT9TT#12222122204398100000000  
 TRAILER0002643         

tdrs-backend/tdpservice/parsers/test/data/tanf_section1_blanks.txt

@@ -1,5 +1,5 @@
 HEADER20204A06   TAN1EN
-T120201011111111112230  4033611102131 0000 00000000000008730010000000000000000              00002 222200000000222901                                        
-T2202010111111111121219740114WTTTTTY@W      2221 1 01             01                                                               0000     0000000000000291
+T120201011111111112230  4033611102121 0000 00000000000008730010000000000000000              00002 222200000000222901                                        
+T2202010111111111121219740114WTTTTTY@W      2221 1 01             0199                                                             0000     0000000000000291
 T320201011111111112120190127WTTTT90W0      222   98 00000000                                                                                                
 TRAILER0002643         

tdrs-backend/tdpservice/parsers/test/data/tanf_section1_header_test.txt

@@ -1,3 +1,3 @@
 HEADER20204A06   TAN1 N
-T12020101111111111223003403361110213120000300000000000008730010000000000000000000000000000000000222222000000002229012                                       
+T12020101111111111223003403361110212120000300000000000008730010000000000000000000000000000000000222222000000002229012                                       
 TRAILER0000001         

tdrs-backend/tdpservice/parsers/test/test_parse.py

@@ -181,10 +181,9 @@ def test_parse_big_file(test_big_file, dfs):
     dfs.case_aggregates = aggregates.case_aggregates_by_month(
         dfs.datafile, dfs.status)
     assert dfs.case_aggregates == {'months': [
-            {'month': 'Oct', 'accepted_without_errors': 129, 'accepted_with_errors': 141},
-            {'month': 'Nov', 'accepted_without_errors': 143, 'accepted_with_errors': 130},
-            {'month': 'Dec', 'accepted_without_errors': 131, 'accepted_with_errors': 141}
-        ],
+        {'month': 'Oct', 'accepted_without_errors': 25, 'accepted_with_errors': 245},
+        {'month': 'Nov', 'accepted_without_errors': 18, 'accepted_with_errors': 255},
+        {'month': 'Dec', 'accepted_without_errors': 27, 'accepted_with_errors': 245}],
         'rejected': 0}
 
     assert TANF_T1.objects.count() == expected_t1_record_count
@@ -614,18 +613,14 @@ def test_parse_tanf_section1_datafile(small_tanf_section1_datafile, dfs):
     parse.parse_datafile(small_tanf_section1_datafile, dfs)
 
     dfs.status = dfs.get_status()
-    assert dfs.status == DataFileSummary.Status.ACCEPTED
+    assert dfs.status == DataFileSummary.Status.ACCEPTED_WITH_ERRORS
     dfs.case_aggregates = aggregates.case_aggregates_by_month(
         dfs.datafile, dfs.status)
-    assert dfs.case_aggregates == {'rejected': 0,
-                                   'months': [
-                                       {'accepted_without_errors': 5,
-                                           'accepted_with_errors': 0, 'month': 'Oct'},
-                                       {'accepted_without_errors': 0,
-                                           'accepted_with_errors': 0, 'month': 'Nov'},
-                                       {'accepted_without_errors': 0,
-                                           'accepted_with_errors': 0, 'month': 'Dec'}
-                                   ]}
+    assert dfs.case_aggregates == {'months': [
+        {'month': 'Oct', 'accepted_without_errors': 4, 'accepted_with_errors': 1},
+        {'month': 'Nov', 'accepted_without_errors': 0, 'accepted_with_errors': 0},
+        {'month': 'Dec', 'accepted_without_errors': 0, 'accepted_with_errors': 0}],
+        'rejected': 0}
 
     assert TANF_T2.objects.count() == 5
 

tdrs-backend/tdpservice/parsers/test/test_validators.py

@@ -766,7 +766,6 @@ def test_validate_cooperation_with_child_support(self, record):
 
     def test_validate_months_federal_time_limit(self, record):
         """Test cat3 validator for federal time limit."""
-        # TODO THIS ISNT EXACTLY RIGHT SINCE FED TIME LIMIT IS A STRING.
         val = validators.validate__FAM_AFF__HOH__Fed_Time()
         record.FAMILY_AFFILIATION = 0
         result = val(record)
@@ -776,9 +775,11 @@ def test_validate_months_federal_time_limit(self, record):
         record.MONTHS_FED_TIME_LIMIT = "000"
         record.RELATIONSHIP_HOH = "01"
         result = val(record)
-        assert result == (False, 'If FAMILY_AFFILIATION == 2 and MONTHS_FED_TIME_LIMIT== 1 or 2, ' +
-                          'then MONTHS_FED_TIME_LIMIT > 1.',
-                          ['FAMILY_AFFILIATION', 'MONTHS_FED_TIME_LIMIT'])
+        assert result == (False,
+                          "If FAMILY_AFFILIATION == 1 and RELATIONSHIP_HOH == 1 or 2, then "
+                          + "MONTHS_FED_TIME_LIMIT >= 1.",
+                          ["FAMILY_AFFILIATION", "RELATIONSHIP_HOH", "MONTHS_FED_TIME_LIMIT",],
+                          )
 
     def test_validate_employment_status(self, record):
         """Test cat3 validator for employment status."""
@@ -1112,9 +1113,11 @@ def test_validate_hoh_fed_time(self, record):
         record.COUNTABLE_MONTH_FED_TIME = 0
 
         result = val(record)
-        assert result == (False, 'If FAMILY_AFFILIATION == 2 and COUNTABLE_MONTH_FED_TIME== 1 or 2, then ' +
-                          'COUNTABLE_MONTH_FED_TIME > 1.',
-                          ['FAMILY_AFFILIATION', 'RELATIONSHIP_HOH', 'COUNTABLE_MONTH_FED_TIME'])
+        assert result == (False,
+                          "If FAMILY_AFFILIATION == 1 and RELATIONSHIP_HOH == 1 or 2, then "
+                          + "COUNTABLE_MONTH_FED_TIME >= 1.",
+                          ["FAMILY_AFFILIATION", "RELATIONSHIP_HOH", "COUNTABLE_MONTH_FED_TIME",],
+                          )
 
     def test_validate_oasdi_insurance(self, record):
         """Test cat3 validator for OASDI insurance."""