Merge branch 'develop' of https://github.com/raft-tech/TANF-app into …

…1117-tribal-s4
raft-tech · Jan 8, 2024 · 1dc1c73 · 1dc1c73
2 parents 7be6021 + a3c49d7
commit 1dc1c73
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 18 deletions.
diff --git a/docs/Sprint-Review/sprint-87-summary.md b/docs/Sprint-Review/sprint-87-summary.md
@@ -0,0 +1,76 @@
+# Sprint 87 Summary
+11/22/23 - 12/05/23
+
+Velocity (Dev): 5
+
+## Sprint Goal
+* Dev:
+    * Continue parsing engine development
+        * Review SSP Sec 04
+        * Implement all Tribal Sec (02, 03 and review 01)
+    * Finalize review on #2683 - ZAP CORS Misconfiguration
+    * #2599 - Error Report "Friendly Names"
+    * Coordinate w/ OFA and draft dev contingency plan in event of lapse in government funding
+* DevOps:
+    * 2429 - Singular Clam AV
+    * 2722 - Singular deployment workflow
+        * Scoped out of 2419
+    * #2729 - Migrations via CircleCI 
+
+---
+
+## Tickets
+### Completed/Merged
+* [#1118 SSP Closed Data (02) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1118)
+* [#1119 SSP Aggregate (03) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1119)
+* [#1120 SSP Stratum (04) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1120)
+* [#2683 ZAP result - CORS config issue](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2683)
+* [#2760 Add file size to clamav-nginx](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2760)
+
+### Ready to Merge
+
+
+
+
+
+### Submitted (QASP Review, OCIO Review)
+* [#2748 Fix parser/preparser validation of empty strings](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2748)
+* [#2765 Added needed space into logic](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2765)
+
+### Closed (not merged)
+* [Debug migration deployments (resolved by other deployment fix work)](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2740)
+
+---
+
+## Moved to Next Sprint (Blocked, Raft Review, In Progress, Current Sprint Backlog)
+### In Progress
+
+* [#2536 [spike] Cat 4 validation](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2536)
+* [#2592 Deploy celery as a separate cloud.gov app](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2592)
+* [#2732 S3 bucket rebind](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2732)
+* [#2759 Changes for fully local development](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2759)
+
+
+
+### Blocked
+ * [#2729 - Migrations via CircleCI (Revisit ~Feb 2024)](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2729)
+     * [#2755 Feature/2729 remote migrations](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2755)
+
+### Raft Review
+
+* [#1116 Tribal TANF Aggregate (03) File Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1116)
+* [#1117 Tribal TANF Sample (04) File Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1117)
+* [#2599 Readability enhancements for error reports](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2599)
+* [#2722 simplify workflows and de-bloat pipeline code](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2722)
+* [Spike - Investigate OWASP nightly scan findings](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/2663)
+* [Tribal TANF Active Data (01) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1114)
+
+### Current Sprint Backlog
+
+
+### Demo
+* Jan and Eric to demo SSP functionality 
+    * [#1118 SSP Closed Data (02) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1118)
+    * [#1119 SSP Aggregate (03) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1119)
+    * [#1120 SSP Stratum (04) Parsing](https://app.zenhub.com/workspaces/sprint-board-5f18ab06dfd91c000f7e682e/issues/gh/raft-tech/tanf-app/1120)
+
diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py
@@ -88,12 +88,6 @@
                     result_function=validators.isInLimits(1, 2),
                 ),
                 validators.validate__FAM_AFF__HOH__Count_Fed_Time(),
-                validators.if_then_validator(
-                    condition_field="DATE_OF_BIRTH",
-                    condition_function=validators.olderThan(18),
-                    result_field="REC_OASDI_INSURANCE",
-                    result_function=validators.isInLimits(1, 2),
-                ),
                 validators.if_then_validator(
                     condition_field="FAMILY_AFFILIATION",
                     condition_function=validators.matches(1),
@@ -197,7 +191,7 @@
                     type="number",
                     startIndex=39,
                     endIndex=40,
-                    required=True,
+                    required=False,
                     validators=[validators.validateRace()],
                 ),
                 Field(
@@ -257,8 +251,8 @@
                     type="number",
                     startIndex=45,
                     endIndex=46,
-                    required=True,
-                    validators=[validators.isInLimits(1, 2)],
+                    required=False,
+                    validators=[validators.isInLimits(0, 2)],
                 ),
                 Field(
                     item="19C",
@@ -287,8 +281,8 @@
                     type="number",
                     startIndex=48,
                     endIndex=49,
-                    required=True,
-                    validators=[validators.isInLimits(1, 2)],
+                    required=False,
+                    validators=[validators.isInLimits(0, 2)],
                 ),
                 Field(
                     item="20",

diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py
@@ -104,7 +104,7 @@
         Field(
             item="8A",
             name="NUM_FAMILIES",
-            friendly_name="number of families",
+            friendly_name="total number of families",
             type="number",
             startIndex=115,
             endIndex=123,
@@ -273,7 +273,7 @@
         Field(
             item="5B",
             name="NUM_APPROVED",
-            friendly_name="total number of approved cases",
+            friendly_name="total number of approved applications",
             type="number",
             startIndex=39,
             endIndex=47,
@@ -283,7 +283,7 @@
         Field(
             item="6B",
             name="NUM_DENIED",
-            friendly_name="total number of denied",
+            friendly_name="total number of denied applications",
             type="number",
             startIndex=63,
             endIndex=71,
@@ -303,7 +303,7 @@
         Field(
             item="8B",
             name="NUM_FAMILIES",
-            friendly_name="total of number of families",
+            friendly_name="total number of families",
             type="number",
             startIndex=123,
             endIndex=131,
@@ -333,7 +333,7 @@
         Field(
             item="11B",
             name="NUM_NO_PARENTS",
-            friendly_name="total number of no-parent family",
+            friendly_name="total number of no parent families",
             type="number",
             startIndex=195,
             endIndex=203,
@@ -512,7 +512,7 @@
         Field(
             item="9C",
             name="NUM_2_PARENTS",
-            friendly_name="total number of two parents families",
+            friendly_name="total number of two-parent families",
             type="number",
             startIndex=155,
             endIndex=163,
@@ -522,7 +522,7 @@
         Field(
             item="10C",
             name="NUM_1_PARENTS",
-            friendly_name="total number of one parent families",
+            friendly_name="total number of one-parent families",
             type="number",
             startIndex=179,
             endIndex=187,