From 5cae4fb86510ed9dd37e9d78dacdd3ec3c58b939 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Thu, 4 Apr 2024 22:33:20 -0700 Subject: [PATCH 01/46] Final mile procedures and updates additional updates to schemas and friendly names --- .../tdpservice/parsers/schema_defs/ssp/m1.py | 88 +++++----- .../tdpservice/parsers/schema_defs/ssp/m2.py | 143 ++++++++-------- .../tdpservice/parsers/schema_defs/ssp/m3.py | 110 ++++++------- .../tdpservice/parsers/schema_defs/ssp/m4.py | 28 ++-- .../tdpservice/parsers/schema_defs/ssp/m5.py | 67 ++++---- .../tdpservice/parsers/schema_defs/ssp/m6.py | 83 +++++----- .../tdpservice/parsers/schema_defs/ssp/m7.py | 13 +- .../tdpservice/parsers/schema_defs/tanf/t1.py | 100 ++++++----- .../tdpservice/parsers/schema_defs/tanf/t2.py | 155 +++++++++--------- .../tdpservice/parsers/schema_defs/tanf/t3.py | 114 ++++++------- .../tdpservice/parsers/schema_defs/tanf/t4.py | 28 ++-- .../tdpservice/parsers/schema_defs/tanf/t5.py | 73 ++++----- .../tdpservice/parsers/schema_defs/tanf/t6.py | 113 ++++++------- .../tdpservice/parsers/schema_defs/tanf/t7.py | 13 +- .../parsers/schema_defs/tribal_tanf/t1.py | 93 +++++------ .../parsers/schema_defs/tribal_tanf/t2.py | 120 +++++++------- .../parsers/schema_defs/tribal_tanf/t3.py | 84 +++++----- .../parsers/schema_defs/tribal_tanf/t4.py | 30 ++-- .../parsers/schema_defs/tribal_tanf/t5.py | 73 ++++----- .../parsers/schema_defs/tribal_tanf/t6.py | 113 ++++++------- .../parsers/schema_defs/tribal_tanf/t7.py | 13 +- 21 files changed, 781 insertions(+), 873 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index ad4991cfe..e6465ae27 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -12,10 +12,6 @@ document=SSP_M1DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(150), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -102,7 +98,7 @@ Field( item="0", name='RecordType', - friendly_name="record type", + friendly_name="Record Type", type='string', startIndex=0, endIndex=2, @@ -112,7 +108,7 @@ Field( item="3", name='RPT_MONTH_YEAR', - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type='number', startIndex=2, endIndex=8, @@ -125,7 +121,7 @@ Field( item="5", name='CASE_NUMBER', - friendly_name="case number", + friendly_name="Case Number", type='string', startIndex=8, endIndex=19, @@ -135,7 +131,7 @@ Field( item="2", name='COUNTY_FIPS_CODE', - friendly_name="county fips code", + friendly_name="County FIPS Code", type='string', startIndex=19, endIndex=22, @@ -145,7 +141,7 @@ Field( item="4", name='STRATUM', - friendly_name="stratum", + friendly_name="Stratum", type='string', startIndex=22, endIndex=24, @@ -155,7 +151,7 @@ Field( item="6", name='ZIP_CODE', - friendly_name="zip code", + friendly_name="ZIP Code", type='string', startIndex=24, endIndex=29, @@ -165,7 +161,7 @@ Field( item="7", name='DISPOSITION', - friendly_name="disposition", + friendly_name="Disposition", type='number', startIndex=29, endIndex=30, @@ -175,7 +171,7 @@ Field( item="8", name='NBR_FAMILY_MEMBERS', - friendly_name="number of family members", + friendly_name="Number of Family Members", type='number', startIndex=30, endIndex=32, @@ -185,7 +181,7 @@ Field( item="9", name='FAMILY_TYPE', - friendly_name="family type", + friendly_name="Type of Family for Work Participation", type='number', startIndex=32, endIndex=33, @@ -195,7 +191,7 @@ Field( item="10", name='TANF_ASST_IN_6MONTHS', - friendly_name="tanf assistance in 6 months", + friendly_name="Received Assistance Under a State (Tribal) TANF Program Within the Past Six Months", type='number', startIndex=33, endIndex=34, @@ -205,7 +201,7 @@ Field( item="11", name='RECEIVES_SUB_HOUSING', - friendly_name="receives subsidized housing", + friendly_name="Receives Subsidized Housing", type='number', startIndex=34, endIndex=35, @@ -215,7 +211,7 @@ Field( item="12", name='RECEIVES_MED_ASSISTANCE', - friendly_name="receives medical assistance", + friendly_name="Received Medical Assistance", type='number', startIndex=35, endIndex=36, @@ -225,7 +221,7 @@ Field( item="13", name='RECEIVES_FOOD_STAMPS', - friendly_name="receives food assistance", + friendly_name="Receives Assistance from the Supplemental Nutrition Assistance Program (SNAP)", type='number', startIndex=36, endIndex=37, @@ -235,7 +231,7 @@ Field( item="14", name='AMT_FOOD_STAMP_ASSISTANCE', - friendly_name="amount of food stamp assistance/stamps", + friendly_name="Amount of Supplemental Nutrition Assistance Program (SNAP) Benefits", type='number', startIndex=37, endIndex=41, @@ -245,7 +241,7 @@ Field( item="15", name='RECEIVES_SUB_CC', - friendly_name="receives subsidized child care", + friendly_name="Receives Subsidized Child Care:", type='number', startIndex=41, endIndex=42, @@ -255,7 +251,7 @@ Field( item="16", name='AMT_SUB_CC', - friendly_name="amount of subsidized child care", + friendly_name="Amount of Subsidized Child Care", type='number', startIndex=42, endIndex=46, @@ -265,7 +261,7 @@ Field( item="17", name='CHILD_SUPPORT_AMT', - friendly_name="child support amount", + friendly_name="Amount of Child Support", type='number', startIndex=46, endIndex=50, @@ -275,7 +271,7 @@ Field( item="18", name='FAMILY_CASH_RESOURCES', - friendly_name="family cash resources", + friendly_name="Amount of the Family's Cash Resources", type='number', startIndex=50, endIndex=54, @@ -285,7 +281,7 @@ Field( item="19A", name='CASH_AMOUNT', - friendly_name="cash amount", + friendly_name="Cash and Cash Equivalents: Amount", type='number', startIndex=54, endIndex=58, @@ -295,7 +291,7 @@ Field( item="19B", name='NBR_MONTHS', - friendly_name="number of months", + friendly_name="Cash and Cash Equivalents: Number of Months", type='number', startIndex=58, endIndex=61, @@ -305,7 +301,7 @@ Field( item="20A", name='CC_AMOUNT', - friendly_name="child care amount", + friendly_name="SSP-MOE Child Care: Amount", type='number', startIndex=61, endIndex=65, @@ -315,7 +311,7 @@ Field( item="20B", name='CHILDREN_COVERED', - friendly_name="children covered", + friendly_name="SSP-MOE Child Care: Number of Children Covered", type='number', startIndex=65, endIndex=67, @@ -325,7 +321,7 @@ Field( item="20C", name='CC_NBR_MONTHS', - friendly_name="child care - number of months", + friendly_name="SSP-MOE Child Care: Number of Months", type='number', startIndex=67, endIndex=70, @@ -335,7 +331,7 @@ Field( item="21A", name='TRANSP_AMOUNT', - friendly_name="transportation amount", + friendly_name="Transportation and Other Supportive Services: Amount", type='number', startIndex=70, endIndex=74, @@ -345,7 +341,7 @@ Field( item="21B", name='TRANSP_NBR_MONTHS', - friendly_name="transportation - number of months", + friendly_name="Transportation and Other Supportive Services: Number of Months", type='number', startIndex=74, endIndex=77, @@ -355,7 +351,7 @@ Field( item="22A", name='TRANSITION_SERVICES_AMOUNT', - friendly_name="transition services amount", + friendly_name="Transitional Services: Amount", type='number', startIndex=77, endIndex=81, @@ -365,7 +361,7 @@ Field( item="22B", name='TRANSITION_NBR_MONTHS', - friendly_name="transition services - number of months", + friendly_name="Transitional Services: Number of Months", type='number', startIndex=81, endIndex=84, @@ -375,7 +371,7 @@ Field( item="23A", name='OTHER_AMOUNT', - friendly_name="other amount", + friendly_name="Other: Amount", type='number', startIndex=84, endIndex=88, @@ -385,7 +381,7 @@ Field( item="23B", name='OTHER_NBR_MONTHS', - friendly_name="other - number of months", + friendly_name="Other: Number of Months", type='number', startIndex=88, endIndex=91, @@ -395,7 +391,7 @@ Field( item="24AI", name='SANC_REDUCTION_AMT', - friendly_name="sanction reduction amount", + friendly_name="Sanctions: Total Dollar Amount of Reductions due to Sanctions", type='number', startIndex=91, endIndex=95, @@ -405,7 +401,7 @@ Field( item="24AII", name='WORK_REQ_SANCTION', - friendly_name="work requirements sanction", + friendly_name="Sanctions: Work Requirements", type='number', startIndex=95, endIndex=96, @@ -415,7 +411,7 @@ Field( item="24AIII", name='FAMILY_SANC_ADULT', - friendly_name="family sanction for adult", + friendly_name="Sanctions: Code no longer in use", type='number', startIndex=96, endIndex=97, @@ -425,7 +421,7 @@ Field( item="24AIV", name='SANC_TEEN_PARENT', - friendly_name="sanction for teen parent", + friendly_name="Sanction: Teen Parent not Attending School", type='number', startIndex=97, endIndex=98, @@ -435,7 +431,7 @@ Field( item="24AV", name='NON_COOPERATION_CSE', - friendly_name="non-cooperation with child support", + friendly_name="Sanction: Non-Cooperation with Child Support", type='number', startIndex=98, endIndex=99, @@ -445,7 +441,7 @@ Field( item="24AVI", name='FAILURE_TO_COMPLY', - friendly_name="failure to comply", + friendly_name="Sanction: Failure to Comply with an Individual Responsibility Plan ", type='number', startIndex=99, endIndex=100, @@ -455,7 +451,7 @@ Field( item="24AVII", name='OTHER_SANCTION', - friendly_name="other sanction", + friendly_name="Sanction: Other", type='number', startIndex=100, endIndex=101, @@ -465,7 +461,7 @@ Field( item="24B", name='RECOUPMENT_PRIOR_OVRPMT', - friendly_name="recoupment prior overpayment", + friendly_name="Recoupment of Prior Overpayment", type='number', startIndex=101, endIndex=105, @@ -475,7 +471,7 @@ Field( item="24CI", name='OTHER_TOTAL_REDUCTIONS', - friendly_name="other total reductions", + friendly_name="Other: Total Dollar Amount of Reductions for Other Reasons", type='number', startIndex=105, endIndex=109, @@ -485,7 +481,7 @@ Field( item="24CII", name='FAMILY_CAP', - friendly_name="family cap", + friendly_name="Other: Family Cap", type='number', startIndex=109, endIndex=110, @@ -495,7 +491,7 @@ Field( item="24CIII", name='REDUCTIONS_ON_RECEIPTS', - friendly_name="reductions on receipts", + friendly_name="Other: Reduction Based on Time Limit", type='number', startIndex=110, endIndex=111, @@ -505,7 +501,7 @@ Field( item="24CIV", name='OTHER_NON_SANCTION', - friendly_name="other non-sanction", + friendly_name="Other: Non-Sanction, Non-Recoupment ", type='number', startIndex=111, endIndex=112, @@ -515,7 +511,7 @@ Field( item="25", name='WAIVER_EVAL_CONTROL_GRPS', - friendly_name="waiver evaluation experimental and control groups", + friendly_name="Waiver Evaluation Experimental and Control Groups", type='number', startIndex=112, endIndex=113, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index a24db0576..352b6d3fe 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -14,10 +14,6 @@ document=SSP_M2DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(150), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -129,7 +125,7 @@ Field( item="0", name='RecordType', - friendly_name="record type", + friendly_name="Record Type", type='string', startIndex=0, endIndex=2, @@ -139,7 +135,7 @@ Field( item="3", name='RPT_MONTH_YEAR', - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type='number', startIndex=2, endIndex=8, @@ -152,7 +148,7 @@ Field( item="5", name='CASE_NUMBER', - friendly_name="case number", + friendly_name="Case Number", type='string', startIndex=8, endIndex=19, @@ -162,7 +158,7 @@ Field( item="26", name='FAMILY_AFFILIATION', - friendly_name="family affiliation", + friendly_name="Family Affiliation", type='number', startIndex=19, endIndex=20, @@ -172,7 +168,7 @@ Field( item="27", name='NONCUSTODIAL_PARENT', - friendly_name="noncustodial parent", + friendly_name="Noncustodial Parent Indicator", type='number', startIndex=20, endIndex=21, @@ -182,21 +178,18 @@ Field( item="28", name='DATE_OF_BIRTH', - friendly_name="date of birth", - type='string', + friendly_name="Date of Birth", + type='number', startIndex=21, endIndex=29, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid()] + validators=[validators.isLargerThan(0)] ), TransformField( transform_func=ssp_ssn_decryption_func, item="29", name='SSN', - friendly_name="social security number", + friendly_name="Social Security Number", type='string', startIndex=29, endIndex=38, @@ -208,7 +201,7 @@ item="30A", name='RACE_HISPANIC', type='number', - friendly_name="race hispanic", + friendly_name="Race/Ethnicity: Hispanic or Latino", startIndex=38, endIndex=39, required=False, @@ -217,7 +210,7 @@ Field( item="30B", name='RACE_AMER_INDIAN', - friendly_name="race american-indian", + friendly_name="Race/Ethnicity: American Indian or Alaska Native", type='number', startIndex=39, endIndex=40, @@ -227,7 +220,7 @@ Field( item="30C", name='RACE_ASIAN', - friendly_name="race asian", + friendly_name="Race/Ethnicity: Asian", type='number', startIndex=40, endIndex=41, @@ -237,7 +230,7 @@ Field( item="30D", name='RACE_BLACK', - friendly_name="race black", + friendly_name="Race/Ethnicity: Black or African American", type='number', startIndex=41, endIndex=42, @@ -247,7 +240,7 @@ Field( item="30E", name='RACE_HAWAIIAN', - friendly_name="race hawaiian", + friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", type='number', startIndex=42, endIndex=43, @@ -257,7 +250,7 @@ Field( item="30F", name='RACE_WHITE', - friendly_name="race white", + friendly_name="Race/Ethnicity: White", type='number', startIndex=43, endIndex=44, @@ -267,7 +260,7 @@ Field( item="31", name='GENDER', - friendly_name="gender", + friendly_name="Gender", type='number', startIndex=44, endIndex=45, @@ -277,7 +270,7 @@ Field( item="32A", name='FED_OASDI_PROGRAM', - friendly_name="federal old-age survivors and disability insurance program", + friendly_name="Receives Disability Benefits: OASDI Program", type='number', startIndex=45, endIndex=46, @@ -287,7 +280,7 @@ Field( item="32B", name='FED_DISABILITY_STATUS', - friendly_name="federal disability status", + friendly_name="Receives Disability Benefits: Federal Disability Status", type='number', startIndex=46, endIndex=47, @@ -297,7 +290,7 @@ Field( item="32C", name='DISABLED_TITLE_XIVAPDT', - friendly_name="received aid under Title XIV-APDT", + friendly_name="Receives Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", type='number', startIndex=47, endIndex=48, @@ -307,7 +300,7 @@ Field( item="32D", name='AID_AGED_BLIND', - friendly_name="receives from aid to the aged, blind, and disabled program", + friendly_name="Receives Disability Benefits: Code no longer in use.", type='number', startIndex=48, endIndex=49, @@ -317,7 +310,7 @@ Field( item="32E", name='RECEIVE_SSI', - friendly_name="receives SSI", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI ", type='number', startIndex=49, endIndex=50, @@ -327,7 +320,7 @@ Field( item="33", name='MARITAL_STATUS', - friendly_name="marital status", + friendly_name="Marital Status", type='number', startIndex=50, endIndex=51, @@ -337,7 +330,7 @@ Field( item="34", name='RELATIONSHIP_HOH', - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type='string', startIndex=51, endIndex=53, @@ -347,7 +340,7 @@ Field( item="35", name='PARENT_MINOR_CHILD', - friendly_name="parent of minor child", + friendly_name="Parent with Minor Child in the Family", type='number', startIndex=53, endIndex=54, @@ -357,7 +350,7 @@ Field( item="36", name='NEEDS_PREGNANT_WOMAN', - friendly_name="needs of pregnant woman", + friendly_name="Needs of a Pregnant Woman", type='number', startIndex=54, endIndex=55, @@ -367,7 +360,7 @@ Field( item="37", name='EDUCATION_LEVEL', - friendly_name="education level", + friendly_name="Educational Level", type='number', startIndex=55, endIndex=57, @@ -381,7 +374,7 @@ Field( item="38", name='CITIZENSHIP_STATUS', - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type='number', startIndex=57, endIndex=58, @@ -391,7 +384,7 @@ Field( item="39", name='COOPERATION_CHILD_SUPPORT', - friendly_name="cooperation with child support", + friendly_name="Cooperated with Child Support", type='number', startIndex=58, endIndex=59, @@ -401,7 +394,7 @@ Field( item="40", name='EMPLOYMENT_STATUS', - friendly_name="employment status", + friendly_name="Employment Status", type='number', startIndex=59, endIndex=60, @@ -411,7 +404,7 @@ Field( item="41", name='WORK_ELIGIBLE_INDICATOR', - friendly_name="work eligible indicator", + friendly_name="Work-Eligible Individual Indicator", type='number', startIndex=60, endIndex=62, @@ -427,7 +420,7 @@ Field( item="42", name='WORK_PART_STATUS', - friendly_name="work participation status", + friendly_name="Work Participation Status", type='number', startIndex=62, endIndex=64, @@ -437,7 +430,7 @@ Field( item="43", name='UNSUB_EMPLOYMENT', - friendly_name="unsubsidized employment", + friendly_name="Unsubsidized Employment", type='number', startIndex=64, endIndex=66, @@ -447,7 +440,7 @@ Field( item="44", name='SUB_PRIVATE_EMPLOYMENT', - friendly_name="subsidized private employment", + friendly_name="Subsidized Private-Sector Employment", type='number', startIndex=66, endIndex=68, @@ -457,7 +450,7 @@ Field( item="45", name='SUB_PUBLIC_EMPLOYMENT', - friendly_name="subsidized public employment", + friendly_name="Subsidized Public-Sector Employment", type='number', startIndex=68, endIndex=70, @@ -467,7 +460,7 @@ Field( item="46A", name='WORK_EXPERIENCE_HOP', - friendly_name="work experience - hours of participation", + friendly_name="Work Experience: Hours of Participation", type='number', startIndex=70, endIndex=72, @@ -477,7 +470,7 @@ Field( item="46B", name='WORK_EXPERIENCE_EA', - friendly_name="work experience - excused absence", + friendly_name="Work Experience: Hours of Excused Absences", type='number', startIndex=72, endIndex=74, @@ -487,7 +480,7 @@ Field( item="46C", name='WORK_EXPERIENCE_HOL', - friendly_name="work experience hours - holiday", + friendly_name="Work Experience: Hours of Holidays", type='number', startIndex=74, endIndex=76, @@ -497,7 +490,7 @@ Field( item="47", name='OJT', - friendly_name="OJT", + friendly_name="On-the-job Training ", type='number', startIndex=76, endIndex=78, @@ -507,7 +500,7 @@ Field( item="48A", name='JOB_SEARCH_HOP', - friendly_name="job search - hours of participation", + friendly_name="Job Search and Job Readiness Assistance: Hours of Participation", type='number', startIndex=78, endIndex=80, @@ -517,7 +510,7 @@ Field( item="48B", name='JOB_SEARCH_EA', - friendly_name="job search - excused absence", + friendly_name="Job Search and Job Readiness Assistance: Hours of Excused Absences", type='number', startIndex=80, endIndex=82, @@ -527,7 +520,7 @@ Field( item="48C", name='JOB_SEARCH_HOL', - friendly_name="job search - holiday", + friendly_name="Job Search and Job Readiness Assistance: Hours of Holidays", type='number', startIndex=82, endIndex=84, @@ -537,7 +530,7 @@ Field( item="49A", name='COMM_SERVICES_HOP', - friendly_name="community services - hours of participation", + friendly_name="Community Service Program: Hours of Participation", type='number', startIndex=84, endIndex=86, @@ -547,7 +540,7 @@ Field( item="49B", name='COMM_SERVICES_EA', - friendly_name="community services - excused absence", + friendly_name="Community Service Program: Hours of Excused Absences", type='number', startIndex=86, endIndex=88, @@ -557,7 +550,7 @@ Field( item="49C", name='COMM_SERVICES_HOL', - friendly_name="community services - holiday", + friendly_name="Community Service Program: Hours of Holidays", type='number', startIndex=88, endIndex=90, @@ -567,7 +560,7 @@ Field( item="50A", name='VOCATIONAL_ED_TRAINING_HOP', - friendly_name="vocational education training - hours of participation", + friendly_name="Vocational Educational Training: Hours of Participation", type='number', startIndex=90, endIndex=92, @@ -577,7 +570,7 @@ Field( item="50B", name='VOCATIONAL_ED_TRAINING_EA', - friendly_name="vocational education training - excused absence", + friendly_name="Vocational Educational Training: Hours of Excused Absences", type='number', startIndex=92, endIndex=94, @@ -587,7 +580,7 @@ Field( item="50C", name='VOCATIONAL_ED_TRAINING_HOL', - friendly_name="vocational education training - holiday", + friendly_name="Vocational Educational Training: Hours of Holidays", type='number', startIndex=94, endIndex=96, @@ -597,7 +590,7 @@ Field( item="51A", name='JOB_SKILLS_TRAINING_HOP', - friendly_name="job skills training - hours of participation", + friendly_name="Job Skills Training: Hours of Participation", type='number', startIndex=96, endIndex=98, @@ -607,7 +600,7 @@ Field( item="51B", name='JOB_SKILLS_TRAINING_EA', - friendly_name="job skills training - excused absence", + friendly_name="Job Skills Training: Hours of Excused Absences", type='number', startIndex=98, endIndex=100, @@ -617,7 +610,7 @@ Field( item="51C", name='JOB_SKILLS_TRAINING_HOL', - friendly_name="job skills training - holiday", + friendly_name="Job Skills Training: Hours of Holidays", type='number', startIndex=100, endIndex=102, @@ -627,7 +620,7 @@ Field( item="52A", name='ED_NO_HIGH_SCHOOL_DIPL_HOP', - friendly_name="education no high school diploma - hours of participation", + friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Participation", type='number', startIndex=102, endIndex=104, @@ -637,7 +630,7 @@ Field( item="52B", name='ED_NO_HIGH_SCHOOL_DIPL_EA', - friendly_name="education no high school diploma - excused absence", + friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", type='number', startIndex=104, endIndex=106, @@ -647,7 +640,7 @@ Field( item="52C", name='ED_NO_HIGH_SCHOOL_DIPL_HOL', - friendly_name="education no high school diploma - holiday", + friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Holidays", type='number', startIndex=106, endIndex=108, @@ -657,7 +650,7 @@ Field( item="53A", name='SCHOOL_ATTENDENCE_HOP', - friendly_name="school attendance - hours of participation", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate of High School Equivalency: Hours of Participation", type='number', startIndex=108, endIndex=110, @@ -667,7 +660,7 @@ Field( item="53B", name='SCHOOL_ATTENDENCE_EA', - friendly_name="school attendance - excused absence", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", type='number', startIndex=110, endIndex=112, @@ -677,7 +670,7 @@ Field( item="53C", name='SCHOOL_ATTENDENCE_HOL', - friendly_name="school attendance - holiday", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Holidays", type='number', startIndex=112, endIndex=114, @@ -687,7 +680,7 @@ Field( item="54A", name='PROVIDE_CC_HOP', - friendly_name="provide child care - hours of participation", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Participation", type='number', startIndex=114, endIndex=116, @@ -697,7 +690,7 @@ Field( item="54B", name='PROVIDE_CC_EA', - friendly_name="provide child care - excused absence", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Excused Absences", type='number', startIndex=116, endIndex=118, @@ -707,7 +700,7 @@ Field( item="54C", name='PROVIDE_CC_HOL', - friendly_name="provide child care - holiday", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Holidays", type='number', startIndex=118, endIndex=120, @@ -717,7 +710,7 @@ Field( item="55", name='OTHER_WORK_ACTIVITIES', - friendly_name="other work activities", + friendly_name="Hours of Other Work Activities", type='number', startIndex=120, endIndex=122, @@ -727,7 +720,7 @@ Field( item="56", name='DEEMED_HOURS_FOR_OVERALL', - friendly_name="deemed hours for overall", + friendly_name="Number of Deemed Core Hours for Overall Rate", type='number', startIndex=122, endIndex=124, @@ -737,7 +730,7 @@ Field( item="57", name='DEEMED_HOURS_FOR_TWO_PARENT', - friendly_name="deemed hours for two parents", + friendly_name="Number of Deemed Core Hours for the Two-Parent Rate", type='number', startIndex=124, endIndex=126, @@ -747,7 +740,7 @@ Field( item="58", name='EARNED_INCOME', - friendly_name="earned income", + friendly_name="Amount of Earned Income", type='number', startIndex=126, endIndex=130, @@ -757,7 +750,7 @@ Field( item="59A", name='UNEARNED_INCOME_TAX_CREDIT', - friendly_name="unearned income tax credit", + friendly_name="Amount of Unearned Income: Tax Credit", type='number', startIndex=130, endIndex=134, @@ -767,7 +760,7 @@ Field( item="59B", name='UNEARNED_SOCIAL_SECURITY', - friendly_name="unearned social security", + friendly_name="Amount of Unearned Income: Social Security", type='number', startIndex=134, endIndex=138, @@ -777,7 +770,7 @@ Field( item="59C", name='UNEARNED_SSI', - friendly_name="unearned SSI benefit", + friendly_name="Amount of Unearned Income: Social Security: SSI Benefit", type='number', startIndex=138, endIndex=142, @@ -787,7 +780,7 @@ Field( item="59D", name='UNEARNED_WORKERS_COMP', - friendly_name="unearned workers compensation", + friendly_name="Amount of Unearned Income: Worker's Compensation", type='number', startIndex=142, endIndex=146, @@ -797,7 +790,7 @@ Field( item="59E", name='OTHER_UNEARNED_INCOME', - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type='number', startIndex=146, endIndex=150, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index 2f8971c68..039b7b938 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -11,10 +11,6 @@ document=SSP_M3DataSubmissionDocument(), preparsing_validators=[ validators.notEmpty(start=19, end=60), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -95,7 +91,7 @@ Field( item="0", name='RecordType', - friendly_name="record type", + friendly_name="Record Type", type='string', startIndex=0, endIndex=2, @@ -105,7 +101,7 @@ Field( item="3", name='RPT_MONTH_YEAR', - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type='number', startIndex=2, endIndex=8, @@ -118,7 +114,7 @@ Field( item="5", name='CASE_NUMBER', - friendly_name="case number", + friendly_name="Case Number", type='string', startIndex=8, endIndex=19, @@ -128,7 +124,7 @@ Field( item="60", name='FAMILY_AFFILIATION', - friendly_name="family affiliation", + friendly_name="Family Affiliation", type='number', startIndex=19, endIndex=20, @@ -138,22 +134,21 @@ Field( item="61", name='DATE_OF_BIRTH', - friendly_name="date of birth", + friendly_name="Date of Birth", type='string', startIndex=20, endIndex=28, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1998), + validators.dateMonthIsValid(), + ] ), TransformField( transform_func=ssp_ssn_decryption_func, item="62", name='SSN', - friendly_name="social security number", + friendly_name="Social Security Number", type='string', startIndex=28, endIndex=37, @@ -164,7 +159,7 @@ Field( item="63A", name='RACE_HISPANIC', - friendly_name="race hispanic", + friendly_name="Race/Ethnicity: Hispanic or Latino", type='number', startIndex=37, endIndex=38, @@ -174,7 +169,7 @@ Field( item="63B", name='RACE_AMER_INDIAN', - friendly_name="race american-indian", + friendly_name="Race/Ethnicity: American Indian or Alaska Native", type='number', startIndex=38, endIndex=39, @@ -184,7 +179,7 @@ Field( item="63C", name='RACE_ASIAN', - friendly_name="race asian", + friendly_name="Race/Ethnicity: Asian", type='number', startIndex=39, endIndex=40, @@ -194,7 +189,7 @@ Field( item="63D", name='RACE_BLACK', - friendly_name="race black", + friendly_name="Race/Ethnicity: Black or African American", type='number', startIndex=40, endIndex=41, @@ -204,7 +199,7 @@ Field( item="63E", name='RACE_HAWAIIAN', - friendly_name="race hawaiian", + friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", type='number', startIndex=41, endIndex=42, @@ -214,7 +209,7 @@ Field( item="63F", name='RACE_WHITE', - friendly_name="race white", + friendly_name="Race/Ethnicity: White", type='number', startIndex=42, endIndex=43, @@ -224,7 +219,7 @@ Field( item="64", name='GENDER', - friendly_name="gender", + friendly_name="Gender", type='number', startIndex=43, endIndex=44, @@ -234,7 +229,7 @@ Field( item="65A", name='RECEIVE_NONSSI_BENEFITS', - friendly_name="receive non-SSI benefits", + friendly_name="Receives Disability Benefits: Federal Disability Status", type='number', startIndex=44, endIndex=45, @@ -244,7 +239,7 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="receives SSI", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or Aged, Blind, and Disabled Under Title XVI-AABD", type='number', startIndex=45, endIndex=46, @@ -254,7 +249,7 @@ Field( item="66", name='RELATIONSHIP_HOH', - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type='number', startIndex=46, endIndex=48, @@ -264,7 +259,7 @@ Field( item="67", name='PARENT_MINOR_CHILD', - friendly_name="parent of minor child", + friendly_name="Parental Status of Minor", type='number', startIndex=48, endIndex=49, @@ -274,7 +269,7 @@ Field( item="68", name='EDUCATION_LEVEL', - friendly_name="education level", + friendly_name="Educational Level", type='number', startIndex=49, endIndex=51, @@ -289,7 +284,7 @@ Field( item="69", name='CITIZENSHIP_STATUS', - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type='number', startIndex=51, endIndex=52, @@ -299,7 +294,7 @@ Field( item="70A", name='UNEARNED_SSI', - friendly_name="unearned SSI benefit", + friendly_name="Amount of Unearned Income: SSI", type='number', startIndex=52, endIndex=56, @@ -309,7 +304,7 @@ Field( item="70B", name='OTHER_UNEARNED_INCOME', - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type='number', startIndex=56, endIndex=60, @@ -324,10 +319,6 @@ quiet_preparser_errors=True, preparsing_validators=[ validators.notEmpty(start=60, end=101), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -408,7 +399,7 @@ Field( item="0", name='RecordType', - friendly_name="record type", + friendly_name="Record Type", type='string', startIndex=0, endIndex=2, @@ -418,7 +409,7 @@ Field( item="3", name='RPT_MONTH_YEAR', - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type='number', startIndex=2, endIndex=8, @@ -431,7 +422,7 @@ Field( item="5", name='CASE_NUMBER', - friendly_name="case number", + friendly_name="Case Number", type='string', startIndex=8, endIndex=19, @@ -441,7 +432,7 @@ Field( item="60", name='FAMILY_AFFILIATION', - friendly_name="family affiliation", + friendly_name="Family Affiliation", type='number', startIndex=60, endIndex=61, @@ -451,22 +442,21 @@ Field( item="61", name='DATE_OF_BIRTH', - friendly_name="date of birth", + friendly_name="Date of Birth", type='string', startIndex=61, endIndex=69, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1998), + validators.dateMonthIsValid(), + ] ), TransformField( transform_func=ssp_ssn_decryption_func, item="62", name='SSN', - friendly_name="social security number", + friendly_name="Social Security Number", type='string', startIndex=69, endIndex=78, @@ -477,7 +467,7 @@ Field( item="63A", name='RACE_HISPANIC', - friendly_name="race hispanic", + friendly_name="Race/Ethnicity: Hispanic or Latino", type='number', startIndex=78, endIndex=79, @@ -487,7 +477,7 @@ Field( item="63B", name='RACE_AMER_INDIAN', - friendly_name="race american-indian", + friendly_name="Race/Ethnicity: American Indian or Alaska Native", type='number', startIndex=79, endIndex=80, @@ -497,7 +487,7 @@ Field( item="63C", name='RACE_ASIAN', - friendly_name="race asian", + friendly_name="Race/Ethnicity: Asian", type='number', startIndex=80, endIndex=81, @@ -507,7 +497,7 @@ Field( item="63D", name='RACE_BLACK', - friendly_name="race black", + friendly_name="Race/Ethnicity: Black or African American", type='number', startIndex=81, endIndex=82, @@ -517,7 +507,7 @@ Field( item="63E", name='RACE_HAWAIIAN', - friendly_name="race hawaiian", + friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", type='number', startIndex=82, endIndex=83, @@ -527,7 +517,7 @@ Field( item="63F", name='RACE_WHITE', - friendly_name="race white", + friendly_name="Race/Ethnicity: White", type='number', startIndex=83, endIndex=84, @@ -537,7 +527,7 @@ Field( item="64", name='GENDER', - friendly_name="gender", + friendly_name="Gender", type='number', startIndex=84, endIndex=85, @@ -547,7 +537,7 @@ Field( item="65A", name='RECEIVE_NONSSI_BENEFITS', - friendly_name="receives non-SSI benefit", + friendly_name="Receives Disability Benefits: Federal Disability Status", type='number', startIndex=85, endIndex=86, @@ -557,7 +547,7 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="receives ssi", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or Aged, Blind, and Disabled Under Title XVI-AABD", type='number', startIndex=86, endIndex=87, @@ -567,7 +557,7 @@ Field( item="66", name='RELATIONSHIP_HOH', - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type='number', startIndex=87, endIndex=89, @@ -577,7 +567,7 @@ Field( item="67", name='PARENT_MINOR_CHILD', - friendly_name="parent of minor child", + friendly_name="Parental Status of Minor", type='number', startIndex=89, endIndex=90, @@ -587,7 +577,7 @@ Field( item="68", name='EDUCATION_LEVEL', - friendly_name="education level", + friendly_name="Educational Level", type='number', startIndex=90, endIndex=92, @@ -602,7 +592,7 @@ Field( item="69", name='CITIZENSHIP_STATUS', - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type='number', startIndex=92, endIndex=93, @@ -612,7 +602,7 @@ Field( item="70A", name='UNEARNED_SSI', - friendly_name="unearned SSI benefit", + friendly_name="Amount of Unearned Income: SSI", type='number', startIndex=93, endIndex=97, @@ -622,7 +612,7 @@ Field( item="70B", name='OTHER_UNEARNED_INCOME', - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type='number', startIndex=97, endIndex=101, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py index 5dabf960d..89f916984 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py @@ -12,10 +12,6 @@ document=SSP_M4DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(66), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[], @@ -23,7 +19,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -33,7 +29,7 @@ Field( item="3", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -46,7 +42,7 @@ Field( item="5", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -56,7 +52,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="county fips code", + friendly_name="County FIPS Code", type="string", startIndex=19, endIndex=22, @@ -66,7 +62,7 @@ Field( item="4", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=22, endIndex=24, @@ -76,7 +72,7 @@ Field( item="6", name="ZIP_CODE", - friendly_name="zip code", + friendly_name="ZIP Code", type="string", startIndex=24, endIndex=29, @@ -86,7 +82,7 @@ Field( item="7", name="DISPOSITION", - friendly_name="disposition", + friendly_name="Disposition", type="number", startIndex=29, endIndex=30, @@ -96,7 +92,7 @@ Field( item="8", name="CLOSURE_REASON", - friendly_name="closure reason", + friendly_name="Reason for Closure", type="string", startIndex=30, endIndex=32, @@ -111,7 +107,7 @@ Field( item="9", name="REC_SUB_HOUSING", - friendly_name="receives subsidized housing", + friendly_name="Received Subsidized Housing", type="number", startIndex=32, endIndex=33, @@ -121,7 +117,7 @@ Field( item="10`", name="REC_MED_ASSIST", - friendly_name="receives medical assistance", + friendly_name="Received Medical Assistance", type="number", startIndex=33, endIndex=34, @@ -131,7 +127,7 @@ Field( item="11", name="REC_FOOD_STAMPS", - friendly_name="receives food stamps", + friendly_name="Received Assistance from the Supplemental Nutrition Assistance Program (SNAP)", type="number", startIndex=34, endIndex=35, @@ -141,7 +137,7 @@ Field( item="12", name="REC_SUB_CC", - friendly_name="receives subsidized child care", + friendly_name="Received Subsidized Child Care", type="number", startIndex=35, endIndex=36, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py index 578eebefe..35f5f0121 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py @@ -14,10 +14,6 @@ document=SSP_M5DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(66), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -108,7 +104,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -118,7 +114,7 @@ Field( item="3", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -131,7 +127,7 @@ Field( item="5", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -141,7 +137,7 @@ Field( item="13", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -151,22 +147,21 @@ Field( item="14", name="DATE_OF_BIRTH", - friendly_name="date of birth", + friendly_name="Date of Birth", type="string", startIndex=20, endIndex=28, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ], + validators=[ + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=ssp_ssn_decryption_func, item="15", name="SSN", - friendly_name="social security number", + friendly_name="Social Security Number", type="string", startIndex=28, endIndex=37, @@ -177,7 +172,7 @@ Field( item="16A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Race/Ethnicity: Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -187,7 +182,7 @@ Field( item="16B", name="RACE_AMER_INDIAN", - friendly_name="race american-indian", + friendly_name="Race/Ethnicity: American Indian or Alaska Native", type="number", startIndex=38, endIndex=39, @@ -197,7 +192,7 @@ Field( item="16C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Race/Ethnicity: Asian", type="number", startIndex=39, endIndex=40, @@ -207,7 +202,7 @@ Field( item="16D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Race/Ethnicity: Black or African American", type="number", startIndex=40, endIndex=41, @@ -217,7 +212,7 @@ Field( item="16E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -227,7 +222,7 @@ Field( item="16F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Race/Ethnicity: White", type="number", startIndex=42, endIndex=43, @@ -237,7 +232,7 @@ Field( item="17", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=43, endIndex=44, @@ -247,7 +242,7 @@ Field( item="18A", name="REC_OASDI_INSURANCE", - friendly_name="receives old-age survivors and disability insurance", + friendly_name="Received Disability Benefits: OASDI Program", type="number", startIndex=44, endIndex=45, @@ -257,7 +252,7 @@ Field( item="18B", name="REC_FEDERAL_DISABILITY", - friendly_name="receives federal disability", + friendly_name="Received Disability Benefits: Federal Disability Status", type="number", startIndex=45, endIndex=46, @@ -267,7 +262,7 @@ Field( item="18C", name="REC_AID_TOTALLY_DISABLED", - friendly_name="receives aid for totally disabled", + friendly_name="Received Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", type="number", startIndex=46, endIndex=47, @@ -277,7 +272,7 @@ Field( item="18D", name="REC_AID_AGED_BLIND", - friendly_name="receives from aid to the aged, blind, and disabled program", + friendly_name="Received Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", type="number", startIndex=47, endIndex=48, @@ -287,7 +282,7 @@ Field( item="18E", name="REC_SSI", - friendly_name="receives SSI", + friendly_name="Received Disability Benefits: Supplemental Security Income Under Title XVI-SSI", type="number", startIndex=48, endIndex=49, @@ -297,7 +292,7 @@ Field( item="19", name="MARITAL_STATUS", - friendly_name="marital status", + friendly_name="Marital Status", type="number", startIndex=49, endIndex=50, @@ -307,7 +302,7 @@ Field( item="20", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=50, endIndex=52, @@ -317,7 +312,7 @@ Field( item="21", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent with Minor Child in the Family", type="number", startIndex=52, endIndex=53, @@ -327,7 +322,7 @@ Field( item="22", name="NEEDS_OF_PREGNANT_WOMAN", - friendly_name="needs of pregnant woman", + friendly_name="Needs of a Pregnant Woman", type="number", startIndex=53, endIndex=54, @@ -337,7 +332,7 @@ Field( item="23", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=54, endIndex=56, @@ -352,7 +347,7 @@ Field( item="24", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type="number", startIndex=56, endIndex=57, @@ -367,7 +362,7 @@ Field( item="25", name="EMPLOYMENT_STATUS", - friendly_name="employment status", + friendly_name="Employment Status", type="number", startIndex=57, endIndex=58, @@ -377,7 +372,7 @@ Field( item="26", name="AMOUNT_EARNED_INCOME", - friendly_name="amount of earned income", + friendly_name="Amount of Earned Income", type="string", startIndex=58, endIndex=62, @@ -387,7 +382,7 @@ Field( item="27", name="AMOUNT_UNEARNED_INCOME", - friendly_name="amount of unearned income", + friendly_name="Amount of Earned Income", type="string", startIndex=62, endIndex=66, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py index ceea6735b..f7b686caa 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py @@ -11,7 +11,6 @@ document=SSP_M6DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(259), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -32,7 +31,7 @@ Field( item="0", name='RecordType', - friendly_name='record type', + friendly_name='Record Type', type='string', startIndex=0, endIndex=2, @@ -42,7 +41,7 @@ Field( item="2", name='CALENDAR_QUARTER', - friendly_name='calendar quarter', + friendly_name='Calendar Quarter', type='number', startIndex=2, endIndex=7, @@ -56,7 +55,7 @@ calendar_quarter_to_rpt_month_year(0), item="2B", name='RPT_MONTH_YEAR', - friendly_name='reporting month and year', + friendly_name='Reporting Year and Month', type='number', startIndex=2, endIndex=7, @@ -69,7 +68,7 @@ Field( item="3A", name='SSPMOE_FAMILIES', - friendly_name='ssp/moe families', + friendly_name='SSP-MOE Families', type='number', startIndex=7, endIndex=15, @@ -79,7 +78,7 @@ Field( item="4A", name='NUM_2_PARENTS', - friendly_name='number of two-parent families', + friendly_name='SSP-MOE Two-Parent Families', type='number', startIndex=31, endIndex=39, @@ -89,7 +88,7 @@ Field( item="5A", name='NUM_1_PARENTS', - friendly_name='number of one-parent families', + friendly_name='SSP-MOE One-Parent Families', type='number', startIndex=55, endIndex=63, @@ -99,7 +98,7 @@ Field( item="6A", name='NUM_NO_PARENTS', - friendly_name='number of no-parent families', + friendly_name='SSP-MOE No-Parent Families', type='number', startIndex=79, endIndex=87, @@ -109,7 +108,7 @@ Field( item="7A", name='NUM_RECIPIENTS', - friendly_name='number of recipients', + friendly_name='SSP-MOE Recipient', type='number', startIndex=103, endIndex=111, @@ -119,7 +118,7 @@ Field( item="8A", name='ADULT_RECIPIENTS', - friendly_name='number of adult recipients', + friendly_name='SSP-MOE Adult Recipients', type='number', startIndex=127, endIndex=135, @@ -129,7 +128,7 @@ Field( item="9A", name='CHILD_RECIPIENTS', - friendly_name='number of child recipients', + friendly_name='SSP-MOE Child Recipients', type='number', startIndex=151, endIndex=159, @@ -139,7 +138,7 @@ Field( item="10A", name='NONCUSTODIALS', - friendly_name='number of noncustodial parents', + friendly_name='Total Number of Noncustodial Parents Participating in Work Activities', type='number', startIndex=175, endIndex=183, @@ -149,7 +148,7 @@ Field( item="11A", name='AMT_ASSISTANCE', - friendly_name='amount of assistance', + friendly_name='SSP-MOE Amount of Assistance', type='number', startIndex=199, endIndex=211, @@ -159,7 +158,7 @@ Field( item="12A", name='CLOSED_CASES', - friendly_name='number of closed cases', + friendly_name='SSP-MOE Number of Closed Cases', type='number', startIndex=235, endIndex=243, @@ -171,10 +170,8 @@ s2 = RowSchema( document=SSP_M6DataSubmissionDocument(), - quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(259), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -195,7 +192,7 @@ Field( item="0", name='RecordType', - friendly_name='record type', + friendly_name='Record Type', type='string', startIndex=0, endIndex=2, @@ -205,7 +202,7 @@ Field( item="2", name='CALENDAR_QUARTER', - friendly_name='calendar quarter', + friendly_name='Calendar Quarter', type='number', startIndex=2, endIndex=7, @@ -219,7 +216,7 @@ calendar_quarter_to_rpt_month_year(1), item="2B", name='RPT_MONTH_YEAR', - friendly_name='reporting month and year', + friendly_name='Reporting Year and Month', type='number', startIndex=2, endIndex=7, @@ -232,7 +229,7 @@ Field( item="3B", name='SSPMOE_FAMILIES', - friendly_name='ssp/moe families', + friendly_name='SSP-MOE Families', type='number', startIndex=15, endIndex=23, @@ -242,7 +239,7 @@ Field( item="4B", name='NUM_2_PARENTS', - friendly_name='number of two-parent families', + friendly_name='SSP-MOE Two-Parent Families', type='number', startIndex=39, endIndex=47, @@ -252,7 +249,7 @@ Field( item="5B", name='NUM_1_PARENTS', - friendly_name='number of one-parent families', + friendly_name='SSP-MOE One-Parent Families', type='number', startIndex=63, endIndex=71, @@ -262,7 +259,7 @@ Field( item="6B", name='NUM_NO_PARENTS', - friendly_name='number of no-parent families', + friendly_name='SSP-MOE No-Parent Families', type='number', startIndex=87, endIndex=95, @@ -272,7 +269,7 @@ Field( item="7B", name='NUM_RECIPIENTS', - friendly_name='number of recipients', + friendly_name='SSP-MOERecipients', type='number', startIndex=111, endIndex=119, @@ -282,7 +279,7 @@ Field( item="8B", name='ADULT_RECIPIENTS', - friendly_name='number of adult recipients', + friendly_name='SSP-MOE Adult Recipients', type='number', startIndex=135, endIndex=143, @@ -292,7 +289,7 @@ Field( item="9B", name='CHILD_RECIPIENTS', - friendly_name='number of child recipients', + friendly_name='SSP-MOE Child Recipients', type='number', startIndex=159, endIndex=167, @@ -302,7 +299,7 @@ Field( item="10B", name='NONCUSTODIALS', - friendly_name='number of noncustodial parents', + friendly_name='SSP-MOE Noncustodial Parents Participating in Work Activities', type='number', startIndex=183, endIndex=191, @@ -312,7 +309,7 @@ Field( item="11B", name='AMT_ASSISTANCE', - friendly_name='amount of assistance', + friendly_name='SSP-MOE Amount of Assistance', type='number', startIndex=211, endIndex=223, @@ -322,7 +319,7 @@ Field( item="12B", name='CLOSED_CASES', - friendly_name='number of closed cases', + friendly_name='SSP-MOE Number of Closed Cases', type='number', startIndex=243, endIndex=251, @@ -334,10 +331,8 @@ s3 = RowSchema( document=SSP_M6DataSubmissionDocument(), - quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(259), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -358,7 +353,7 @@ Field( item="0", name='RecordType', - friendly_name='record type', + friendly_name='Record Type', type='string', startIndex=0, endIndex=2, @@ -368,7 +363,7 @@ Field( item="2", name='CALENDAR_QUARTER', - friendly_name='calendar quarter', + friendly_name='Calendar Quarter', type='number', startIndex=2, endIndex=7, @@ -382,7 +377,7 @@ calendar_quarter_to_rpt_month_year(2), item="2B", name='RPT_MONTH_YEAR', - friendly_name='reporting month and year', + friendly_name='Reporting Year and Month', type='number', startIndex=2, endIndex=7, @@ -395,7 +390,7 @@ Field( item="3C", name='SSPMOE_FAMILIES', - friendly_name='ssp/moe families', + friendly_name='SSP-MOE Families', type='number', startIndex=23, endIndex=31, @@ -405,7 +400,7 @@ Field( item="4C", name='NUM_2_PARENTS', - friendly_name='number of two-parent families', + friendly_name='SSP-MOE Two-Parent Families', type='number', startIndex=47, endIndex=55, @@ -415,7 +410,7 @@ Field( item="5C", name='NUM_1_PARENTS', - friendly_name='number of one-parent families', + friendly_name='SSP-MOE One-Parent Families', type='number', startIndex=71, endIndex=79, @@ -425,7 +420,7 @@ Field( item="6C", name='NUM_NO_PARENTS', - friendly_name='number of no-parent families', + friendly_name='SSP-MOE No-Parent Families', type='number', startIndex=95, endIndex=103, @@ -435,7 +430,7 @@ Field( item="7C", name='NUM_RECIPIENTS', - friendly_name='number of recipients', + friendly_name='SSP-MOE Recipients', type='number', startIndex=119, endIndex=127, @@ -445,7 +440,7 @@ Field( item="8C", name='ADULT_RECIPIENTS', - friendly_name='number of adult recipients', + friendly_name='SSP-MOE Adult Recipients', type='number', startIndex=143, endIndex=151, @@ -455,7 +450,7 @@ Field( item="9C", name='CHILD_RECIPIENTS', - friendly_name='number of child recipients', + friendly_name='SSP-MOE Child Recipients', type='number', startIndex=167, endIndex=175, @@ -465,7 +460,7 @@ Field( item="10C", name='NONCUSTODIALS', - friendly_name='number of noncustodial parents', + friendly_name='SSP-MOE Noncustodial Parents Participating in Work Activities', type='number', startIndex=191, endIndex=199, @@ -475,7 +470,7 @@ Field( item="11C", name='AMT_ASSISTANCE', - friendly_name='amount of assistance', + friendly_name='SSP-MOE Amount of Assistance', type='number', startIndex=223, endIndex=235, @@ -485,7 +480,7 @@ Field( item="12C", name='CLOSED_CASES', - friendly_name='number of closed cases', + friendly_name='SSP-MOE Number of Closed Cases', type='number', startIndex=251, endIndex=259, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py index 2edb161b5..b2d31e994 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py @@ -25,14 +25,13 @@ validators.hasLength(247), validators.notEmpty(0, 7), validators.notEmpty(validator_index, validator_index + 24), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[], fields=[ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -42,7 +41,7 @@ Field( item="2", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -56,7 +55,7 @@ transform_func=calendar_quarter_to_rpt_month_year((i - 1) % 3), item="2A", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -69,7 +68,7 @@ Field( item="3", name="TDRS_SECTION_IND", - friendly_name="tdrs section indicator", + friendly_name="TDRS Section Indicator", type="string", startIndex=section_ind_index, endIndex=section_ind_index + 1, @@ -79,7 +78,7 @@ Field( item="4", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=stratum_index, endIndex=stratum_index + 2, @@ -89,7 +88,7 @@ Field( item=families_item_numbers[i - 1], name="FAMILIES_MONTH", - friendly_name="families month", + friendly_name="Families Month", type="number", startIndex=families_index, endIndex=families_index + 7, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 8662b19e6..946e3e692 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -12,10 +12,6 @@ document=TANF_T1DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(156), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -116,6 +112,8 @@ "CASH_AMOUNT", "CC_AMOUNT", "TRANSP_AMOUNT", + "TRANSITION_SERVICES_AMOUNT", + "OTHER_AMOUNT", ), 0, ), @@ -134,7 +132,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -147,7 +145,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -157,7 +155,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="county fips code", + friendly_name="County FIPS Code", type="string", startIndex=19, endIndex=22, @@ -169,7 +167,7 @@ Field( item="5", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=22, endIndex=24, @@ -181,7 +179,7 @@ Field( item="7", name="ZIP_CODE", - friendly_name="zip code", + friendly_name="ZIP Code", type="string", startIndex=24, endIndex=29, @@ -193,31 +191,31 @@ Field( item="8", name="FUNDING_STREAM", - friendly_name="funding stream", + friendly_name="Funding Stream", type="number", startIndex=29, endIndex=30, required=True, validators=[ - validators.isInLimits(1, 2), + validators.isInLimits(1, 3), ], ), Field( item="9", name="DISPOSITION", - friendly_name="disposition", + friendly_name="Disposition", type="number", startIndex=30, endIndex=31, required=True, validators=[ - validators.matches(1) + validators.oneOf([1, 2]), ], ), Field( item="10", name="NEW_APPLICANT", - friendly_name="new applicant", + friendly_name="Newly-Approved Applicant", type="number", startIndex=31, endIndex=32, @@ -229,7 +227,7 @@ Field( item="11", name="NBR_FAMILY_MEMBERS", - friendly_name="number of family members", + friendly_name="Number of Family Members", type="number", startIndex=32, endIndex=34, @@ -241,7 +239,7 @@ Field( item="12", name="FAMILY_TYPE", - friendly_name="family type", + friendly_name="Type of Family for Work Participation", type="number", startIndex=34, endIndex=35, @@ -253,19 +251,19 @@ Field( item="13", name="RECEIVES_SUB_HOUSING", - friendly_name="receives subsidized housing", + friendly_name="Receives Subsidized Housing", type="number", startIndex=35, endIndex=36, required=True, validators=[ - validators.isInLimits(1, 2), + validators.isInLimits(1, 3), ], ), Field( item="14", name="RECEIVES_MED_ASSISTANCE", - friendly_name="receives medical assistance", + friendly_name="Receives Medical Assistance", type="number", startIndex=36, endIndex=37, @@ -277,7 +275,7 @@ Field( item="15", name="RECEIVES_FOOD_STAMPS", - friendly_name="receives food stamps", + friendly_name="Receives Assistance from the Supplemental Nutrition Assistance Program (SNAP)", type="number", startIndex=37, endIndex=38, @@ -289,7 +287,7 @@ Field( item="16", name="AMT_FOOD_STAMP_ASSISTANCE", - friendly_name="amount of food stamp assistance", + friendly_name="Amount of Supplemental Nutrition Assistance Program (SNAP) Benefits", type="number", startIndex=38, endIndex=42, @@ -301,7 +299,7 @@ Field( item="17", name="RECEIVES_SUB_CC", - friendly_name="receives subsidized child care", + friendly_name="Received Subsidized Child Care", type="number", startIndex=42, endIndex=43, @@ -313,7 +311,7 @@ Field( item="18", name="AMT_SUB_CC", - friendly_name="amount of subsidized child care", + friendly_name="Amount of Subsidized Child Care", type="number", startIndex=43, endIndex=47, @@ -325,7 +323,7 @@ Field( item="19", name="CHILD_SUPPORT_AMT", - friendly_name="child support amount", + friendly_name="Amount of Child Support", type="number", startIndex=47, endIndex=51, @@ -337,7 +335,7 @@ Field( item="20", name="FAMILY_CASH_RESOURCES", - friendly_name="family cash resources", + friendly_name="Amount of the Family's Cash Resources", type="number", startIndex=51, endIndex=55, @@ -349,7 +347,7 @@ Field( item="21A", name="CASH_AMOUNT", - friendly_name="cash amount", + friendly_name="Cash and Cash Equivalents: Amount", type="number", startIndex=55, endIndex=59, @@ -361,7 +359,7 @@ Field( item="21B", name="NBR_MONTHS", - friendly_name="number of months", + friendly_name="Cash and Cash Equivalents: Number of Months", type="number", startIndex=59, endIndex=62, @@ -373,7 +371,7 @@ Field( item="22A", name="CC_AMOUNT", - friendly_name="child care amount", + friendly_name="TANF Child Care: Amount", type="number", startIndex=62, endIndex=66, @@ -385,7 +383,7 @@ Field( item="22B", name="CHILDREN_COVERED", - friendly_name="children covered", + friendly_name="TANF Child Care: Number of Children Covered", type="number", startIndex=66, endIndex=68, @@ -397,7 +395,7 @@ Field( item="22C", name="CC_NBR_MONTHS", - friendly_name="child care - number of months", + friendly_name="TANF Child Care: Number of Months", type="number", startIndex=68, endIndex=71, @@ -409,7 +407,7 @@ Field( item="23A", name="TRANSP_AMOUNT", - friendly_name="transportation amount", + friendly_name="Transportation and Other Supportive Services: Amount", type="number", startIndex=71, endIndex=75, @@ -421,7 +419,7 @@ Field( item="23B", name="TRANSP_NBR_MONTHS", - friendly_name="transportation - number of months", + friendly_name="Transportation and Other Supportive Services: Number of Months", type="number", startIndex=75, endIndex=78, @@ -433,7 +431,7 @@ Field( item="24A", name="TRANSITION_SERVICES_AMOUNT", - friendly_name="transition services amount", + friendly_name="Transitional Services: Amount", type="number", startIndex=78, endIndex=82, @@ -445,7 +443,7 @@ Field( item="24B", name="TRANSITION_NBR_MONTHS", - friendly_name="transition services - number of months", + friendly_name="Transitional Services: Number of Months", type="number", startIndex=82, endIndex=85, @@ -457,7 +455,7 @@ Field( item="25A", name="OTHER_AMOUNT", - friendly_name="other amount", + friendly_name="Other: Amount", type="number", startIndex=85, endIndex=89, @@ -469,7 +467,7 @@ Field( item="25B", name="OTHER_NBR_MONTHS", - friendly_name="other - number of months", + friendly_name="Other: Number of Months", type="number", startIndex=89, endIndex=92, @@ -481,7 +479,7 @@ Field( item="26AI", name="SANC_REDUCTION_AMT", - friendly_name="sanction reduction amount", + friendly_name="Total Dollar Amount of Reductions due to Sanctions", type="number", startIndex=92, endIndex=96, @@ -493,7 +491,7 @@ Field( item="26AII", name="WORK_REQ_SANCTION", - friendly_name="work requirement sanction", + friendly_name="Work Requirements Sanction", type="number", startIndex=96, endIndex=97, @@ -505,7 +503,7 @@ Field( item="26AIII", name="FAMILY_SANC_ADULT", - friendly_name="family sanction adult", + friendly_name="Sanctions: Code no longer in use", type="number", startIndex=97, endIndex=98, @@ -517,7 +515,7 @@ Field( item="26AIV", name="SANC_TEEN_PARENT", - friendly_name="sanctioned teen parent", + friendly_name="Sanction: Teen Parent not Attending School (or Alternative Training)", type="number", startIndex=98, endIndex=99, @@ -529,7 +527,7 @@ Field( item="26AV", name="NON_COOPERATION_CSE", - friendly_name="non-cooperation with child support", + friendly_name="Sanction: Non-Cooperation with Child Support", type="number", startIndex=99, endIndex=100, @@ -541,7 +539,7 @@ Field( item="26AVI", name="FAILURE_TO_COMPLY", - friendly_name="failure to comply", + friendly_name="Failure to Comply with an Individual Responsibility Plan", type="number", startIndex=100, endIndex=101, @@ -553,7 +551,7 @@ Field( item="26AVII", name="OTHER_SANCTION", - friendly_name="other sanction", + friendly_name="Other Sanction", type="number", startIndex=101, endIndex=102, @@ -565,7 +563,7 @@ Field( item="26B", name="RECOUPMENT_PRIOR_OVRPMT", - friendly_name="recoupment prior overpayment", + friendly_name="Recoupment of Prior Overpayment", type="number", startIndex=102, endIndex=106, @@ -577,7 +575,7 @@ Field( item="26CI", name="OTHER_TOTAL_REDUCTIONS", - friendly_name="other total reductions", + friendly_name="Other: Total Dollar Amount of Reductions", type="number", startIndex=106, endIndex=110, @@ -589,7 +587,7 @@ Field( item="26CII", name="FAMILY_CAP", - friendly_name="family cap", + friendly_name="Other: Family Cap", type="number", startIndex=110, endIndex=111, @@ -601,7 +599,7 @@ Field( item="26CIII", name="REDUCTIONS_ON_RECEIPTS", - friendly_name="reductions on receipts", + friendly_name="Other: Reductions Based on Time Limit", type="number", startIndex=111, endIndex=112, @@ -613,7 +611,7 @@ Field( item="26CIV", name="OTHER_NON_SANCTION", - friendly_name="other non-sanction", + friendly_name="Other: Non-Sanction, Non-Recoupment", type="number", startIndex=112, endIndex=113, @@ -625,7 +623,7 @@ Field( item="27", name="WAIVER_EVAL_CONTROL_GRPS", - friendly_name="waiver evaluation control groups", + friendly_name="Waiver Evaluation Experimental and Control Groups", type="string", startIndex=113, endIndex=114, @@ -641,7 +639,7 @@ Field( item="28", name="FAMILY_EXEMPT_TIME_LIMITS", - friendly_name="family exempt time limits", + friendly_name="Federal Time Limit Exemptions", type="number", startIndex=114, endIndex=116, @@ -651,7 +649,7 @@ Field( item="29", name="FAMILY_NEW_CHILD", - friendly_name="family new child", + friendly_name="TANF Family a New Child-Only Family", type="number", startIndex=116, endIndex=117, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index a20ff3a2b..36fba6621 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -14,10 +14,6 @@ document=TANF_T2DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(156), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -126,7 +122,6 @@ result_field="WORK_PART_STATUS", result_function=validators.notMatches("99"), ), - validators.validate__WORK_ELIGIBLE_INDICATOR__HOH__AGE(), ], fields=[ Field( @@ -142,7 +137,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -155,7 +150,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -165,7 +160,7 @@ Field( item="30", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -175,7 +170,7 @@ Field( item="31", name="NONCUSTODIAL_PARENT", - friendly_name="noncustodial parent", + friendly_name="Noncustodial Parent Indicator", type="number", startIndex=20, endIndex=21, @@ -185,22 +180,21 @@ Field( item="32", name="DATE_OF_BIRTH", - friendly_name="date of birth", - type="string", + friendly_name="Date of Birth", + type="number", startIndex=21, endIndex=29, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=tanf_ssn_decryption_func, item="33", name="SSN", - friendly_name="social security number", + friendly_name="Social Security Number", type="string", startIndex=29, endIndex=38, @@ -211,7 +205,7 @@ Field( item="34A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Race/Ethnicity: Hispanic or Latino", type="number", startIndex=38, endIndex=39, @@ -221,7 +215,7 @@ Field( item="34B", name="RACE_AMER_INDIAN", - friendly_name="race american-indian", + friendly_name="Race/Ethnicity: American Indian or Alaska Native", type="number", startIndex=39, endIndex=40, @@ -231,7 +225,7 @@ Field( item="34C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Race/Ethnicity: Asian", type="number", startIndex=40, endIndex=41, @@ -241,7 +235,7 @@ Field( item="34D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Race/Ethnicity: Black or African American", type="number", startIndex=41, endIndex=42, @@ -251,7 +245,7 @@ Field( item="34E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", type="number", startIndex=42, endIndex=43, @@ -261,7 +255,7 @@ Field( item="34F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Race/Ethnicity: White", type="number", startIndex=43, endIndex=44, @@ -271,7 +265,7 @@ Field( item="35", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=44, endIndex=45, @@ -283,7 +277,7 @@ Field( item="36A", name="FED_OASDI_PROGRAM", - friendly_name="federal old age survivors and disability insurance program", + friendly_name="Receives Disability Benefits: OASDI Program", type="number", startIndex=45, endIndex=46, @@ -293,7 +287,7 @@ Field( item="36B", name="FED_DISABILITY_STATUS", - friendly_name="federal disability status", + friendly_name="Receives Disability Benefits: Federal Disability Status", type="number", startIndex=46, endIndex=47, @@ -303,7 +297,7 @@ Field( item="36C", name="DISABLED_TITLE_XIVAPDT", - friendly_name="received aid under Title XIV-APDT", + friendly_name="Receives Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", type="string", startIndex=47, endIndex=48, @@ -318,7 +312,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="receives from the aid to the aged, blind, and disabled program", + friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under Title XVI-AABD ", type="number", startIndex=48, endIndex=49, @@ -330,7 +324,7 @@ Field( item="36E", name="RECEIVE_SSI", - friendly_name="receives SSI", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI", type="number", startIndex=49, endIndex=50, @@ -342,7 +336,7 @@ Field( item="37", name="MARITAL_STATUS", - friendly_name="marital status", + friendly_name="Marital Status", type="number", startIndex=50, endIndex=51, @@ -354,7 +348,7 @@ Field( item="38", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=51, endIndex=53, @@ -366,7 +360,7 @@ Field( item="39", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent with Minor Child in the Family", type="number", startIndex=53, endIndex=54, @@ -378,7 +372,7 @@ Field( item="40", name="NEEDS_PREGNANT_WOMAN", - friendly_name="needs of pregnant woman", + friendly_name="Needs of a Pregnant Woman", type="number", startIndex=54, endIndex=55, @@ -390,7 +384,7 @@ Field( item="41", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=55, endIndex=57, @@ -405,7 +399,7 @@ Field( item="42", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type="number", startIndex=57, endIndex=58, @@ -415,7 +409,7 @@ Field( item="43", name="COOPERATION_CHILD_SUPPORT", - friendly_name="cooperation with child support", + friendly_name="Cooperated with Child Support", type="number", startIndex=58, endIndex=59, @@ -427,7 +421,7 @@ Field( item="44", name="MONTHS_FED_TIME_LIMIT", - friendly_name="countable months toward federal time limit", + friendly_name="Number of Months Countable toward Federal Time Limit", type="string", startIndex=59, endIndex=62, @@ -439,7 +433,7 @@ Field( item="45", name="MONTHS_STATE_TIME_LIMIT", - friendly_name="months of state time limit", + friendly_name="Number of Countable Months Remaining Under State's Time Limit", type="string", startIndex=62, endIndex=64, @@ -451,7 +445,7 @@ Field( item="46", name="CURRENT_MONTH_STATE_EXEMPT", - friendly_name="current month state exempt", + friendly_name="Current Month Exempt from the State's Time Limit", type="number", startIndex=64, endIndex=65, @@ -463,7 +457,7 @@ Field( item="47", name="EMPLOYMENT_STATUS", - friendly_name="employment status", + friendly_name="Employment Status", type="number", startIndex=65, endIndex=66, @@ -475,7 +469,7 @@ Field( item="48", name="WORK_ELIGIBLE_INDICATOR", - friendly_name="work eligible indicator", + friendly_name="Work-Eligible Individual Indicator", type="string", startIndex=66, endIndex=68, @@ -490,11 +484,11 @@ Field( item="49", name="WORK_PART_STATUS", - friendly_name="work participation status", + friendly_name="Work Participation Status", type="string", startIndex=68, endIndex=70, - required=True, + required=False, validators=[ validators.oneOf( [ @@ -507,6 +501,7 @@ "16", "17", "18", + "19", "99", ] ) @@ -515,7 +510,7 @@ Field( item="50", name="UNSUB_EMPLOYMENT", - friendly_name="unsubsidized employment", + friendly_name="Unsubsidized Employment", type="string", startIndex=70, endIndex=72, @@ -527,7 +522,7 @@ Field( item="51", name="SUB_PRIVATE_EMPLOYMENT", - friendly_name="subsidized private employment", + friendly_name="Subsidized Private-Sector Employment", type="string", startIndex=72, endIndex=74, @@ -539,7 +534,7 @@ Field( item="52", name="SUB_PUBLIC_EMPLOYMENT", - friendly_name="subsidized public employment", + friendly_name="Subsidized Public-Sector Employment ", type="string", startIndex=74, endIndex=76, @@ -551,7 +546,7 @@ Field( item="53A", name="WORK_EXPERIENCE_HOP", - friendly_name="work experience - hours of participation", + friendly_name="Work Experience: Hours of Participation", type="string", startIndex=76, endIndex=78, @@ -563,7 +558,7 @@ Field( item="53B", name="WORK_EXPERIENCE_EA", - friendly_name="work experience - excused absence", + friendly_name="Work Experience: Hours of Excused Absences", type="string", startIndex=78, endIndex=80, @@ -575,7 +570,7 @@ Field( item="53C", name="WORK_EXPERIENCE_HOL", - friendly_name="work experience - holiday", + friendly_name="Work Experience: Hours of Holidays", type="string", startIndex=80, endIndex=82, @@ -587,7 +582,7 @@ Field( item="54", name="OJT", - friendly_name="on the job training", + friendly_name="On-the-job Training", type="string", startIndex=82, endIndex=84, @@ -599,7 +594,7 @@ Field( item="55A", name="JOB_SEARCH_HOP", - friendly_name="job search - hours of participation", + friendly_name="Job Search and Job Readiness Assistance: Hours of Participation", type="string", startIndex=84, endIndex=86, @@ -611,7 +606,7 @@ Field( item="55B", name="JOB_SEARCH_EA", - friendly_name="job search - excused absence", + friendly_name="Job Search and Job Readiness Assistance: Hours of Excused Absences", type="string", startIndex=86, endIndex=88, @@ -623,7 +618,7 @@ Field( item="55C", name="JOB_SEARCH_HOL", - friendly_name="job search - holidays", + friendly_name="Job Search and Job Readiness Assistance: Hours of Holidays", type="string", startIndex=88, endIndex=90, @@ -635,7 +630,7 @@ Field( item="56A", name="COMM_SERVICES_HOP", - friendly_name="community service - hours of participation", + friendly_name="Community Service Programs: Hours of Participation", type="string", startIndex=90, endIndex=92, @@ -647,7 +642,7 @@ Field( item="56B", name="COMM_SERVICES_EA", - friendly_name="community service - excused absence", + friendly_name="Community Service Programs: Hours of Excused Absences", type="string", startIndex=92, endIndex=94, @@ -659,7 +654,7 @@ Field( item="56C", name="COMM_SERVICES_HOL", - friendly_name="community service - hours of leave", + friendly_name="Community Service Programs: Hours of Holidays", type="string", startIndex=94, endIndex=96, @@ -671,7 +666,7 @@ Field( item="57A", name="VOCATIONAL_ED_TRAINING_HOP", - friendly_name="vocational education training - hours of participation", + friendly_name="Vocational Educational Training: Hours of Participation", type="string", startIndex=96, endIndex=98, @@ -683,7 +678,7 @@ Field( item="57B", name="VOCATIONAL_ED_TRAINING_EA", - friendly_name="vocational education training - excused absence", + friendly_name="Vocational Educational Training: Hours of Excused Absences", type="string", startIndex=98, endIndex=100, @@ -695,7 +690,7 @@ Field( item="57C", name="VOCATIONAL_ED_TRAINING_HOL", - friendly_name="vocational education training - hours of leave", + friendly_name="Vocational Educational Training: Hours of Holidays", type="string", startIndex=100, endIndex=102, @@ -707,7 +702,7 @@ Field( item="58A", name="JOB_SKILLS_TRAINING_HOP", - friendly_name="job skills training - hours of participation", + friendly_name="Job Skills Training Directly Related to Employment: Hours of Participation", type="string", startIndex=102, endIndex=104, @@ -719,7 +714,7 @@ Field( item="58B", name="JOB_SKILLS_TRAINING_EA", - friendly_name="job skills training - excused absence", + friendly_name="Job Skills Training Directly Related to Employment: Hours of Excused Absences", type="string", startIndex=104, endIndex=106, @@ -731,7 +726,7 @@ Field( item="58C", name="JOB_SKILLS_TRAINING_HOL", - friendly_name="job skills training - hours of leave", + friendly_name="Job Skills Training Directly Related to Employment: Hours of Holidays", type="string", startIndex=106, endIndex=108, @@ -743,7 +738,7 @@ Field( item="59A", name="ED_NO_HIGH_SCHOOL_DIPL_HOP", - friendly_name="education no high school diploma - hours of participation", + friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Participation", type="string", startIndex=108, endIndex=110, @@ -755,7 +750,7 @@ Field( item="59B", name="ED_NO_HIGH_SCHOOL_DIPL_EA", - friendly_name="education no high school diploma - excused absence", + friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate: Hours of Excused Absences", type="string", startIndex=110, endIndex=112, @@ -767,7 +762,7 @@ Field( item="59C", name="ED_NO_HIGH_SCHOOL_DIPL_HOL", - friendly_name="education no high school diploma - holiday", + friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate: Hours of Holidays", type="string", startIndex=112, endIndex=114, @@ -779,7 +774,7 @@ Field( item="60A", name="SCHOOL_ATTENDENCE_HOP", - friendly_name="school attendance - hours of participation", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Participation", type="string", startIndex=114, endIndex=116, @@ -791,7 +786,7 @@ Field( item="60B", name="SCHOOL_ATTENDENCE_EA", - friendly_name="school attendance - excused absence", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Ecused Absences", type="string", startIndex=116, endIndex=118, @@ -803,7 +798,7 @@ Field( item="60C", name="SCHOOL_ATTENDENCE_HOL", - friendly_name="school attendance - holiday", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Holidays", type="string", startIndex=118, endIndex=120, @@ -815,7 +810,7 @@ Field( item="61A", name="PROVIDE_CC_HOP", - friendly_name="provide child care - hours of participation", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Participation", type="string", startIndex=120, endIndex=122, @@ -827,7 +822,7 @@ Field( item="61B", name="PROVIDE_CC_EA", - friendly_name="provide child care - excused absence", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Excused Absences", type="string", startIndex=122, endIndex=124, @@ -839,7 +834,7 @@ Field( item="61C", name="PROVIDE_CC_HOL", - friendly_name="provide child care - holiday", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Holidays", type="string", startIndex=124, endIndex=126, @@ -851,7 +846,7 @@ Field( item="62", name="OTHER_WORK_ACTIVITIES", - friendly_name="other work activities", + friendly_name="Hours of Other Work Activities ", type="string", startIndex=126, endIndex=128, @@ -863,7 +858,7 @@ Field( item="63", name="DEEMED_HOURS_FOR_OVERALL", - friendly_name="deemed hours for overall", + friendly_name="Number of Deemed Core Hours for Overall Rate", type="string", startIndex=128, endIndex=130, @@ -875,7 +870,7 @@ Field( item="64", name="DEEMED_HOURS_FOR_TWO_PARENT", - friendly_name="deemed hours for two parent", + friendly_name="Number of Deemed Core Hours for the Two-Parent Rate", type="string", startIndex=130, endIndex=132, @@ -887,7 +882,7 @@ Field( item="65", name="EARNED_INCOME", - friendly_name="earned income", + friendly_name="Amount of Earned Income", type="string", startIndex=132, endIndex=136, @@ -899,7 +894,7 @@ Field( item="66A", name="UNEARNED_INCOME_TAX_CREDIT", - friendly_name="unearned income tax credit", + friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC)", type="string", startIndex=136, endIndex=140, @@ -911,7 +906,7 @@ Field( item="66B", name="UNEARNED_SOCIAL_SECURITY", - friendly_name="unearned social security", + friendly_name="Amount of Unearned Income: Social Security", type="string", startIndex=140, endIndex=144, @@ -923,7 +918,7 @@ Field( item="66C", name="UNEARNED_SSI", - friendly_name="unearned SSI benefit", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=144, endIndex=148, @@ -935,7 +930,7 @@ Field( item="66D", name="UNEARNED_WORKERS_COMP", - friendly_name="unearned workers compensation", + friendly_name="Ammount of Unearned Income: Worker's Compensation", type="string", startIndex=148, endIndex=152, @@ -947,7 +942,7 @@ Field( item="66E", name="OTHER_UNEARNED_INCOME", - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type="string", startIndex=152, endIndex=156, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 8e22974f8..b2212d5d3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -12,10 +12,6 @@ document=TANF_T3DataSubmissionDocument(), preparsing_validators=[ validators.notEmpty(start=19, end=60), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -96,7 +92,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -106,7 +102,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -116,7 +112,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -126,7 +122,7 @@ Field( item="67", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -136,22 +132,21 @@ Field( item="68", name="DATE_OF_BIRTH", - friendly_name="date of birth", - type="string", + friendly_name="Date of Birth", + type="number", startIndex=20, endIndex=28, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1950), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=tanf_ssn_decryption_func, item="69", name="SSN", - friendly_name="social security number", + friendly_name="Social Security Number", type="string", startIndex=28, endIndex=37, @@ -162,7 +157,7 @@ Field( item="70A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity/Race: Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -172,7 +167,7 @@ Field( item="70B", name="RACE_AMER_INDIAN", - friendly_name="race american-indian", + friendly_name="Ethnicity/Race: American Indian or Alaska Native ", type="number", startIndex=38, endIndex=39, @@ -182,7 +177,7 @@ Field( item="70C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=39, endIndex=40, @@ -192,7 +187,7 @@ Field( item="70D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=40, endIndex=41, @@ -202,7 +197,7 @@ Field( item="70E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Ethnicity/Race: Native Hawaiian or Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -212,7 +207,7 @@ Field( item="70F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Ethnicity/Race: White", type="number", startIndex=42, endIndex=43, @@ -222,7 +217,7 @@ Field( item="71", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=43, endIndex=44, @@ -232,7 +227,7 @@ Field( item="72A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="receives non-social security act benefits", + friendly_name="Receives Disability Benefits: Under Non-Social Securty Act", type="number", startIndex=44, endIndex=45, @@ -242,7 +237,7 @@ Field( item="72B", name="RECEIVE_SSI", - friendly_name="receives SSI", + friendly_name="Receives Disability Benefits: SSI or AABD", type="number", startIndex=45, endIndex=46, @@ -252,7 +247,7 @@ Field( item="73", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=46, endIndex=48, @@ -262,7 +257,7 @@ Field( item="74", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parental status of minor who is not a head-of-household or spouse of the head-of-household", type="number", startIndex=48, endIndex=49, @@ -272,7 +267,7 @@ Field( item="75", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=49, endIndex=51, @@ -287,7 +282,7 @@ Field( item="76", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type="number", startIndex=51, endIndex=52, @@ -297,7 +292,7 @@ Field( item="77A", name="UNEARNED_SSI", - friendly_name="unearned SSI benefit", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=52, endIndex=56, @@ -307,7 +302,7 @@ Field( item="77B", name="OTHER_UNEARNED_INCOME", - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type="string", startIndex=56, endIndex=60, @@ -322,10 +317,6 @@ quiet_preparser_errors=True, preparsing_validators=[ validators.notEmpty(start=60, end=101), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -406,7 +397,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Recod Type", type="string", startIndex=0, endIndex=2, @@ -416,7 +407,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -426,7 +417,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -436,7 +427,7 @@ Field( item="67", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=60, endIndex=61, @@ -446,22 +437,21 @@ Field( item="68", name="DATE_OF_BIRTH", - friendly_name="date of birth", - type="string", + friendly_name="Date of Birth", + type="number", startIndex=61, endIndex=69, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1950), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=tanf_ssn_decryption_func, item="69", name="SSN", - friendly_name="social security number", + friendly_name="Social Security Number", type="string", startIndex=69, endIndex=78, @@ -472,7 +462,7 @@ Field( item="70A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity: Hispanic or Latino", type="number", startIndex=78, endIndex=79, @@ -482,7 +472,7 @@ Field( item="70B", name="RACE_AMER_INDIAN", - friendly_name="race american-indian", + friendly_name="Race: American Indian or Alaska Native", type="number", startIndex=79, endIndex=80, @@ -492,7 +482,7 @@ Field( item="70C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Race: Asian", type="number", startIndex=80, endIndex=81, @@ -502,7 +492,7 @@ Field( item="70D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Race: Black or African American", type="number", startIndex=81, endIndex=82, @@ -512,7 +502,7 @@ Field( item="70E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Race: Native Hawaiian or Other Pacific Islander", type="number", startIndex=82, endIndex=83, @@ -522,7 +512,7 @@ Field( item="70F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Race: White", type="number", startIndex=83, endIndex=84, @@ -532,7 +522,7 @@ Field( item="71", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=84, endIndex=85, @@ -542,7 +532,7 @@ Field( item="72A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="receives non-ssa benefits", + friendly_name="Receives Disability Benefits: Federal Disability Status", type="number", startIndex=85, endIndex=86, @@ -552,7 +542,7 @@ Field( item="72B", name="RECEIVE_SSI", - friendly_name="receives SSI", + friendly_name="Receives Disability Benefits: SSI Under Title XVI-SSI or AABD Under Title XVI-AABD", type="number", startIndex=86, endIndex=87, @@ -562,7 +552,7 @@ Field( item="73", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=87, endIndex=89, @@ -572,7 +562,7 @@ Field( item="74", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parental status of minor who is not a head-of-household or spouse of the head-of-household", type="number", startIndex=89, endIndex=90, @@ -582,7 +572,7 @@ Field( item="75", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=90, endIndex=92, @@ -597,7 +587,7 @@ Field( item="76", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type="number", startIndex=92, endIndex=93, @@ -607,7 +597,7 @@ Field( item="77A", name="UNEARNED_SSI", - friendly_name="unearned SSI benefit", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=93, endIndex=97, @@ -617,7 +607,7 @@ Field( item="77B", name="OTHER_UNEARNED_INCOME", - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type="string", startIndex=97, endIndex=101, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py index 6d9304c0c..88185ab84 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py @@ -13,10 +13,6 @@ document=TANF_T4DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[], @@ -24,7 +20,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -34,7 +30,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -47,7 +43,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -57,7 +53,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="county fips code", + friendly_name="County FIPS Code", type="string", startIndex=19, endIndex=22, @@ -67,7 +63,7 @@ Field( item="5", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=22, endIndex=24, @@ -77,7 +73,7 @@ Field( item="7", name="ZIP_CODE", - friendly_name="zip code", + friendly_name="ZIP Code", type="string", startIndex=24, endIndex=29, @@ -87,7 +83,7 @@ Field( item="8", name="DISPOSITION", - friendly_name="disposition", + friendly_name="Disposition", type="number", startIndex=29, endIndex=30, @@ -97,7 +93,7 @@ Field( item="9", name="CLOSURE_REASON", - friendly_name="closure reason", + friendly_name="Reason for Closure", type="string", startIndex=30, endIndex=32, @@ -112,7 +108,7 @@ Field( item="10", name="REC_SUB_HOUSING", - friendly_name="receives subsidized housing", + friendly_name="Received Subsidized Housing", type="number", startIndex=32, endIndex=33, @@ -122,7 +118,7 @@ Field( item="11", name="REC_MED_ASSIST", - friendly_name="receives medical assistance", + friendly_name="Received Medical Assistance", type="number", startIndex=33, endIndex=34, @@ -132,7 +128,7 @@ Field( item="12", name="REC_FOOD_STAMPS", - friendly_name="receives food stamps", + friendly_name="Received Assistance from the Supplemental Nutrition Assistance Program (SNAP)", type="number", startIndex=34, endIndex=35, @@ -142,7 +138,7 @@ Field( item="13", name="REC_SUB_CC", - friendly_name="receives subsidized child care", + friendly_name="Received Subsidized Child Care", type="number", startIndex=35, endIndex=36, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index b3d456dd3..b87a3af6a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -14,10 +14,6 @@ document=TANF_T5DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -109,7 +105,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -119,7 +115,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -132,7 +128,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number", type="string", startIndex=8, endIndex=19, @@ -142,7 +138,7 @@ Field( item="14", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -152,22 +148,21 @@ Field( item="15", name="DATE_OF_BIRTH", - friendly_name="date of birth", - type="string", + friendly_name="Date of Birth", + type="number", startIndex=20, endIndex=28, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=tanf_ssn_decryption_func, item="16", name="SSN", - friendly_name="social security number", + friendly_name="Social Security Number", type="string", startIndex=28, endIndex=37, @@ -178,7 +173,7 @@ Field( item="17A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity/Race: Hisapic or Latino", type="number", startIndex=37, endIndex=38, @@ -188,7 +183,7 @@ Field( item="17B", name="RACE_AMER_INDIAN", - friendly_name="race american-indian", + friendly_name="Ethnicity/Race: American Indian or Alaska Native ", type="number", startIndex=38, endIndex=39, @@ -198,7 +193,7 @@ Field( item="17C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=39, endIndex=40, @@ -208,7 +203,7 @@ Field( item="17D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=40, endIndex=41, @@ -218,7 +213,7 @@ Field( item="17E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -228,7 +223,7 @@ Field( item="17F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Ethnicity/Race: White", type="number", startIndex=42, endIndex=43, @@ -238,7 +233,7 @@ Field( item="18", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=43, endIndex=44, @@ -248,7 +243,7 @@ Field( item="19A", name="REC_OASDI_INSURANCE", - friendly_name="receives old-age survivors and disability insurance", + friendly_name="Received Disability Benefits: OASDI Program", type="number", startIndex=44, endIndex=45, @@ -258,7 +253,7 @@ Field( item="19B", name="REC_FEDERAL_DISABILITY", - friendly_name="receives federal disability", + friendly_name="Received Disability Benefits: Federal Disability Status", type="number", startIndex=45, endIndex=46, @@ -268,7 +263,7 @@ Field( item="19C", name="REC_AID_TOTALLY_DISABLED", - friendly_name="receives aid for totally disabled", + friendly_name="Received Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", type="number", startIndex=46, endIndex=47, @@ -278,7 +273,7 @@ Field( item="19D", name="REC_AID_AGED_BLIND", - friendly_name="receives from the aid to the aged, blind, and disabled program", + friendly_name="Received Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", type="number", startIndex=47, endIndex=48, @@ -288,7 +283,7 @@ Field( item="19E", name="REC_SSI", - friendly_name="receives SSI", + friendly_name="Received Disability Benefits: Supplemental Security Income Under Title XVI-SSI", type="number", startIndex=48, endIndex=49, @@ -298,7 +293,7 @@ Field( item="20", name="MARITAL_STATUS", - friendly_name="marital status", + friendly_name="Marital Status", type="number", startIndex=49, endIndex=50, @@ -308,7 +303,7 @@ Field( item="21", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=50, endIndex=52, @@ -318,7 +313,7 @@ Field( item="22", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent with Minor Child in the Family", type="number", startIndex=52, endIndex=53, @@ -328,7 +323,7 @@ Field( item="23", name="NEEDS_OF_PREGNANT_WOMAN", - friendly_name="needs of pregnant woman", + friendly_name="Needs of a Pregnant Woman", type="number", startIndex=53, endIndex=54, @@ -338,7 +333,7 @@ Field( item="24", name="EDUCATION_LEVEL", - friendly_name="educational level", + friendly_name="Educational Level", type="string", startIndex=54, endIndex=56, @@ -353,7 +348,7 @@ Field( item="25", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Immigration Status", type="number", startIndex=56, endIndex=57, @@ -368,7 +363,7 @@ Field( item="26", name="COUNTABLE_MONTH_FED_TIME", - friendly_name="countable months toward federal time", + friendly_name="Number of Months Countable Toward Federal Time Limit", type="string", startIndex=57, endIndex=60, @@ -378,7 +373,7 @@ Field( item="27", name="COUNTABLE_MONTHS_STATE_TRIBE", - friendly_name="countable months remaining under state tribe", + friendly_name="Number of Countable Months Remaining Under State's Time Limit", type="string", startIndex=60, endIndex=62, @@ -388,7 +383,7 @@ Field( item="28", name="EMPLOYMENT_STATUS", - friendly_name="employment status", + friendly_name="Employment Status", type="number", startIndex=62, endIndex=63, @@ -398,7 +393,7 @@ Field( item="29", name="AMOUNT_EARNED_INCOME", - friendly_name="amount of earned income", + friendly_name="Amount of Earned Income", type="string", startIndex=63, endIndex=67, @@ -408,7 +403,7 @@ Field( item="30", name="AMOUNT_UNEARNED_INCOME", - friendly_name="amount of unearned income", + friendly_name="Amount of Unearned Income", type="string", startIndex=67, endIndex=71, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py index cc0f97d3a..a03ea79de 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py @@ -12,7 +12,6 @@ document=TANF_T6DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(379), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -39,7 +38,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -49,7 +48,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -63,7 +62,7 @@ calendar_quarter_to_rpt_month_year(0), item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -76,7 +75,7 @@ Field( item="4A", name="NUM_APPLICATIONS", - friendly_name="total number of applications", + friendly_name="Total Number of Applications", type="number", startIndex=7, endIndex=15, @@ -86,7 +85,7 @@ Field( item="5A", name="NUM_APPROVED", - friendly_name="total number of approved applications", + friendly_name="Total Number of Approved Applications", type="number", startIndex=31, endIndex=39, @@ -96,7 +95,7 @@ Field( item="6A", name="NUM_DENIED", - friendly_name="total number of denied applications", + friendly_name="Total Number of Denied Applications", type="number", startIndex=55, endIndex=63, @@ -106,7 +105,7 @@ Field( item="7A", name="ASSISTANCE", - friendly_name="total amount of assistance", + friendly_name="Total Number of Cash Assistance", type="number", startIndex=79, endIndex=91, @@ -116,7 +115,7 @@ Field( item="8A", name="NUM_FAMILIES", - friendly_name="number of families", + friendly_name="Total Number of Families", type="number", startIndex=115, endIndex=123, @@ -126,7 +125,7 @@ Field( item="9A", name="NUM_2_PARENTS", - friendly_name="number of two-parent families", + friendly_name="Total Number of Two-parent Families", type="number", startIndex=139, endIndex=147, @@ -136,7 +135,7 @@ Field( item="10A", name="NUM_1_PARENTS", - friendly_name="total number of one-parent families", + friendly_name="Total Number of One-Parent Families", type="number", startIndex=163, endIndex=171, @@ -146,7 +145,7 @@ Field( item="11A", name="NUM_NO_PARENTS", - friendly_name="total number of no-parent families", + friendly_name="Total Number of No-Parent Families", type="number", startIndex=187, endIndex=195, @@ -156,7 +155,7 @@ Field( item="12A", name="NUM_RECIPIENTS", - friendly_name="total number of recipients", + friendly_name="Total Number of Recipients", type="number", startIndex=211, endIndex=219, @@ -166,7 +165,7 @@ Field( item="13A", name="NUM_ADULT_RECIPIENTS", - friendly_name="total number of adult recipients", + friendly_name="Total Number of Adult Recipients", type="number", startIndex=235, endIndex=243, @@ -176,7 +175,7 @@ Field( item="14A", name="NUM_CHILD_RECIPIENTS", - friendly_name="total number of child recipients", + friendly_name="Total Number of Child Recipients", type="number", startIndex=259, endIndex=267, @@ -186,7 +185,7 @@ Field( item="15A", name="NUM_NONCUSTODIALS", - friendly_name="total number of noncustodial parents participating in work activities", + friendly_name="Total Number of Noncustodial Parents Participating in Work Activities", type="number", startIndex=283, endIndex=291, @@ -196,7 +195,7 @@ Field( item="16A", name="NUM_BIRTHS", - friendly_name="total number of births", + friendly_name="Total Number of Births", type="number", startIndex=307, endIndex=315, @@ -206,7 +205,7 @@ Field( item="17A", name="NUM_OUTWEDLOCK_BIRTHS", - friendly_name="total number of out-of-wedlock births", + friendly_name="Total Number of Non-Marital Births", type="number", startIndex=331, endIndex=339, @@ -216,7 +215,7 @@ Field( item="18A", name="NUM_CLOSED_CASES", - friendly_name="total number of closed cases", + friendly_name="Total Number of Closed Cases", type="number", startIndex=355, endIndex=363, @@ -228,10 +227,8 @@ s2 = RowSchema( document=TANF_T6DataSubmissionDocument(), - quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -258,7 +255,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -268,7 +265,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -279,7 +276,7 @@ calendar_quarter_to_rpt_month_year(1), item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -289,7 +286,7 @@ Field( item="4B", name="NUM_APPLICATIONS", - friendly_name="total number of applications", + friendly_name="Total Number of Applications", type="number", startIndex=15, endIndex=23, @@ -299,7 +296,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, @@ -309,7 +306,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, @@ -319,7 +316,7 @@ Field( item="7B", name="ASSISTANCE", - friendly_name="assistance", + friendly_name="Total Amount of Cash Assistance", type="number", startIndex=91, endIndex=103, @@ -329,7 +326,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, @@ -339,7 +336,7 @@ Field( item="9B", name="NUM_2_PARENTS", - friendly_name="number of two-parent families", + friendly_name="Total Number of Two-parent Families", type="number", startIndex=147, endIndex=155, @@ -349,7 +346,7 @@ Field( item="10B", name="NUM_1_PARENTS", - friendly_name="total number of one-parent families", + friendly_name="Total Number of One-Parent Families", type="number", startIndex=171, endIndex=179, @@ -359,7 +356,7 @@ Field( item="11B", name="NUM_NO_PARENTS", - friendly_name="total number of no-parent families", + friendly_name="Total Number of No-Parent Families", type="number", startIndex=195, endIndex=203, @@ -369,7 +366,7 @@ Field( item="12B", name="NUM_RECIPIENTS", - friendly_name="total number of recipients", + friendly_name="Total Number of Recipients", type="number", startIndex=219, endIndex=227, @@ -379,7 +376,7 @@ Field( item="13B", name="NUM_ADULT_RECIPIENTS", - friendly_name="total number of adult recipients", + friendly_name="Total Number of Adult Recipients", type="number", startIndex=243, endIndex=251, @@ -389,7 +386,7 @@ Field( item="14B", name="NUM_CHILD_RECIPIENTS", - friendly_name="total number of child recipients", + friendly_name="Total Number of Child Recipients", type="number", startIndex=267, endIndex=275, @@ -399,7 +396,7 @@ Field( item="15B", name="NUM_NONCUSTODIALS", - friendly_name="total number of noncustodial parents", + friendly_name="Total Number of Noncustodial Parents Participating in Work Activities", type="number", startIndex=291, endIndex=299, @@ -409,7 +406,7 @@ Field( item="16B", name="NUM_BIRTHS", - friendly_name="total number of births", + friendly_name="Total Number of Births", type="number", startIndex=315, endIndex=323, @@ -419,7 +416,7 @@ Field( item="17B", name="NUM_OUTWEDLOCK_BIRTHS", - friendly_name="total number of out-of-wedlock births", + friendly_name="Total Number of Non-Marital Births", type="number", startIndex=339, endIndex=347, @@ -429,7 +426,7 @@ Field( item="18B", name="NUM_CLOSED_CASES", - friendly_name="total number of closed assets", + friendly_name="Total Number of Closed Cases", type="number", startIndex=363, endIndex=371, @@ -441,10 +438,8 @@ s3 = RowSchema( document=TANF_T6DataSubmissionDocument(), - quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -471,7 +466,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -481,7 +476,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -492,7 +487,7 @@ calendar_quarter_to_rpt_month_year(2), item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -502,7 +497,7 @@ Field( item="4C", name="NUM_APPLICATIONS", - friendly_name="total number of applications", + friendly_name="Total Number of Applications", type="number", startIndex=23, endIndex=31, @@ -512,7 +507,7 @@ Field( item="5C", name="NUM_APPROVED", - friendly_name="total number of approved applications", + friendly_name="Total Number of Applications", type="number", startIndex=47, endIndex=55, @@ -522,7 +517,7 @@ Field( item="6C", name="NUM_DENIED", - friendly_name="total number of denied applications", + friendly_name="Total Number of Denied Applications", type="number", startIndex=71, endIndex=79, @@ -532,7 +527,7 @@ Field( item="7C", name="ASSISTANCE", - friendly_name="total amount of assistance", + friendly_name="Total Number of Cash Assistance", type="number", startIndex=103, endIndex=115, @@ -542,7 +537,7 @@ Field( item="8C", name="NUM_FAMILIES", - friendly_name="total number of families", + friendly_name="Total Number of Families", type="number", startIndex=131, endIndex=139, @@ -552,7 +547,7 @@ Field( item="9C", name="NUM_2_PARENTS", - friendly_name="number of two-parent families", + friendly_name="Total Number of Two-parent Families", type="number", startIndex=155, endIndex=163, @@ -562,7 +557,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, @@ -572,7 +567,7 @@ Field( item="11C", name="NUM_NO_PARENTS", - friendly_name="total number of no-parent families", + friendly_name="Total Number of No-Parent Families", type="number", startIndex=203, endIndex=211, @@ -582,7 +577,7 @@ Field( item="12C", name="NUM_RECIPIENTS", - friendly_name="total number of recipients", + friendly_name="Total Number of Recipients", type="number", startIndex=227, endIndex=235, @@ -592,7 +587,7 @@ Field( item="13C", name="NUM_ADULT_RECIPIENTS", - friendly_name="total number of adult recipients", + friendly_name="Total Number of Adult Recipients", type="number", startIndex=251, endIndex=259, @@ -602,7 +597,7 @@ Field( item="14C", name="NUM_CHILD_RECIPIENTS", - friendly_name="total number of child recipients", + friendly_name="Total Number of Child Recipients", type="number", startIndex=275, endIndex=283, @@ -612,7 +607,7 @@ Field( item="15C", name="NUM_NONCUSTODIALS", - friendly_name="total number of noncustodial parents", + friendly_name="Total Number of Noncustodial Parents Participating in Work Activities", type="number", startIndex=299, endIndex=307, @@ -622,7 +617,7 @@ Field( item="16C", name="NUM_BIRTHS", - friendly_name="total number of births", + friendly_name="Total Number of Births", type="number", startIndex=323, endIndex=331, @@ -632,7 +627,7 @@ Field( item="17C", name="NUM_OUTWEDLOCK_BIRTHS", - friendly_name="total number of out-of-wedlock births", + friendly_name="Total Number of Non-Marital Births", type="number", startIndex=347, endIndex=355, @@ -642,7 +637,7 @@ Field( item="18C", name="NUM_CLOSED_CASES", - friendly_name="total number of closed cases", + friendly_name="Total Number of Closed Cases", type="number", startIndex=371, endIndex=379, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py index c247c6427..edf7299f2 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py @@ -25,14 +25,13 @@ validators.hasLength(247), validators.notEmpty(0, 7), validators.notEmpty(validator_index, validator_index + 24), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[], fields=[ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -42,7 +41,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -56,7 +55,7 @@ transform_func=calendar_quarter_to_rpt_month_year(month_index), item="3A", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -69,7 +68,7 @@ Field( item="4", name="TDRS_SECTION_IND", - friendly_name="tdrs section indicator", + friendly_name="TDRS Section Indicator", type="string", startIndex=section_ind_index, endIndex=section_ind_index + 1, @@ -79,7 +78,7 @@ Field( item="5", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=stratum_index, endIndex=stratum_index + 2, @@ -89,7 +88,7 @@ Field( item=families_value_item_number, name="FAMILIES_MONTH", - friendly_name="families month", + friendly_name="Families Month", type="number", startIndex=families_index, endIndex=families_index + 7, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py index 0f337df7e..f36411a72 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py @@ -5,16 +5,13 @@ from ... import validators from tdpservice.search_indexes.documents.tribal import Tribal_TANF_T1DataSubmissionDocument + t1 = SchemaManager( schemas=[ RowSchema( document=Tribal_TANF_T1DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(122), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -125,7 +122,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -135,7 +132,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -148,7 +145,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number--TANF", type="string", startIndex=8, endIndex=19, @@ -158,7 +155,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="county fips code", + friendly_name="County FIPS Code", type="string", startIndex=19, endIndex=22, @@ -170,7 +167,7 @@ Field( item="5", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=22, endIndex=24, @@ -182,7 +179,7 @@ Field( item="7", name="ZIP_CODE", - friendly_name="zip code", + friendly_name="ZIP Code", type="string", startIndex=24, endIndex=29, @@ -194,7 +191,7 @@ Field( item="8", name="FUNDING_STREAM", - friendly_name="funding stream", + friendly_name="Funding Stream", type="number", startIndex=29, endIndex=30, @@ -206,7 +203,7 @@ Field( item="9", name="DISPOSITION", - friendly_name="disposition", + friendly_name="Disposition", type="number", startIndex=30, endIndex=31, @@ -218,7 +215,7 @@ Field( item="10", name="NEW_APPLICANT", - friendly_name="new applicant", + friendly_name="New Applicant", type="number", startIndex=31, endIndex=32, @@ -230,7 +227,7 @@ Field( item="11", name="NBR_FAMILY_MEMBERS", - friendly_name="number of family members", + friendly_name="Number of Family Members", type="number", startIndex=32, endIndex=34, @@ -242,7 +239,7 @@ Field( item="12", name="FAMILY_TYPE", - friendly_name="family type", + friendly_name="Type of Family for Work Participation", type="number", startIndex=34, endIndex=35, @@ -254,7 +251,7 @@ Field( item="13", name="RECEIVES_SUB_HOUSING", - friendly_name="receives subsidized housing", + friendly_name="Receives Subsidized Housing", type="number", startIndex=35, endIndex=36, @@ -266,7 +263,7 @@ Field( item="14", name="RECEIVES_MED_ASSISTANCE", - friendly_name="receives medical assistance", + friendly_name="Receives Medical Assistance", type="number", startIndex=36, endIndex=37, @@ -278,7 +275,7 @@ Field( item="15", name="RECEIVES_FOOD_STAMPS", - friendly_name="receives food stamps", + friendly_name="Receives Food Stamps", type="number", startIndex=37, endIndex=38, @@ -290,7 +287,7 @@ Field( item="16", name="AMT_FOOD_STAMP_ASSISTANCE", - friendly_name="amount of food stamp assistance", + friendly_name="Amount of Food Stamp Assistance", type="number", startIndex=38, endIndex=42, @@ -302,7 +299,7 @@ Field( item="17", name="RECEIVES_SUB_CC", - friendly_name="receives subsidized child care", + friendly_name="Receives Subsidized Child Care", type="number", startIndex=42, endIndex=43, @@ -314,7 +311,7 @@ Field( item="18", name="AMT_SUB_CC", - friendly_name="amount of subsidized child care", + friendly_name="Amount of Subsidized Child Care", type="number", startIndex=43, endIndex=47, @@ -326,7 +323,7 @@ Field( item="19", name="CHILD_SUPPORT_AMT", - friendly_name="child support amount", + friendly_name="Amount of Child Support", type="number", startIndex=47, endIndex=51, @@ -338,7 +335,7 @@ Field( item="20", name="FAMILY_CASH_RESOURCES", - friendly_name="family cash resources", + friendly_name="Amount of the Family's Cash Resources", type="number", startIndex=51, endIndex=55, @@ -350,7 +347,7 @@ Field( item="21A", name="CASH_AMOUNT", - friendly_name="cash amount", + friendly_name="Cash and Cash Equivalents", type="number", startIndex=55, endIndex=59, @@ -362,7 +359,7 @@ Field( item="21B", name="NBR_MONTHS", - friendly_name="number of months", + friendly_name="Number of Months", type="number", startIndex=59, endIndex=62, @@ -374,7 +371,7 @@ Field( item="22A", name="CC_AMOUNT", - friendly_name="child care amount", + friendly_name="TANF Child Care Care Amount", type="number", startIndex=62, endIndex=66, @@ -386,7 +383,7 @@ Field( item="22B", name="CHILDREN_COVERED", - friendly_name="children covered", + friendly_name="TANF Child Care Number of Children Covered", type="number", startIndex=66, endIndex=68, @@ -398,7 +395,7 @@ Field( item="22C", name="CC_NBR_MONTHS", - friendly_name="child care number of months", + friendly_name="TANF Child Care Number of Months", type="number", startIndex=68, endIndex=71, @@ -410,7 +407,7 @@ Field( item="23A", name="TRANSP_AMOUNT", - friendly_name="transportation amount", + friendly_name="Transportation Amount", type="number", startIndex=71, endIndex=75, @@ -422,7 +419,7 @@ Field( item="23B", name="TRANSP_NBR_MONTHS", - friendly_name="transportation number of months", + friendly_name="Transportation Number of Months", type="number", startIndex=75, endIndex=78, @@ -434,7 +431,7 @@ Field( item="24A", name="TRANSITION_SERVICES_AMOUNT", - friendly_name="transition services amount", + friendly_name="Transitional Services Amount", type="number", startIndex=78, endIndex=82, @@ -446,7 +443,7 @@ Field( item="24B", name="TRANSITION_NBR_MONTHS", - friendly_name="transition services number of months", + friendly_name="Transitional Services Number of Months", type="number", startIndex=82, endIndex=85, @@ -458,7 +455,7 @@ Field( item="25A", name="OTHER_AMOUNT", - friendly_name="other amount", + friendly_name="Other Amount", type="number", startIndex=85, endIndex=89, @@ -470,7 +467,7 @@ Field( item="25B", name="OTHER_NBR_MONTHS", - friendly_name="other number of months", + friendly_name="Other Number of Months", type="number", startIndex=89, endIndex=92, @@ -482,7 +479,7 @@ Field( item="26AI", name="SANC_REDUCTION_AMT", - friendly_name="sanction reduction amount", + friendly_name="Total Dollar Amount of Reductions due to Sanctions", type="number", startIndex=92, endIndex=96, @@ -494,7 +491,7 @@ Field( item="26AII", name="WORK_REQ_SANCTION", - friendly_name="work requirement sanction", + friendly_name="Work Requirements Sanction", type="number", startIndex=96, endIndex=97, @@ -506,7 +503,7 @@ Field( item="26AIII", name="FAMILY_SANC_ADULT", - friendly_name="family sanction adult", + friendly_name="Family Sanction for an Adult with No High School Diploma orEquivalent:", type="number", startIndex=97, endIndex=98, @@ -518,7 +515,7 @@ Field( item="26AIV", name="SANC_TEEN_PARENT", - friendly_name="sanctioned teen parent", + friendly_name="Sanction for Teen Parent not Attending School", type="number", startIndex=98, endIndex=99, @@ -530,7 +527,7 @@ Field( item="26AV", name="NON_COOPERATION_CSE", - friendly_name="non-cooperation with child support", + friendly_name="Non-Cooperation with Child Support", type="number", startIndex=99, endIndex=100, @@ -542,7 +539,7 @@ Field( item="26AVI", name="FAILURE_TO_COMPLY", - friendly_name="failure to comply", + friendly_name="Failure to comply with an Individual Responsibility Plan", type="number", startIndex=100, endIndex=101, @@ -554,7 +551,7 @@ Field( item="26AVII", name="OTHER_SANCTION", - friendly_name="other, sanction", + friendly_name="Other Sanction", type="number", startIndex=101, endIndex=102, @@ -566,7 +563,7 @@ Field( item="26B", name="RECOUPMENT_PRIOR_OVRPMT", - friendly_name="recoupment prior overpayment", + friendly_name="Recoupment of Prior Overpayment", type="number", startIndex=102, endIndex=106, @@ -578,7 +575,7 @@ Field( item="26CI", name="OTHER_TOTAL_REDUCTIONS", - friendly_name="other total reductions", + friendly_name="Total Dollar Amount of Reductions due to Other Reasons", type="number", startIndex=106, endIndex=110, @@ -590,7 +587,7 @@ Field( item="26CII", name="FAMILY_CAP", - friendly_name="family cap", + friendly_name="Family Cap", type="number", startIndex=110, endIndex=111, @@ -602,7 +599,7 @@ Field( item="26CIII", name="REDUCTIONS_ON_RECEIPTS", - friendly_name="reductions on receipts", + friendly_name="Reduction Based on Length of Receipt of Assistance", type="number", startIndex=111, endIndex=112, @@ -614,7 +611,7 @@ Field( item="26CIV", name="OTHER_NON_SANCTION", - friendly_name="other, non-sanction", + friendly_name="Other, Non-sanction", type="number", startIndex=112, endIndex=113, @@ -636,7 +633,7 @@ Field( item="28", name="FAMILY_EXEMPT_TIME_LIMITS", - friendly_name="family exempt time limits", + friendly_name="Exempt during the reporting month from theTribal Time-Limit Provisions", type="number", startIndex=114, endIndex=116, @@ -646,7 +643,7 @@ Field( item="29", name="FAMILY_NEW_CHILD", - friendly_name="family new child", + friendly_name="A New Child-Only Family", type="number", startIndex=116, endIndex=117, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index 32de69f7a..0f8e3f402 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -14,10 +14,6 @@ document=Tribal_TANF_T2DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(122), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -120,7 +116,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -130,7 +126,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -143,7 +139,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number--TANF", type="string", startIndex=8, endIndex=19, @@ -153,7 +149,7 @@ Field( item="30", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -163,7 +159,7 @@ Field( item="31", name="NONCUSTODIAL_PARENT", - friendly_name="noncustodial parent", + friendly_name="Noncustodial Parent Indicator", type="number", startIndex=20, endIndex=21, @@ -173,22 +169,21 @@ Field( item="32", name="DATE_OF_BIRTH", - friendly_name="date of birth", - type="string", + friendly_name="Date of Birth", + type="number", startIndex=21, endIndex=29, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=tanf_ssn_decryption_func, item="33", name="SSN", - friendly_name="social security number - ssn", + friendly_name="Social Security Number", type="string", startIndex=29, endIndex=38, @@ -199,7 +194,7 @@ Field( item="34A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity/Race: Hispanic or Latino", type="number", startIndex=38, endIndex=39, @@ -209,7 +204,7 @@ Field( item="34B", name="RACE_AMER_INDIAN", - friendly_name="race american-indian", + friendly_name="Ethnicity/Race: American Indian or Alaska Native", type="number", startIndex=39, endIndex=40, @@ -219,7 +214,7 @@ Field( item="34C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=40, endIndex=41, @@ -229,7 +224,7 @@ Field( item="34D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=41, endIndex=42, @@ -239,7 +234,7 @@ Field( item="34E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", type="number", startIndex=42, endIndex=43, @@ -249,7 +244,7 @@ Field( item="34F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Ethnicity/Race: White", type="number", startIndex=43, endIndex=44, @@ -259,7 +254,7 @@ Field( item="35", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=44, endIndex=45, @@ -271,7 +266,7 @@ Field( item="36A", name="FED_OASDI_PROGRAM", - friendly_name="federal old age survivors and disability insurance program", + friendly_name="Receives Disability Benefits: OASDI Program", type="number", startIndex=45, endIndex=46, @@ -281,7 +276,7 @@ Field( item="36B", name="FED_DISABILITY_STATUS", - friendly_name="federal disability status", + friendly_name="Receives Disability Benefits: Federal Disability Status", type="number", startIndex=46, endIndex=47, @@ -291,8 +286,7 @@ Field( item="36C", name="DISABLED_TITLE_XIVAPDT", - friendly_name="Receives Aid to the Permanently and Totally Disabled" + - " Under Title XIV-APDT of the Social Security Act", + friendly_name="Receives Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", type="string", startIndex=47, endIndex=48, @@ -306,7 +300,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="receives from the aid to the aged, blind, and disabled program", + friendly_name="Receives Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", type="number", startIndex=48, endIndex=49, @@ -318,7 +312,7 @@ Field( item="36E", name="RECEIVE_SSI", - friendly_name="receives social security income", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI", type="number", startIndex=49, endIndex=50, @@ -330,7 +324,7 @@ Field( item="37", name="MARITAL_STATUS", - friendly_name="marital status", + friendly_name="Marital Status", type="number", startIndex=50, endIndex=51, @@ -342,7 +336,7 @@ Field( item="38", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=51, endIndex=53, @@ -354,7 +348,7 @@ Field( item="39", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent With Minor Child in the Family", type="number", startIndex=53, endIndex=54, @@ -366,7 +360,7 @@ Field( item="40", name="NEEDS_PREGNANT_WOMAN", - friendly_name="needs of pregnant woman", + friendly_name="Needs of a Pregnant Woman", type="number", startIndex=54, endIndex=55, @@ -378,7 +372,7 @@ Field( item="41", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=55, endIndex=57, @@ -393,7 +387,7 @@ Field( item="42", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Alienage", type="number", startIndex=57, endIndex=58, @@ -403,7 +397,7 @@ Field( item="43", name="COOPERATION_CHILD_SUPPORT", - friendly_name="cooperation with child support", + friendly_name="Cooperation with Child Support", type="number", startIndex=58, endIndex=59, @@ -415,7 +409,7 @@ Field( item="44", name="MONTHS_FED_TIME_LIMIT", - friendly_name="countable months toward federal time limit", + friendly_name="Number of Months Countable toward Tribal Time Limit", type="string", startIndex=59, endIndex=62, @@ -427,7 +421,7 @@ Field( item="45", name="MONTHS_STATE_TIME_LIMIT", - friendly_name="months of state time limit", + friendly_name="Number of Countable Months Remaining Under the Tribe's Time Limit", type="string", startIndex=62, endIndex=64, @@ -439,7 +433,7 @@ Field( item="46", name="CURRENT_MONTH_STATE_EXEMPT", - friendly_name="current month state exempt", + friendly_name="Is Current Month Exempt from the State's (Tribe's) Time Limit", type="number", startIndex=64, endIndex=65, @@ -451,7 +445,7 @@ Field( item="47", name="EMPLOYMENT_STATUS", - friendly_name="employment status", + friendly_name="Employment Status", type="number", startIndex=65, endIndex=66, @@ -463,7 +457,7 @@ Field( item="48", name="WORK_PART_STATUS", - friendly_name="work participation status", + friendly_name="Work Participation Status", type="string", startIndex=66, endIndex=68, @@ -480,7 +474,7 @@ Field( item="49", name="UNSUB_EMPLOYMENT", - friendly_name="unsubsidized employment", + friendly_name="Unsubsidized Employment", type="string", startIndex=68, endIndex=70, @@ -492,7 +486,7 @@ Field( item="50", name="SUB_PRIVATE_EMPLOYMENT", - friendly_name="subsidized private employment", + friendly_name="Subsidized Private-Sector Employment.", type="string", startIndex=70, endIndex=72, @@ -504,7 +498,7 @@ Field( item="51", name="SUB_PUBLIC_EMPLOYMENT", - friendly_name="subsidized public employment", + friendly_name="Subsidized Public-Sector Employment", type="string", startIndex=72, endIndex=74, @@ -516,7 +510,7 @@ Field( item="52", name="WORK_EXPERIENCE", - friendly_name="work experience", + friendly_name="Work Experience", type="string", startIndex=74, endIndex=76, @@ -528,7 +522,7 @@ Field( item="53", name="OJT", - friendly_name="on the job training", + friendly_name="On-the-job Training", type="string", startIndex=76, endIndex=78, @@ -540,7 +534,7 @@ Field( item="54", name="JOB_SEARCH", - friendly_name="job search", + friendly_name="Job Search and Job Readiness Assistance", type="string", startIndex=78, endIndex=80, @@ -552,7 +546,7 @@ Field( item="55", name="COMM_SERVICES", - friendly_name="community service", + friendly_name="Community Service Programs", type="string", startIndex=80, endIndex=82, @@ -564,7 +558,7 @@ Field( item="56", name="VOCATIONAL_ED_TRAINING", - friendly_name="vocational education", + friendly_name="Vocational Educational Training", type="string", startIndex=82, endIndex=84, @@ -576,7 +570,7 @@ Field( item="57", name="JOB_SKILLS_TRAINING", - friendly_name="job skills training", + friendly_name="Job Skills Training Directly Related to Employment", type="string", startIndex=84, endIndex=86, @@ -588,7 +582,7 @@ Field( item="58", name="ED_NO_HIGH_SCHOOL_DIPLOMA", - friendly_name="education no high school diploma", + friendly_name="Education Directly Related to Employment for Individualswith no High School Diploma or Certificate of High SchoolEquivalency", type="string", startIndex=86, endIndex=88, @@ -600,7 +594,7 @@ Field( item="59", name="SCHOOL_ATTENDENCE", - friendly_name="school attendance", + friendly_name="Satisfactory School Attendance for Individuals with No HighSchool Diploma or Certificate of High School Equivalency", type="string", startIndex=88, endIndex=90, @@ -612,7 +606,7 @@ Field( item="60", name="PROVIDE_CC", - friendly_name="provide child care", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program", type="string", startIndex=90, endIndex=92, @@ -624,7 +618,7 @@ Field( item="61", name="ADD_WORK_ACTIVITIES", - friendly_name="additional work activities", + friendly_name="Additional Work Activities", type="string", startIndex=92, endIndex=94, @@ -636,7 +630,7 @@ Field( item="62", name="OTHER_WORK_ACTIVITIES", - friendly_name="other work activities", + friendly_name="Other Work Activities", type="string", startIndex=94, endIndex=96, @@ -648,7 +642,7 @@ Field( item="63", name="REQ_HRS_WAIVER_DEMO", - friendly_name="required hours under waiver demo", + friendly_name="Required Hours of Work under Waiver Demonstration", type="string", startIndex=96, endIndex=98, @@ -660,7 +654,7 @@ Field( item="64", name="EARNED_INCOME", - friendly_name="earned income", + friendly_name="Amount of Earned Income", type="string", startIndex=98, endIndex=102, @@ -672,7 +666,7 @@ Field( item="65A", name="UNEARNED_INCOME_TAX_CREDIT", - friendly_name="unearned income tax credit", + friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC)", type="string", startIndex=102, endIndex=106, @@ -684,7 +678,7 @@ Field( item="65B", name="UNEARNED_SOCIAL_SECURITY", - friendly_name="unearned social security", + friendly_name="Amount of Unearned Income: Social Security", type="string", startIndex=106, endIndex=110, @@ -696,7 +690,7 @@ Field( item="65C", name="UNEARNED_SSI", - friendly_name="unearned ssi benefit", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=110, endIndex=114, @@ -708,7 +702,7 @@ Field( item="65D", name="UNEARNED_WORKERS_COMP", - friendly_name="unearned workers compensation", + friendly_name="Amount of Unearned Income: Worker's Compensation", type="string", startIndex=114, endIndex=118, @@ -720,7 +714,7 @@ Field( item="65E", name="OTHER_UNEARNED_INCOME", - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type="string", startIndex=118, endIndex=122, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py index 7e1cb4634..26d0d32e1 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py @@ -97,7 +97,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -107,7 +107,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -117,7 +117,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number--TANF", type="string", startIndex=8, endIndex=19, @@ -127,7 +127,7 @@ Field( item="66", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -137,7 +137,7 @@ Field( item="67", name="DATE_OF_BIRTH", - friendly_name="date of birth", + friendly_name="Date of Birth", type="string", startIndex=20, endIndex=28, @@ -152,7 +152,7 @@ transform_func=tanf_ssn_decryption_func, item="68", name="SSN", - friendly_name="social security number - ssn", + friendly_name="Social Security Number", type="string", startIndex=28, endIndex=37, @@ -163,7 +163,7 @@ Field( item="69A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity/Race: Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -173,7 +173,7 @@ Field( item="69B", name="RACE_AMER_INDIAN", - friendly_name="race american indian", + friendly_name="Ethnicity/Race: American Indian or Alaska Native", type="number", startIndex=38, endIndex=39, @@ -183,7 +183,7 @@ Field( item="69C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=39, endIndex=40, @@ -193,7 +193,7 @@ Field( item="69D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=40, endIndex=41, @@ -203,7 +203,7 @@ Field( item="69E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Native Hawaiian or Other Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -213,7 +213,7 @@ Field( item="69F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="White", type="number", startIndex=42, endIndex=43, @@ -223,7 +223,7 @@ Field( item="70", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=43, endIndex=44, @@ -233,7 +233,7 @@ Field( item="71A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="receives non-social security act benefits", + friendly_name="Receives Benefits Based on Federal Disability Status under Non-Social Security Act Programs", type="number", startIndex=44, endIndex=45, @@ -243,7 +243,7 @@ Field( item="71B", name="RECEIVE_SSI", - friendly_name="receives social security income", + friendly_name="Receives Supplemental Security Income under Title XVI-SSI of the Social Security Act", type="number", startIndex=45, endIndex=46, @@ -253,7 +253,7 @@ Field( item="72", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=46, endIndex=48, @@ -263,7 +263,7 @@ Field( item="73", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent With Minor Child in the Family", type="number", startIndex=48, endIndex=49, @@ -273,7 +273,7 @@ Field( item="74", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=49, endIndex=51, @@ -288,7 +288,7 @@ Field( item="75", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Alienage", type="number", startIndex=51, endIndex=52, @@ -298,7 +298,7 @@ Field( item="76A", name="UNEARNED_SSI", - friendly_name="unearned ssi benefit", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=52, endIndex=56, @@ -308,7 +308,7 @@ Field( item="76B", name="OTHER_UNEARNED_INCOME", - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type="string", startIndex=56, endIndex=60, @@ -408,7 +408,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -418,7 +418,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -428,7 +428,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number--TANF", type="string", startIndex=8, endIndex=19, @@ -438,7 +438,7 @@ Field( item="66", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=60, endIndex=61, @@ -448,7 +448,7 @@ Field( item="67", name="DATE_OF_BIRTH", - friendly_name="date of birth", + friendly_name="Date of Birth", type="string", startIndex=61, endIndex=69, @@ -463,7 +463,7 @@ transform_func=tanf_ssn_decryption_func, item="68", name="SSN", - friendly_name="social security number - ssn", + friendly_name="Social Security Number", type="string", startIndex=69, endIndex=78, @@ -474,7 +474,7 @@ Field( item="69A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity/Race: Hispanic or Latino", type="number", startIndex=78, endIndex=79, @@ -484,7 +484,7 @@ Field( item="69B", name="RACE_AMER_INDIAN", - friendly_name="race american indian", + friendly_name="Ethnicity/Race: American Indian or Alaska Natve", type="number", startIndex=79, endIndex=80, @@ -494,7 +494,7 @@ Field( item="69C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=80, endIndex=81, @@ -504,7 +504,7 @@ Field( item="69D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=81, endIndex=82, @@ -514,7 +514,7 @@ Field( item="69E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", type="number", startIndex=82, endIndex=83, @@ -524,7 +524,7 @@ Field( item="69F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Ethnicity/Race: White", type="number", startIndex=83, endIndex=84, @@ -534,7 +534,7 @@ Field( item="70", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=84, endIndex=85, @@ -544,7 +544,7 @@ Field( item="71A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="receives non-ssa benefits", + friendly_name="Receives Disability Benefits: Federal Disability Status", type="number", startIndex=85, endIndex=86, @@ -554,7 +554,7 @@ Field( item="71B", name="RECEIVE_SSI", - friendly_name="receives SSI", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI", type="number", startIndex=86, endIndex=87, @@ -564,7 +564,7 @@ Field( item="72", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=87, endIndex=89, @@ -574,7 +574,7 @@ Field( item="73", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent With Minor Child in the Family", type="number", startIndex=89, endIndex=90, @@ -584,7 +584,7 @@ Field( item="74", name="EDUCATION_LEVEL", - friendly_name="education level", + friendly_name="Educational Level", type="string", startIndex=90, endIndex=92, @@ -598,7 +598,7 @@ Field( item="75", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Alienage", type="number", startIndex=92, endIndex=93, @@ -608,7 +608,7 @@ Field( item="76A", name="UNEARNED_SSI", - friendly_name="unearned ssi benefit", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=93, endIndex=97, @@ -618,7 +618,7 @@ Field( item="76B", name="OTHER_UNEARNED_INCOME", - friendly_name="other unearned income", + friendly_name="Amount of Unearned Income: Other", type="string", startIndex=97, endIndex=101, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index a9530beef..4209c1fa3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -12,10 +12,6 @@ document=Tribal_TANF_T4DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[], @@ -23,7 +19,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -33,7 +29,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -46,7 +42,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number--TANF", type="string", startIndex=8, endIndex=19, @@ -56,7 +52,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="county fips code", + friendly_name="County FIPS Code", type="string", startIndex=19, endIndex=22, @@ -66,7 +62,7 @@ Field( item="5", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=22, endIndex=24, @@ -76,7 +72,7 @@ Field( item="7", name="ZIP_CODE", - friendly_name="zip code", + friendly_name="Zip Code", type="string", startIndex=24, endIndex=29, @@ -86,7 +82,7 @@ Field( item="8", name="DISPOSITION", - friendly_name="disposition", + friendly_name="Disposition", type="number", startIndex=29, endIndex=30, @@ -96,7 +92,7 @@ Field( item="9", name="CLOSURE_REASON", - friendly_name="closure reason", + friendly_name="Reason for Closure", type="string", startIndex=30, endIndex=32, @@ -110,7 +106,7 @@ Field( item="10", name="REC_SUB_HOUSING", - friendly_name="receives subsidized housing", + friendly_name="Received Subsidized Housing", type="number", startIndex=32, endIndex=33, @@ -120,7 +116,7 @@ Field( item="11", name="REC_MED_ASSIST", - friendly_name="receives medical assistance", + friendly_name="Received Medical Assistance:", type="number", startIndex=33, endIndex=34, @@ -130,7 +126,7 @@ Field( item="12", name="REC_FOOD_STAMPS", - friendly_name="receives food stamps", + friendly_name="Received Food Stamps", type="number", startIndex=34, endIndex=35, @@ -140,7 +136,7 @@ Field( item="13", name="REC_SUB_CC", - friendly_name="receives subsidized child care", + friendly_name="Received Subsidized Child Care", type="number", startIndex=35, endIndex=36, @@ -150,7 +146,7 @@ Field( item="14", name="BLANK", - friendly_name="blank", + friendly_name="Family Affiliation:", type="string", startIndex=36, endIndex=71, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py index feaff651f..93dc07b8f 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py @@ -14,10 +14,6 @@ document=Tribal_TANF_T5DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), - validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), - ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -103,7 +99,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -113,7 +109,7 @@ Field( item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=8, @@ -126,7 +122,7 @@ Field( item="6", name="CASE_NUMBER", - friendly_name="case number", + friendly_name="Case Number--TANF", type="string", startIndex=8, endIndex=19, @@ -136,7 +132,7 @@ Field( item="14", name="FAMILY_AFFILIATION", - friendly_name="family affiliation", + friendly_name="Family Affiliation", type="number", startIndex=19, endIndex=20, @@ -146,22 +142,21 @@ Field( item="15", name="DATE_OF_BIRTH", - friendly_name="date of birth", - type="string", + friendly_name="Date of Birth", + type="number", startIndex=20, endIndex=28, required=True, - validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators=[ + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + ], ), TransformField( transform_func=tanf_ssn_decryption_func, item="16", name="SSN", - friendly_name="social security number - ssn", + friendly_name="Social Security Number", type="string", startIndex=28, endIndex=37, @@ -172,7 +167,7 @@ Field( item="17A", name="RACE_HISPANIC", - friendly_name="race hispanic", + friendly_name="Ethnicity/Race: Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -182,7 +177,7 @@ Field( item="17B", name="RACE_AMER_INDIAN", - friendly_name="race american indian", + friendly_name="Ethnicity/Race: American Indian or Alaska Native", type="number", startIndex=38, endIndex=39, @@ -192,7 +187,7 @@ Field( item="17C", name="RACE_ASIAN", - friendly_name="race asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=39, endIndex=40, @@ -202,7 +197,7 @@ Field( item="17D", name="RACE_BLACK", - friendly_name="race black", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=40, endIndex=41, @@ -212,7 +207,7 @@ Field( item="17E", name="RACE_HAWAIIAN", - friendly_name="race hawaiian", + friendly_name="Ethnicity/Race: Hawaiian or Other Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -222,7 +217,7 @@ Field( item="17F", name="RACE_WHITE", - friendly_name="race white", + friendly_name="Ethnicity/Race: White", type="number", startIndex=42, endIndex=43, @@ -232,7 +227,7 @@ Field( item="18", name="GENDER", - friendly_name="gender", + friendly_name="Gender", type="number", startIndex=43, endIndex=44, @@ -242,7 +237,7 @@ Field( item="19A", name="REC_OASDI_INSURANCE", - friendly_name="receives old-age survivors and disability insurance", + friendly_name="Receives Disability Benefits: OASDI Program", type="number", startIndex=44, endIndex=45, @@ -252,7 +247,7 @@ Field( item="19B", name="REC_FEDERAL_DISABILITY", - friendly_name="receives federal disability", + friendly_name="Received Disability Benefits: Federal Disability Status", type="number", startIndex=45, endIndex=46, @@ -262,7 +257,7 @@ Field( item="19C", name="REC_AID_TOTALLY_DISABLED", - friendly_name="receives aid for totally disabled", + friendly_name="Received Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", type="number", startIndex=46, endIndex=47, @@ -272,7 +267,7 @@ Field( item="19D", name="REC_AID_AGED_BLIND", - friendly_name="receives from the aid to the aged, blind, and disabled program", + friendly_name="Received Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", type="number", startIndex=47, endIndex=48, @@ -282,7 +277,7 @@ Field( item="19E", name="REC_SSI", - friendly_name="receives social security income", + friendly_name="Received Disability Benefits: Supplemental Security Income Under Title XVI-SSI", type="number", startIndex=48, endIndex=49, @@ -292,7 +287,7 @@ Field( item="20", name="MARITAL_STATUS", - friendly_name="marital status", + friendly_name="Marital Status", type="number", startIndex=49, endIndex=50, @@ -302,7 +297,7 @@ Field( item="21", name="RELATIONSHIP_HOH", - friendly_name="relationship to head of household", + friendly_name="Relationship to Head-of-Household", type="string", startIndex=50, endIndex=52, @@ -312,7 +307,7 @@ Field( item="22", name="PARENT_MINOR_CHILD", - friendly_name="parent of minor child", + friendly_name="Parent With Minor Child in the Family", type="number", startIndex=52, endIndex=53, @@ -322,7 +317,7 @@ Field( item="23", name="NEEDS_OF_PREGNANT_WOMAN", - friendly_name="needs of pregnant woman", + friendly_name="Needs of a Pregnant Woman", type="number", startIndex=53, endIndex=54, @@ -332,7 +327,7 @@ Field( item="24", name="EDUCATION_LEVEL", - friendly_name="educational level", + friendly_name="Educational Level", type="string", startIndex=54, endIndex=56, @@ -347,7 +342,7 @@ Field( item="25", name="CITIZENSHIP_STATUS", - friendly_name="citizenship status", + friendly_name="Citizenship/Alienage", type="number", startIndex=56, endIndex=57, @@ -361,7 +356,7 @@ Field( item="26", name="COUNTABLE_MONTH_FED_TIME", - friendly_name="countable months toward federal time", + friendly_name="Number of Months Countable toward Tribal Time Limit:", type="string", startIndex=57, endIndex=60, @@ -371,7 +366,7 @@ Field( item="27", name="COUNTABLE_MONTHS_STATE_TRIBE", - friendly_name="countable months remaining under state tribe", + friendly_name="Number of Countable Months Remaining Under Tribe's Time Limit", type="string", startIndex=60, endIndex=62, @@ -381,7 +376,7 @@ Field( item="28", name="EMPLOYMENT_STATUS", - friendly_name="employment status", + friendly_name="Employment Status", type="number", startIndex=62, endIndex=63, @@ -391,7 +386,7 @@ Field( item="29", name="AMOUNT_EARNED_INCOME", - friendly_name="amount earnedof income", + friendly_name="Amount of Earned Income", type="string", startIndex=63, endIndex=67, @@ -401,7 +396,7 @@ Field( item="30", name="AMOUNT_UNEARNED_INCOME", - friendly_name="amount of unearned income", + friendly_name="Amount of Unearned Income", type="string", startIndex=67, endIndex=71, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py index e946f158a..b641b7983 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py @@ -12,7 +12,6 @@ document=Tribal_TANF_T6DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(379), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual("NUM_APPLICATIONS", ["NUM_APPROVED", "NUM_DENIED"]), @@ -27,7 +26,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -37,7 +36,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -51,7 +50,7 @@ calendar_quarter_to_rpt_month_year(0), item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -64,7 +63,7 @@ Field( item="4A", name="NUM_APPLICATIONS", - friendly_name="total number of applications", + friendly_name="Total Number of Applications", type="number", startIndex=7, endIndex=15, @@ -74,7 +73,7 @@ Field( item="5A", name="NUM_APPROVED", - friendly_name="total number of approved applications", + friendly_name="Total Number of Approved Applications", type="number", startIndex=31, endIndex=39, @@ -84,7 +83,7 @@ Field( item="6A", name="NUM_DENIED", - friendly_name="total number of denied applications", + friendly_name="Total Number of Denied Applications", type="number", startIndex=55, endIndex=63, @@ -94,7 +93,7 @@ Field( item="7A", name="ASSISTANCE", - friendly_name="total amount of assistance", + friendly_name="Total Amount of Assistance", type="number", startIndex=79, endIndex=91, @@ -104,7 +103,7 @@ Field( item="8A", name="NUM_FAMILIES", - friendly_name="total number of families", + friendly_name="Total Number of Families", type="number", startIndex=115, endIndex=123, @@ -114,7 +113,7 @@ Field( item="9A", name="NUM_2_PARENTS", - friendly_name="total number of two-parent families", + friendly_name="Total Number of Two-parent Families", type="number", startIndex=139, endIndex=147, @@ -124,7 +123,7 @@ Field( item="10A", name="NUM_1_PARENTS", - friendly_name="total number of one-parent families", + friendly_name="Total Number of No-Parent Families", type="number", startIndex=163, endIndex=171, @@ -134,7 +133,7 @@ Field( item="11A", name="NUM_NO_PARENTS", - friendly_name="total number of no parent families", + friendly_name="Total Number of No Parent Families", type="number", startIndex=187, endIndex=195, @@ -144,7 +143,7 @@ Field( item="12A", name="NUM_RECIPIENTS", - friendly_name="total number of recipients", + friendly_name="Total Number of Recipients", type="number", startIndex=211, endIndex=219, @@ -154,7 +153,7 @@ Field( item="13A", name="NUM_ADULT_RECIPIENTS", - friendly_name="total number of adult recipients", + friendly_name="Total Number of Adult Recipients", type="number", startIndex=235, endIndex=243, @@ -164,7 +163,7 @@ Field( item="14A", name="NUM_CHILD_RECIPIENTS", - friendly_name="total number of child recipients", + friendly_name="Total Number of Child Recipients", type="number", startIndex=259, endIndex=267, @@ -174,7 +173,7 @@ Field( item="15A", name="NUM_NONCUSTODIALS", - friendly_name="total number of noncustodial parents participating in work activities", + friendly_name="Total Number of Noncustodial Parents Participating in Work Activities", type="number", startIndex=283, endIndex=291, @@ -184,7 +183,7 @@ Field( item="16A", name="NUM_BIRTHS", - friendly_name="total number of births", + friendly_name="Total Number of Births", type="number", startIndex=307, endIndex=315, @@ -194,7 +193,7 @@ Field( item="17A", name="NUM_OUTWEDLOCK_BIRTHS", - friendly_name="total number of out-of-wedlock births", + friendly_name="Total Number of Out-of-Wedlock Births", type="number", startIndex=331, endIndex=339, @@ -204,7 +203,7 @@ Field( item="18A", name="NUM_CLOSED_CASES", - friendly_name="total number of closed cases", + friendly_name="Total Number of Closed Cases", type="number", startIndex=355, endIndex=363, @@ -216,10 +215,8 @@ s2 = RowSchema( document=Tribal_TANF_T6DataSubmissionDocument(), - quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual("NUM_APPLICATIONS", ["NUM_APPROVED", "NUM_DENIED"]), @@ -234,7 +231,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -244,7 +241,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -255,7 +252,7 @@ calendar_quarter_to_rpt_month_year(1), item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -265,7 +262,7 @@ Field( item="4B", name="NUM_APPLICATIONS", - friendly_name="total number of applications", + friendly_name="Total Number of Applicants", type="number", startIndex=15, endIndex=23, @@ -275,7 +272,7 @@ Field( item="5B", name="NUM_APPROVED", - friendly_name="total number of approved applications", + friendly_name="Total Number of Approved Applications", type="number", startIndex=39, endIndex=47, @@ -285,7 +282,7 @@ Field( item="6B", name="NUM_DENIED", - friendly_name="total number of denied applications", + friendly_name="Total Number of Denied Applications", type="number", startIndex=63, endIndex=71, @@ -295,7 +292,7 @@ Field( item="7B", name="ASSISTANCE", - friendly_name="assistance", + friendly_name="Total Amount of Assistance", type="number", startIndex=91, endIndex=103, @@ -305,7 +302,7 @@ Field( item="8B", name="NUM_FAMILIES", - friendly_name="total number of families", + friendly_name="Total Number of Families", type="number", startIndex=123, endIndex=131, @@ -315,7 +312,7 @@ Field( item="9B", name="NUM_2_PARENTS", - friendly_name="total number of two-parent families", + friendly_name="Total Number of Two-parent Families", type="number", startIndex=147, endIndex=155, @@ -325,7 +322,7 @@ Field( item="10B", name="NUM_1_PARENTS", - friendly_name="total number of one-parent families", + friendly_name="Total Number of One-Parent Families", type="number", startIndex=171, endIndex=179, @@ -335,7 +332,7 @@ Field( item="11B", name="NUM_NO_PARENTS", - friendly_name="total number of no parent families", + friendly_name="Total Number of No-Parent Families", type="number", startIndex=195, endIndex=203, @@ -345,7 +342,7 @@ Field( item="12B", name="NUM_RECIPIENTS", - friendly_name="total number of recipients", + friendly_name="Total Number of Recipients", type="number", startIndex=219, endIndex=227, @@ -355,7 +352,7 @@ Field( item="13B", name="NUM_ADULT_RECIPIENTS", - friendly_name="total number of adult recipients", + friendly_name="Total Number of Adult Recipients", type="number", startIndex=243, endIndex=251, @@ -365,7 +362,7 @@ Field( item="14B", name="NUM_CHILD_RECIPIENTS", - friendly_name="total number of child recipients", + friendly_name="Total Number of Child Recipients", type="number", startIndex=267, endIndex=275, @@ -375,7 +372,7 @@ Field( item="15B", name="NUM_NONCUSTODIALS", - friendly_name="total number of noncustodial parents", + friendly_name="Total Number of Noncustodial Parents Participating in Work Activities", type="number", startIndex=291, endIndex=299, @@ -385,7 +382,7 @@ Field( item="16B", name="NUM_BIRTHS", - friendly_name="total number of births", + friendly_name="Total Number of Births", type="number", startIndex=315, endIndex=323, @@ -395,7 +392,7 @@ Field( item="17B", name="NUM_OUTWEDLOCK_BIRTHS", - friendly_name="total number of out wedlock births", + friendly_name="Total Number of Out-of-Wedlock Births", type="number", startIndex=339, endIndex=347, @@ -405,7 +402,7 @@ Field( item="18B", name="NUM_CLOSED_CASES", - friendly_name="total number of closed assets", + friendly_name="Total Number of Closed Cases", type="number", startIndex=363, endIndex=371, @@ -417,10 +414,8 @@ s3 = RowSchema( document=Tribal_TANF_T6DataSubmissionDocument(), - quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual("NUM_APPLICATIONS", ["NUM_APPROVED", "NUM_DENIED"]), @@ -435,7 +430,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -445,7 +440,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -456,7 +451,7 @@ calendar_quarter_to_rpt_month_year(2), item="4", name="RPT_MONTH_YEAR", - friendly_name="reporting month and year", + friendly_name="Reporitng Year and Month", type="number", startIndex=2, endIndex=7, @@ -466,7 +461,7 @@ Field( item="4C", name="NUM_APPLICATIONS", - friendly_name="total number of applications", + friendly_name="Total Number of Applications", type="number", startIndex=23, endIndex=31, @@ -476,7 +471,7 @@ Field( item="5C", name="NUM_APPROVED", - friendly_name="total number of approved applications", + friendly_name="Total Number of Approved Applications", type="number", startIndex=47, endIndex=55, @@ -486,7 +481,7 @@ Field( item="6C", name="NUM_DENIED", - friendly_name="total number of denied applications", + friendly_name="Total Number of Denied Applications", type="number", startIndex=71, endIndex=79, @@ -496,7 +491,7 @@ Field( item="7C", name="ASSISTANCE", - friendly_name="total amount of assistance", + friendly_name="Total Amount of Assistance", type="number", startIndex=103, endIndex=115, @@ -506,7 +501,7 @@ Field( item="8C", name="NUM_FAMILIES", - friendly_name="total number of families", + friendly_name="Total Number of Families", type="number", startIndex=131, endIndex=139, @@ -516,7 +511,7 @@ Field( item="9C", name="NUM_2_PARENTS", - friendly_name="total number of two-parent families", + friendly_name="Total Number of Two-parent Families", type="number", startIndex=155, endIndex=163, @@ -526,7 +521,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, @@ -536,7 +531,7 @@ Field( item="11C", name="NUM_NO_PARENTS", - friendly_name="total number of no parent families", + friendly_name="Total Number of No parent Families", type="number", startIndex=203, endIndex=211, @@ -546,7 +541,7 @@ Field( item="12C", name="NUM_RECIPIENTS", - friendly_name="total number of recipients", + friendly_name="Total Number of Recipients", type="number", startIndex=227, endIndex=235, @@ -556,7 +551,7 @@ Field( item="13C", name="NUM_ADULT_RECIPIENTS", - friendly_name="total number of adult recipients", + friendly_name="Total Number of Adult Recipients", type="number", startIndex=251, endIndex=259, @@ -566,7 +561,7 @@ Field( item="14C", name="NUM_CHILD_RECIPIENTS", - friendly_name="total number of child recipients", + friendly_name="Total Number of Child Recipients", type="number", startIndex=275, endIndex=283, @@ -576,7 +571,7 @@ Field( item="15C", name="NUM_NONCUSTODIALS", - friendly_name="total number of noncustodial parents", + friendly_name="Total Number of Noncustodial Parents Participating in Work Activities", type="number", startIndex=299, endIndex=307, @@ -586,7 +581,7 @@ Field( item="16C", name="NUM_BIRTHS", - friendly_name="total number of births", + friendly_name="Total Number of Births", type="number", startIndex=323, endIndex=331, @@ -596,7 +591,7 @@ Field( item="17C", name="NUM_OUTWEDLOCK_BIRTHS", - friendly_name="total number of out wedlock births", + friendly_name="Total Number of Out-of-Wedlock Births", type="number", startIndex=347, endIndex=355, @@ -606,7 +601,7 @@ Field( item="18C", name="NUM_CLOSED_CASES", - friendly_name="total number of closed cases", + friendly_name="Total Number of Closed Cases", type="number", startIndex=371, endIndex=379, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py index b6ec33538..67b34aa63 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py @@ -25,14 +25,13 @@ validators.hasLength(247), validators.notEmpty(0, 7), validators.notEmpty(validator_index, validator_index + 24), - validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[], fields=[ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -42,7 +41,7 @@ Field( item="3", name="CALENDAR_QUARTER", - friendly_name="calendar quarter", + friendly_name="Calendar Quarter", type="number", startIndex=2, endIndex=7, @@ -56,7 +55,7 @@ transform_func=calendar_quarter_to_rpt_month_year(month_index), item="3A", name="RPT_MONTH_YEAR", - friendly_name="reporting month year", + friendly_name="Reporting Year and Month", type="number", startIndex=2, endIndex=7, @@ -69,7 +68,7 @@ Field( item="4", name="TDRS_SECTION_IND", - friendly_name="tdrs section indicator", + friendly_name="TDRS Section Indicator", type="string", startIndex=section_ind_index, endIndex=section_ind_index + 1, @@ -79,7 +78,7 @@ Field( item="5", name="STRATUM", - friendly_name="stratum", + friendly_name="Stratum", type="string", startIndex=stratum_index, endIndex=stratum_index + 2, @@ -89,7 +88,7 @@ Field( item=families_value_item_number, name="FAMILIES_MONTH", - friendly_name="families month", + friendly_name="Families Month", type="number", startIndex=families_index, endIndex=families_index + 7, From 7388f80bd222577a4c8511043767e62ff195cf5b Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Mon, 8 Apr 2024 08:49:38 -0700 Subject: [PATCH 02/46] Updating validators Adding back validators that got removed on previous commit --- .../tdpservice/parsers/schema_defs/ssp/m1.py | 4 +++ .../tdpservice/parsers/schema_defs/ssp/m2.py | 4 +++ .../tdpservice/parsers/schema_defs/ssp/m3.py | 4 +++ .../tdpservice/parsers/schema_defs/ssp/m4.py | 4 +++ .../tdpservice/parsers/schema_defs/ssp/m5.py | 4 +++ .../tdpservice/parsers/schema_defs/ssp/m6.py | 1 + .../tdpservice/parsers/schema_defs/ssp/m7.py | 1 + .../tdpservice/parsers/schema_defs/tanf/t1.py | 4 +++ .../tdpservice/parsers/schema_defs/tanf/t2.py | 10 ++++-- .../tdpservice/parsers/schema_defs/tanf/t3.py | 36 ++++++++++++------- .../tdpservice/parsers/schema_defs/tanf/t4.py | 4 +++ .../tdpservice/parsers/schema_defs/tanf/t5.py | 9 +++-- .../tdpservice/parsers/schema_defs/tanf/t6.py | 5 +++ .../tdpservice/parsers/schema_defs/tanf/t7.py | 1 + .../parsers/schema_defs/tribal_tanf/t1.py | 4 +++ .../parsers/schema_defs/tribal_tanf/t2.py | 9 +++-- .../parsers/schema_defs/tribal_tanf/t4.py | 4 +++ .../parsers/schema_defs/tribal_tanf/t5.py | 9 +++-- .../parsers/schema_defs/tribal_tanf/t6.py | 5 +++ .../parsers/schema_defs/tribal_tanf/t7.py | 1 + 20 files changed, 102 insertions(+), 21 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index e6465ae27..294a71d44 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -12,6 +12,10 @@ document=SSP_M1DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(150), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index 352b6d3fe..e68d8b8a1 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -14,6 +14,10 @@ document=SSP_M2DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(150), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index 039b7b938..132e27e8a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -11,6 +11,10 @@ document=SSP_M3DataSubmissionDocument(), preparsing_validators=[ validators.notEmpty(start=19, end=60), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py index 89f916984..cc86e033b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py @@ -12,6 +12,10 @@ document=SSP_M4DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(66), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[], diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py index 35f5f0121..f3fa86e95 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py @@ -14,6 +14,10 @@ document=SSP_M5DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(66), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py index f7b686caa..bff13272d 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py @@ -11,6 +11,7 @@ document=SSP_M6DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(259), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py index b2d31e994..af1b2c015 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py @@ -25,6 +25,7 @@ validators.hasLength(247), validators.notEmpty(0, 7), validators.notEmpty(validator_index, validator_index + 24), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[], fields=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 946e3e692..de181f04d 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -12,6 +12,10 @@ document=TANF_T1DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(156), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 36fba6621..44d2d4fcf 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -14,6 +14,10 @@ document=TANF_T2DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(156), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -122,6 +126,7 @@ result_field="WORK_PART_STATUS", result_function=validators.notMatches("99"), ), + validators.validate__WORK_ELIGIBLE_INDICATOR__HOH__AGE(), ], fields=[ Field( @@ -185,10 +190,11 @@ startIndex=21, endIndex=29, required=True, - validators=[ + validators=[validators.intHasLength(8), validators.dateYearIsLargerThan(1900), validators.dateMonthIsValid(), - ], + validators.dateDayIsValid() + ] ), TransformField( transform_func=tanf_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index b2212d5d3..502695148 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -12,6 +12,10 @@ document=TANF_T3DataSubmissionDocument(), preparsing_validators=[ validators.notEmpty(start=19, end=60), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -137,10 +141,11 @@ startIndex=20, endIndex=28, required=True, - validators=[ - validators.dateYearIsLargerThan(1950), - validators.dateMonthIsValid(), - ], + validators=[validators.intHasLength(8), + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ], ), TransformField( transform_func=tanf_ssn_decryption_func, @@ -317,6 +322,10 @@ quiet_preparser_errors=True, preparsing_validators=[ validators.notEmpty(start=60, end=101), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -442,10 +451,11 @@ startIndex=61, endIndex=69, required=True, - validators=[ - validators.dateYearIsLargerThan(1950), + validators=[validators.intHasLength(8), + validators.dateYearIsLargerThan(1900), validators.dateMonthIsValid(), - ], + validators.dateDayIsValid() + ] ), TransformField( transform_func=tanf_ssn_decryption_func, @@ -462,7 +472,7 @@ Field( item="70A", name="RACE_HISPANIC", - friendly_name="Ethnicity: Hispanic or Latino", + friendly_name="Ethnicity/Race: Hispanic or Latino", type="number", startIndex=78, endIndex=79, @@ -472,7 +482,7 @@ Field( item="70B", name="RACE_AMER_INDIAN", - friendly_name="Race: American Indian or Alaska Native", + friendly_name="Ethnicity/Race: American Indian or Alaska Native", type="number", startIndex=79, endIndex=80, @@ -482,7 +492,7 @@ Field( item="70C", name="RACE_ASIAN", - friendly_name="Race: Asian", + friendly_name="Ethnicity/Race: Asian", type="number", startIndex=80, endIndex=81, @@ -492,7 +502,7 @@ Field( item="70D", name="RACE_BLACK", - friendly_name="Race: Black or African American", + friendly_name="Ethnicity/Race: Black or African American", type="number", startIndex=81, endIndex=82, @@ -502,7 +512,7 @@ Field( item="70E", name="RACE_HAWAIIAN", - friendly_name="Race: Native Hawaiian or Other Pacific Islander", + friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", type="number", startIndex=82, endIndex=83, @@ -512,7 +522,7 @@ Field( item="70F", name="RACE_WHITE", - friendly_name="Race: White", + friendly_name="Ethnicity/Race: White", type="number", startIndex=83, endIndex=84, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py index 88185ab84..c14d7b870 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py @@ -13,6 +13,10 @@ document=TANF_T4DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[], diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index b87a3af6a..5b5f13e70 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -14,6 +14,10 @@ document=TANF_T5DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -153,10 +157,11 @@ startIndex=20, endIndex=28, required=True, - validators=[ + validators=[validators.intHasLength(8), validators.dateYearIsLargerThan(1900), validators.dateMonthIsValid(), - ], + validators.dateDayIsValid() + ], ), TransformField( transform_func=tanf_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py index a03ea79de..34fd1ba46 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py @@ -12,6 +12,7 @@ document=TANF_T6DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(379), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -227,8 +228,10 @@ s2 = RowSchema( document=TANF_T6DataSubmissionDocument(), + quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( @@ -438,8 +441,10 @@ s3 = RowSchema( document=TANF_T6DataSubmissionDocument(), + quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual( diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py index edf7299f2..48ec6e654 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py @@ -25,6 +25,7 @@ validators.hasLength(247), validators.notEmpty(0, 7), validators.notEmpty(validator_index, validator_index + 24), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[], fields=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py index f36411a72..18b05e50a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py @@ -12,6 +12,10 @@ document=Tribal_TANF_T1DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(122), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index 0f8e3f402..48599ae0b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -14,6 +14,10 @@ document=Tribal_TANF_T2DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(122), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -174,10 +178,11 @@ startIndex=21, endIndex=29, required=True, - validators=[ + validators=[validators.intHasLength(8), validators.dateYearIsLargerThan(1900), validators.dateMonthIsValid(), - ], + validators.dateDayIsValid() + ] ), TransformField( transform_func=tanf_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index 4209c1fa3..9e41d3343 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -12,6 +12,10 @@ document=Tribal_TANF_T4DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[], diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py index 93dc07b8f..e419c8930 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py @@ -14,6 +14,10 @@ document=Tribal_TANF_T5DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(71), + validators.or_priority_validators([ + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), + ]), validators.notEmpty(8, 19) ], postparsing_validators=[ @@ -147,10 +151,11 @@ startIndex=20, endIndex=28, required=True, - validators=[ + validators=[validators.intHasLength(8), validators.dateYearIsLargerThan(1900), validators.dateMonthIsValid(), - ], + validators.dateDayIsValid() + ], ), TransformField( transform_func=tanf_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py index b641b7983..d2baefdc0 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py @@ -12,6 +12,7 @@ document=Tribal_TANF_T6DataSubmissionDocument(), preparsing_validators=[ validators.hasLength(379), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual("NUM_APPLICATIONS", ["NUM_APPROVED", "NUM_DENIED"]), @@ -215,8 +216,10 @@ s2 = RowSchema( document=Tribal_TANF_T6DataSubmissionDocument(), + quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual("NUM_APPLICATIONS", ["NUM_APPROVED", "NUM_DENIED"]), @@ -414,8 +417,10 @@ s3 = RowSchema( document=Tribal_TANF_T6DataSubmissionDocument(), + quiet_preparser_errors=True, preparsing_validators=[ validators.hasLength(379), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[ validators.sumIsEqual("NUM_APPLICATIONS", ["NUM_APPROVED", "NUM_DENIED"]), diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py index 67b34aa63..61636ef47 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py @@ -25,6 +25,7 @@ validators.hasLength(247), validators.notEmpty(0, 7), validators.notEmpty(validator_index, validator_index + 24), + validators.field_year_month_with_header_year_quarter(), ], postparsing_validators=[], fields=[ From 1ea3c8a2abd1c993d9e693fcbb4fb894b90596f9 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Mon, 8 Apr 2024 09:58:19 -0600 Subject: [PATCH 03/46] - update incorrect name --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index 4209c1fa3..cc19dd1d2 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -145,7 +145,7 @@ ), Field( item="14", - name="BLANK", + name="FAMILY_AFFILIATION", friendly_name="Family Affiliation:", type="string", startIndex=36, From 84e0965e2984dec76c4a89ab01572fa47eda222c Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Mon, 8 Apr 2024 10:42:18 -0600 Subject: [PATCH 04/46] - Fix merge conflicts and update tests --- tdrs-backend/tdpservice/data_files/test/test_api.py | 4 ++-- .../tdpservice/parsers/schema_defs/ssp/m1.py | 4 ++-- .../tdpservice/parsers/schema_defs/ssp/m2.py | 6 +++--- .../tdpservice/parsers/schema_defs/tanf/t2.py | 2 +- .../tdpservice/parsers/schema_defs/tanf/t3.py | 4 ++-- .../tdpservice/parsers/schema_defs/tanf/t5.py | 2 +- .../tdpservice/parsers/schema_defs/tribal_tanf/t2.py | 2 +- .../tdpservice/parsers/schema_defs/tribal_tanf/t5.py | 2 +- tdrs-backend/tdpservice/parsers/test/test_parse.py | 12 ++++++------ tdrs-backend/tdpservice/settings/common.py | 2 +- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/tdrs-backend/tdpservice/data_files/test/test_api.py b/tdrs-backend/tdpservice/data_files/test/test_api.py index bfcc3f2c5..b61b848e5 100644 --- a/tdrs-backend/tdpservice/data_files/test/test_api.py +++ b/tdrs-backend/tdpservice/data_files/test/test_api.py @@ -102,8 +102,8 @@ def assert_error_report_tanf_file_content_matches_with_friendly_names(response): assert ws.cell(row=1, column=1).value == "Error reporting in TDP is still in development.We'll" \ + " be in touch when it's ready to use!For now please refer to the reports you receive via email" - assert ws.cell(row=4, column=COL_ERROR_MESSAGE).value == "if cash amount :873 validator1 passed" \ - + " then number of months T1: 0 is not larger than 0." + assert ws.cell(row=4, column=COL_ERROR_MESSAGE).value == "if Cash and Cash Equivalents: Amount :873 " + \ + "validator1 passed then Cash and Cash Equivalents: Number of Months T1: 0 is not larger than 0." @staticmethod def assert_error_report_ssp_file_content_matches_with_friendly_names(response): diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index c1260a172..62f56f578 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -12,12 +12,12 @@ record_type="M1", document=SSP_M1DataSubmissionDocument(), preparsing_validators=[ - validators.hasLength(150), + validators.recordHasLength(150), + validators.caseNumberNotEmpty(8, 19), validators.or_priority_validators([ validators.field_year_month_with_header_year_quarter(), validators.validateRptMonthYear(), ]), - validators.notEmpty(8, 19) ], postparsing_validators=[ validators.if_then_validator( diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index 8926d7698..2f5ead8ca 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -14,12 +14,12 @@ record_type="M2", document=SSP_M2DataSubmissionDocument(), preparsing_validators=[ - validators.hasLength(150), + validators.recordHasLength(150), + validators.caseNumberNotEmpty(8, 19), validators.or_priority_validators([ validators.field_year_month_with_header_year_quarter(), validators.validateRptMonthYear(), ]), - validators.notEmpty(8, 19) ], postparsing_validators=[ validators.validate__FAM_AFF__SSN(), @@ -184,7 +184,7 @@ item="28", name='DATE_OF_BIRTH', friendly_name="Date of Birth", - type='number', + type='string', startIndex=21, endIndex=29, required=True, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 78bb268d0..6c24fd251 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -187,7 +187,7 @@ item="32", name="DATE_OF_BIRTH", friendly_name="Date of Birth", - type="number", + type="string", startIndex=21, endIndex=29, required=True, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 29a1ea66c..0875b3911 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -138,7 +138,7 @@ item="68", name="DATE_OF_BIRTH", friendly_name="Date of Birth", - type="number", + type="string", startIndex=20, endIndex=28, required=True, @@ -449,7 +449,7 @@ item="68", name="DATE_OF_BIRTH", friendly_name="Date of Birth", - type="number", + type="string", startIndex=61, endIndex=69, required=True, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index d756df167..de691c34d 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -154,7 +154,7 @@ item="15", name="DATE_OF_BIRTH", friendly_name="Date of Birth", - type="number", + type="string", startIndex=20, endIndex=28, required=True, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index 19a2f0b01..b19c4914a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -175,7 +175,7 @@ item="32", name="DATE_OF_BIRTH", friendly_name="Date of Birth", - type="number", + type="string", startIndex=21, endIndex=29, required=True, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py index 294cabae2..065918b5c 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py @@ -148,7 +148,7 @@ item="15", name="DATE_OF_BIRTH", friendly_name="Date of Birth", - type="number", + type="string", startIndex=20, endIndex=28, required=True, diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index 5177c306a..cbe87af90 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -183,9 +183,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': 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}], + {'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}], 'rejected': 0} assert TANF_T1.objects.count() == expected_t1_record_count @@ -616,11 +616,11 @@ 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_WITH_ERRORS + assert dfs.status == DataFileSummary.Status.ACCEPTED dfs.case_aggregates = aggregates.case_aggregates_by_month( dfs.datafile, dfs.status) assert dfs.case_aggregates == {'months': [ - {'month': 'Oct', 'accepted_without_errors': 4, 'accepted_with_errors': 1}, + {'month': 'Oct', 'accepted_without_errors': 5, 'accepted_with_errors': 0}, {'month': 'Nov', 'accepted_without_errors': 0, 'accepted_with_errors': 0}, {'month': 'Dec', 'accepted_without_errors': 0, 'accepted_with_errors': 0}], 'rejected': 0} @@ -843,7 +843,7 @@ def test_parse_bad_ssp_s1_missing_required(bad_ssp_s1__row_missing_required_fiel parse.parse_datafile(bad_ssp_s1__row_missing_required_field, dfs) parser_errors = ParserError.objects.filter(file=bad_ssp_s1__row_missing_required_field) - assert parser_errors.count() == 7 + assert parser_errors.count() == 6 row_2_error = parser_errors.get( row_number=2, diff --git a/tdrs-backend/tdpservice/settings/common.py b/tdrs-backend/tdpservice/settings/common.py index ec6b75c59..0407b2cf0 100644 --- a/tdrs-backend/tdpservice/settings/common.py +++ b/tdrs-backend/tdpservice/settings/common.py @@ -194,7 +194,7 @@ class Common(Configuration): # Logging # set level as 'INFO' if env var is not set - LOGGING_LEVEL = os.getenv('LOGGING_LEVEL', 'INFO') + LOGGING_LEVEL = 'WARNING'#os.getenv('LOGGING_LEVEL', 'INFO') LOGGING = { "version": 1, "disable_existing_loggers": False, From 1a27754c9beb8071d8f59ab8c994d8427647416a Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Mon, 8 Apr 2024 10:59:22 -0600 Subject: [PATCH 05/46] - fix lint --- .../tdpservice/parsers/schema_defs/ssp/m1.py | 4 +- .../tdpservice/parsers/schema_defs/ssp/m2.py | 31 +++++++++------ .../tdpservice/parsers/schema_defs/ssp/m3.py | 10 +++-- .../tdpservice/parsers/schema_defs/ssp/m4.py | 4 +- .../tdpservice/parsers/schema_defs/tanf/t2.py | 38 ++++++++++++------- .../tdpservice/parsers/schema_defs/tanf/t3.py | 8 ++-- .../tdpservice/parsers/schema_defs/tanf/t5.py | 8 ++-- .../parsers/schema_defs/tribal_tanf/t2.py | 17 +++++---- .../parsers/schema_defs/tribal_tanf/t5.py | 8 ++-- 9 files changed, 76 insertions(+), 52 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index 62f56f578..f7569a9b1 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -15,8 +15,8 @@ validators.recordHasLength(150), validators.caseNumberNotEmpty(8, 19), validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), ]), ], postparsing_validators=[ diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index 2f5ead8ca..82702565a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -17,8 +17,8 @@ validators.recordHasLength(150), validators.caseNumberNotEmpty(8, 19), validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), ]), ], postparsing_validators=[ @@ -625,7 +625,8 @@ Field( item="52A", name='ED_NO_HIGH_SCHOOL_DIPL_HOP', - friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Participation", + friendly_name="Education Directly Related to Employment for an Individual with NO High " + + "School Diploma or Certificate of High School Equivalency: Hours of Participation", type='number', startIndex=102, endIndex=104, @@ -635,7 +636,8 @@ Field( item="52B", name='ED_NO_HIGH_SCHOOL_DIPL_EA', - friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", + friendly_name="Education Directly Related to Employment for an Individual with NO High " + + "School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", type='number', startIndex=104, endIndex=106, @@ -645,7 +647,8 @@ Field( item="52C", name='ED_NO_HIGH_SCHOOL_DIPL_HOL', - friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Holidays", + friendly_name="Education Directly Related to Employment for an Individual with NO High " + + "School Diploma or Certificate of High School Equivalency: Hours of Holidays", type='number', startIndex=106, endIndex=108, @@ -655,7 +658,8 @@ Field( item="53A", name='SCHOOL_ATTENDENCE_HOP', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate of High School Equivalency: Hours of Participation", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma " + + "or Certificate of High School Equivalency: Hours of Participation", type='number', startIndex=108, endIndex=110, @@ -665,7 +669,8 @@ Field( item="53B", name='SCHOOL_ATTENDENCE_EA', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or " + + "Certificate of High School Equivalency: Hours of Excused Absences", type='number', startIndex=110, endIndex=112, @@ -675,7 +680,8 @@ Field( item="53C", name='SCHOOL_ATTENDENCE_HOL', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Holidays", + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma " + + "or Certificate: Hours of Holidays", type='number', startIndex=112, endIndex=114, @@ -685,7 +691,8 @@ Field( item="54A", name='PROVIDE_CC_HOP', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Participation", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a " + + "Community Service Program: Hours of Participation", type='number', startIndex=114, endIndex=116, @@ -695,7 +702,8 @@ Field( item="54B", name='PROVIDE_CC_EA', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Excused Absences", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a " + + "Community Service Program: Hours of Excused Absences", type='number', startIndex=116, endIndex=118, @@ -705,7 +713,8 @@ Field( item="54C", name='PROVIDE_CC_HOL', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Holidays", + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a " + + "Community Service Program: Hours of Holidays", type='number', startIndex=118, endIndex=120, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index af6d56d7c..df45b998a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -13,8 +13,8 @@ preparsing_validators=[ validators.notEmpty(start=19, end=60), validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), ]), validators.notEmpty(8, 19) ], @@ -244,7 +244,8 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or " + + "Aged, Blind, and Disabled Under Title XVI-AABD", type='number', startIndex=45, endIndex=46, @@ -557,7 +558,8 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or " + + "Aged, Blind, and Disabled Under Title XVI-AABD", type='number', startIndex=86, endIndex=87, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py index 613b28193..7fca57786 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py @@ -15,8 +15,8 @@ validators.recordHasLength(66), validators.caseNumberNotEmpty(8, 19), validators.or_priority_validators([ - validators.field_year_month_with_header_year_quarter(), - validators.validateRptMonthYear(), + validators.field_year_month_with_header_year_quarter(), + validators.validateRptMonthYear(), ]), ], postparsing_validators=[], diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 6c24fd251..e53e87b42 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -192,10 +192,10 @@ endIndex=29, required=True, validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ] ), TransformField( transform_func=tanf_ssn_decryption_func, @@ -319,7 +319,8 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under Title XVI-AABD ", + friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under " + + "Title XVI-AABD ", type="number", startIndex=48, endIndex=49, @@ -745,7 +746,8 @@ Field( item="59A", name="ED_NO_HIGH_SCHOOL_DIPL_HOP", - friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate of High School Equivalency: Hours of Participation", + friendly_name="Education Directly Related to Employment for an Individual with NO High " + + "School Diploma or Certificate of High School Equivalency: Hours of Participation", type="string", startIndex=108, endIndex=110, @@ -757,7 +759,8 @@ Field( item="59B", name="ED_NO_HIGH_SCHOOL_DIPL_EA", - friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate: Hours of Excused Absences", + friendly_name="Education Directly Related to Employment for an Individual with NO High " + + "School Diploma or Certificate: Hours of Excused Absences", type="string", startIndex=110, endIndex=112, @@ -769,7 +772,8 @@ Field( item="59C", name="ED_NO_HIGH_SCHOOL_DIPL_HOL", - friendly_name="Education Directly Related to Employment for an Individual with NO High School Diploma or Certificate: Hours of Holidays", + friendly_name="Education Directly Related to Employment for an Individual with NO High " + + "School Diploma or Certificate: Hours of Holidays", type="string", startIndex=112, endIndex=114, @@ -781,7 +785,8 @@ Field( item="60A", name="SCHOOL_ATTENDENCE_HOP", - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Participation", + friendly_name="Satisfactory School Attendance for Individuals with No High School " + + "Diploma or Certificate: Hours of Participation", type="string", startIndex=114, endIndex=116, @@ -793,7 +798,8 @@ Field( item="60B", name="SCHOOL_ATTENDENCE_EA", - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Ecused Absences", + friendly_name="Satisfactory School Attendance for Individuals with No High School " + + "Diploma or Certificate: Hours of Ecused Absences", type="string", startIndex=116, endIndex=118, @@ -805,7 +811,8 @@ Field( item="60C", name="SCHOOL_ATTENDENCE_HOL", - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or Certificate: Hours of Holidays", + friendly_name="Satisfactory School Attendance for Individuals with No High School " + + "Diploma or Certificate: Hours of Holidays", type="string", startIndex=118, endIndex=120, @@ -817,7 +824,8 @@ Field( item="61A", name="PROVIDE_CC_HOP", - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Participation", + friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + "in a Community Service Program: Hours of Participation", type="string", startIndex=120, endIndex=122, @@ -829,7 +837,8 @@ Field( item="61B", name="PROVIDE_CC_EA", - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Excused Absences", + friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + "in a Community Service Program: Hours of Excused Absences", type="string", startIndex=122, endIndex=124, @@ -841,7 +850,8 @@ Field( item="61C", name="PROVIDE_CC_HOL", - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program: Hours of Holidays", + friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + "in a Community Service Program: Hours of Holidays", type="string", startIndex=124, endIndex=126, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 0875b3911..561ffde95 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -454,10 +454,10 @@ endIndex=69, required=True, validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ] ), TransformField( transform_func=tanf_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index de691c34d..f6fdd9d5a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -159,10 +159,10 @@ endIndex=28, required=True, validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ], + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ], ), TransformField( transform_func=tanf_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index b19c4914a..52def22f2 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -180,10 +180,10 @@ endIndex=29, required=True, validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ] + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ] ), TransformField( transform_func=tanf_ssn_decryption_func, @@ -588,7 +588,8 @@ Field( item="58", name="ED_NO_HIGH_SCHOOL_DIPLOMA", - friendly_name="Education Directly Related to Employment for Individualswith no High School Diploma or Certificate of High SchoolEquivalency", + friendly_name="Education Directly Related to Employment for Individuals with no High " + + "School Diploma or Certificate of High SchoolEquivalency", type="string", startIndex=86, endIndex=88, @@ -600,7 +601,8 @@ Field( item="59", name="SCHOOL_ATTENDENCE", - friendly_name="Satisfactory School Attendance for Individuals with No HighSchool Diploma or Certificate of High School Equivalency", + friendly_name="Satisfactory School Attendance for Individuals with No High School " + + "Diploma or Certificate of High School Equivalency", type="string", startIndex=88, endIndex=90, @@ -612,7 +614,8 @@ Field( item="60", name="PROVIDE_CC", - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a Community Service Program", + friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + "in a Community Service Program", type="string", startIndex=90, endIndex=92, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py index 065918b5c..9d4ce11df 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py @@ -153,10 +153,10 @@ endIndex=28, required=True, validators=[validators.intHasLength(8), - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - validators.dateDayIsValid() - ], + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ], ), TransformField( transform_func=tanf_ssn_decryption_func, From 0fe6d97ad0d2542ac6c795b7d18a0571d15571dd Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 12 Apr 2024 11:59:51 -0600 Subject: [PATCH 06/46] - Re-added validators --- .../tdpservice/parsers/schema_defs/ssp/m2.py | 5 ++++- .../tdpservice/parsers/schema_defs/ssp/m3.py | 18 ++++++++++-------- .../tdpservice/parsers/schema_defs/ssp/m5.py | 9 +++++---- 3 files changed, 19 insertions(+), 13 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index 82702565a..9659c5f8a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -188,7 +188,10 @@ startIndex=21, endIndex=29, required=True, - validators=[validators.isLargerThan(0)] + validators=[validators.intHasLength(8), + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid()] ), TransformField( transform_func=ssp_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index df45b998a..a67b904c7 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -144,10 +144,11 @@ startIndex=20, endIndex=28, required=True, - validators=[ - validators.dateYearIsLargerThan(1998), - validators.dateMonthIsValid(), - ] + validators=[validators.intHasLength(8), + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ] ), TransformField( transform_func=ssp_ssn_decryption_func, @@ -458,10 +459,11 @@ startIndex=61, endIndex=69, required=True, - validators=[ - validators.dateYearIsLargerThan(1998), - validators.dateMonthIsValid(), - ] + validators=[validators.intHasLength(8), + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ] ), TransformField( transform_func=ssp_ssn_decryption_func, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py index c7ee96882..aa6fd467f 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py @@ -157,10 +157,11 @@ startIndex=20, endIndex=28, required=True, - validators=[ - validators.dateYearIsLargerThan(1900), - validators.dateMonthIsValid(), - ], + validators=[validators.intHasLength(8), + validators.dateYearIsLargerThan(1900), + validators.dateMonthIsValid(), + validators.dateDayIsValid() + ], ), TransformField( transform_func=ssp_ssn_decryption_func, From 8cd6068f463260e3567f59717ed13965645a1cfa Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Thu, 18 Apr 2024 07:54:03 -0600 Subject: [PATCH 07/46] - remvoe trailing colon --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index dd0292c1e..17107db03 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -151,7 +151,7 @@ Field( item="14", name="FAMILY_AFFILIATION", - friendly_name="Family Affiliation:", + friendly_name="Family Affiliation", type="string", startIndex=36, endIndex=71, From 6e983aad390532812c134d22b6dbc6ed295d2bc8 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Wed, 24 Apr 2024 12:41:42 -0700 Subject: [PATCH 08/46] Updates to the friendly names added code no longer in use where indicated and text edits --- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py | 4 ++-- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py | 2 +- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py | 2 +- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py | 4 ++-- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 8 ++++---- .../tdpservice/parsers/schema_defs/tribal_tanf/t4.py | 4 ++-- .../tdpservice/parsers/schema_defs/tribal_tanf/t5.py | 4 ++-- 7 files changed, 14 insertions(+), 14 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index f7569a9b1..43a981f99 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -246,7 +246,7 @@ Field( item="15", name='RECEIVES_SUB_CC', - friendly_name="Receives Subsidized Child Care:", + friendly_name="Receives Subsidized Child Care: Code no longer in use", type='number', startIndex=41, endIndex=42, @@ -516,7 +516,7 @@ Field( item="25", name='WAIVER_EVAL_CONTROL_GRPS', - friendly_name="Waiver Evaluation Experimental and Control Groups", + friendly_name="Waiver Evaluation Experimental and Control Groups: Code no longer in use", type='number', startIndex=112, endIndex=113, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index 9659c5f8a..a5a29dec3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -787,7 +787,7 @@ Field( item="59C", name='UNEARNED_SSI', - friendly_name="Amount of Unearned Income: Social Security: SSI Benefit", + friendly_name="Amount of Unearned Income: SSI Benefit", type='number', startIndex=138, endIndex=142, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py index aa6fd467f..c546abdf3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py @@ -388,7 +388,7 @@ Field( item="27", name="AMOUNT_UNEARNED_INCOME", - friendly_name="Amount of Earned Income", + friendly_name="Amount of Unearned Income", type="string", startIndex=62, endIndex=66, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 444bdbbc3..be641cb8c 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -127,7 +127,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -651,7 +651,7 @@ Field( item="29", name="FAMILY_NEW_CHILD", - friendly_name="TANF Family a New Child-Only Family", + friendly_name="TANF Family a New Child-Only Family: Code no longer in use", type="number", startIndex=116, endIndex=117, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index e53e87b42..94da2d34d 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -319,7 +319,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under " + + friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under: Code no longer in use" + "Title XVI-AABD ", type="number", startIndex=48, @@ -441,7 +441,7 @@ Field( item="45", name="MONTHS_STATE_TIME_LIMIT", - friendly_name="Number of Countable Months Remaining Under State's Time Limit", + friendly_name="Number of Countable Months Remaining Under State’s Time Limit: Code no longer in use", type="string", startIndex=62, endIndex=64, @@ -863,7 +863,7 @@ Field( item="62", name="OTHER_WORK_ACTIVITIES", - friendly_name="Hours of Other Work Activities ", + friendly_name="Hours of Other Work Activities", type="string", startIndex=126, endIndex=128, @@ -911,7 +911,7 @@ Field( item="66A", name="UNEARNED_INCOME_TAX_CREDIT", - friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC)", + friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC): Code no longer in use", type="string", startIndex=136, endIndex=140, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index 17107db03..eecfd3ce6 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -77,7 +77,7 @@ Field( item="7", name="ZIP_CODE", - friendly_name="Zip Code", + friendly_name="ZIP Code", type="string", startIndex=24, endIndex=29, @@ -121,7 +121,7 @@ Field( item="11", name="REC_MED_ASSIST", - friendly_name="Received Medical Assistance:", + friendly_name="Received Medical Assistance", type="number", startIndex=33, endIndex=34, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py index 9d4ce11df..c90db77e5 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py @@ -243,7 +243,7 @@ Field( item="19A", name="REC_OASDI_INSURANCE", - friendly_name="Receives Disability Benefits: OASDI Program", + friendly_name="Received Disability Benefits: OASDI Program", type="number", startIndex=44, endIndex=45, @@ -253,7 +253,7 @@ Field( item="19B", name="REC_FEDERAL_DISABILITY", - friendly_name="Received Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Federal Disability Status", type="number", startIndex=45, endIndex=46, From 025c4e79b98cfe9eab121838c556929a9f2b12be Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Wed, 24 Apr 2024 18:23:03 -0700 Subject: [PATCH 09/46] Update t2.py address linting errors to make less than 120 characters --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 94da2d34d..0dbb1cd00 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -319,8 +319,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under: Code no longer in use" + - "Title XVI-AABD ", + friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under: Code no longer in use", type="number", startIndex=48, endIndex=49, @@ -441,7 +440,7 @@ Field( item="45", name="MONTHS_STATE_TIME_LIMIT", - friendly_name="Number of Countable Months Remaining Under State’s Time Limit: Code no longer in use", + friendly_name="Months Remaining Under State's Time Limit: Code no longer in use", type="string", startIndex=62, endIndex=64, From 300ffb66484fc9d6be6a62e0ac83e7b7b6ada611 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Thu, 25 Apr 2024 08:32:47 -0700 Subject: [PATCH 10/46] t2.py linting fixes addressing character count --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 0dbb1cd00..5ae06e9ed 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -319,7 +319,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="Receives Disability Benefits: Aid to the Aged, Blind, and Disabled Under: Code no longer in use", + friendly_name="Receives Disability Benefits: Code no longer in use", type="number", startIndex=48, endIndex=49, From 7c6e05581265cec97397ea7b96af529d21759f61 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 26 Apr 2024 10:19:29 -0600 Subject: [PATCH 11/46] making a dummy change --- tdrs-backend/tdpservice/dummy.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 tdrs-backend/tdpservice/dummy.txt diff --git a/tdrs-backend/tdpservice/dummy.txt b/tdrs-backend/tdpservice/dummy.txt new file mode 100644 index 000000000..121361e5c --- /dev/null +++ b/tdrs-backend/tdpservice/dummy.txt @@ -0,0 +1 @@ +this is a dummy change \ No newline at end of file From 992d503c1f2b6eef9b58d4ab9f82cd7e0978471d Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 26 Apr 2024 10:29:38 -0600 Subject: [PATCH 12/46] Revert "making a dummy change" This reverts commit 7c6e05581265cec97397ea7b96af529d21759f61. --- tdrs-backend/tdpservice/dummy.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 tdrs-backend/tdpservice/dummy.txt diff --git a/tdrs-backend/tdpservice/dummy.txt b/tdrs-backend/tdpservice/dummy.txt deleted file mode 100644 index 121361e5c..000000000 --- a/tdrs-backend/tdpservice/dummy.txt +++ /dev/null @@ -1 +0,0 @@ -this is a dummy change \ No newline at end of file From 7713c20241a75e66f6482fb99bf45f52dbde3bd4 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Thu, 16 May 2024 23:15:45 -0700 Subject: [PATCH 13/46] Friendly Name Updates Shortened friendly names, removed "code not in use", removed "race/ethnicity", shortened benefits being received --- .../tdpservice/parsers/schema_defs/ssp/m1.py | 14 +++---- .../tdpservice/parsers/schema_defs/ssp/m2.py | 38 +++++++++--------- .../tdpservice/parsers/schema_defs/ssp/m3.py | 31 +++++++------- .../tdpservice/parsers/schema_defs/ssp/m4.py | 4 +- .../tdpservice/parsers/schema_defs/ssp/m5.py | 20 +++++----- .../tdpservice/parsers/schema_defs/ssp/m7.py | 4 +- .../tdpservice/parsers/schema_defs/tanf/t1.py | 18 ++++----- .../tdpservice/parsers/schema_defs/tanf/t2.py | 40 +++++++++---------- .../tdpservice/parsers/schema_defs/tanf/t3.py | 20 +++++----- .../tdpservice/parsers/schema_defs/tanf/t4.py | 4 +- .../tdpservice/parsers/schema_defs/tanf/t5.py | 20 +++++----- .../tdpservice/parsers/schema_defs/tanf/t7.py | 4 +- .../parsers/schema_defs/tribal_tanf/t1.py | 6 +-- .../parsers/schema_defs/tribal_tanf/t2.py | 35 ++++++++-------- .../parsers/schema_defs/tribal_tanf/t3.py | 30 +++++++------- .../parsers/schema_defs/tribal_tanf/t4.py | 2 +- .../parsers/schema_defs/tribal_tanf/t5.py | 22 +++++----- .../parsers/schema_defs/tribal_tanf/t7.py | 4 +- 18 files changed, 156 insertions(+), 160 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index 43a981f99..dc79a60d3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -136,7 +136,7 @@ Field( item="2", name='COUNTY_FIPS_CODE', - friendly_name="County FIPS Code", + friendly_name="County FIPS code", type='string', startIndex=19, endIndex=22, @@ -226,7 +226,7 @@ Field( item="13", name='RECEIVES_FOOD_STAMPS', - friendly_name="Receives Assistance from the Supplemental Nutrition Assistance Program (SNAP)", + friendly_name="Receives Assistance from SNAP", type='number', startIndex=36, endIndex=37, @@ -236,7 +236,7 @@ Field( item="14", name='AMT_FOOD_STAMP_ASSISTANCE', - friendly_name="Amount of Supplemental Nutrition Assistance Program (SNAP) Benefits", + friendly_name="Amount of SNAP Benefits", type='number', startIndex=37, endIndex=41, @@ -246,7 +246,7 @@ Field( item="15", name='RECEIVES_SUB_CC', - friendly_name="Receives Subsidized Child Care: Code no longer in use", + friendly_name="Receives Subsidized Child Care", type='number', startIndex=41, endIndex=42, @@ -416,7 +416,7 @@ Field( item="24AIII", name='FAMILY_SANC_ADULT', - friendly_name="Sanctions: Code no longer in use", + friendly_name="Family Sanctions", type='number', startIndex=96, endIndex=97, @@ -506,7 +506,7 @@ Field( item="24CIV", name='OTHER_NON_SANCTION', - friendly_name="Other: Non-Sanction, Non-Recoupment ", + friendly_name="Other: Non-Sanction, Non-Recoupment", type='number', startIndex=111, endIndex=112, @@ -516,7 +516,7 @@ Field( item="25", name='WAIVER_EVAL_CONTROL_GRPS', - friendly_name="Waiver Evaluation Experimental and Control Groups: Code no longer in use", + friendly_name="Waiver Evaluation Experimental and Control Groups", type='number', startIndex=112, endIndex=113, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index a5a29dec3..b212be5f3 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -209,7 +209,7 @@ item="30A", name='RACE_HISPANIC', type='number', - friendly_name="Race/Ethnicity: Hispanic or Latino", + friendly_name="Hispanic or Latino", startIndex=38, endIndex=39, required=False, @@ -218,7 +218,7 @@ Field( item="30B", name='RACE_AMER_INDIAN', - friendly_name="Race/Ethnicity: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type='number', startIndex=39, endIndex=40, @@ -228,7 +228,7 @@ Field( item="30C", name='RACE_ASIAN', - friendly_name="Race/Ethnicity: Asian", + friendly_name="Asian", type='number', startIndex=40, endIndex=41, @@ -238,7 +238,7 @@ Field( item="30D", name='RACE_BLACK', - friendly_name="Race/Ethnicity: Black or African American", + friendly_name="Black or African American", type='number', startIndex=41, endIndex=42, @@ -248,7 +248,7 @@ Field( item="30E", name='RACE_HAWAIIAN', - friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Other Pacific Islander", type='number', startIndex=42, endIndex=43, @@ -258,7 +258,7 @@ Field( item="30F", name='RACE_WHITE', - friendly_name="Race/Ethnicity: White", + friendly_name="White", type='number', startIndex=43, endIndex=44, @@ -288,7 +288,7 @@ Field( item="32B", name='FED_DISABILITY_STATUS', - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type='number', startIndex=46, endIndex=47, @@ -298,7 +298,7 @@ Field( item="32C", name='DISABLED_TITLE_XIVAPDT', - friendly_name="Receives Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", + friendly_name="Receives Disability Benefits: Permanently and Totally Disabled", type='number', startIndex=47, endIndex=48, @@ -308,7 +308,7 @@ Field( item="32D", name='AID_AGED_BLIND', - friendly_name="Receives Disability Benefits: Code no longer in use.", + friendly_name="Receives Disability Benefit: AABD", type='number', startIndex=48, endIndex=49, @@ -318,7 +318,7 @@ Field( item="32E", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI ", + friendly_name="Receives Disability Benefits: SSI ", type='number', startIndex=49, endIndex=50, @@ -498,7 +498,7 @@ Field( item="47", name='OJT', - friendly_name="On-the-job Training ", + friendly_name="On-the-job Training", type='number', startIndex=76, endIndex=78, @@ -628,7 +628,7 @@ Field( item="52A", name='ED_NO_HIGH_SCHOOL_DIPL_HOP', - friendly_name="Education Directly Related to Employment for an Individual with NO High " + + friendly_name="Education Directly Related to Employment for an Individual with NO High" + "School Diploma or Certificate of High School Equivalency: Hours of Participation", type='number', startIndex=102, @@ -639,7 +639,7 @@ Field( item="52B", name='ED_NO_HIGH_SCHOOL_DIPL_EA', - friendly_name="Education Directly Related to Employment for an Individual with NO High " + + friendly_name="Education Directly Related to Employment for an Individual with NO High" + "School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", type='number', startIndex=104, @@ -650,7 +650,7 @@ Field( item="52C", name='ED_NO_HIGH_SCHOOL_DIPL_HOL', - friendly_name="Education Directly Related to Employment for an Individual with NO High " + + friendly_name="Education Directly Related to Employment for an Individual with NO High" + "School Diploma or Certificate of High School Equivalency: Hours of Holidays", type='number', startIndex=106, @@ -661,7 +661,7 @@ Field( item="53A", name='SCHOOL_ATTENDENCE_HOP', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma " + + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma" + "or Certificate of High School Equivalency: Hours of Participation", type='number', startIndex=108, @@ -672,7 +672,7 @@ Field( item="53B", name='SCHOOL_ATTENDENCE_EA', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or " + + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or" + "Certificate of High School Equivalency: Hours of Excused Absences", type='number', startIndex=110, @@ -683,7 +683,7 @@ Field( item="53C", name='SCHOOL_ATTENDENCE_HOL', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma " + + friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma" + "or Certificate: Hours of Holidays", type='number', startIndex=112, @@ -694,7 +694,7 @@ Field( item="54A", name='PROVIDE_CC_HOP', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a " + + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a" + "Community Service Program: Hours of Participation", type='number', startIndex=114, @@ -716,7 +716,7 @@ Field( item="54C", name='PROVIDE_CC_HOL', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a " + + friendly_name="Providing Child Care Services to an Individual Who Is Participating in a" + "Community Service Program: Hours of Holidays", type='number', startIndex=118, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index a67b904c7..7c7f2ac5d 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -165,7 +165,7 @@ Field( item="63A", name='RACE_HISPANIC', - friendly_name="Race/Ethnicity: Hispanic or Latino", + friendly_name="Hispanic or Latino", type='number', startIndex=37, endIndex=38, @@ -175,7 +175,7 @@ Field( item="63B", name='RACE_AMER_INDIAN', - friendly_name="Race/Ethnicity: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type='number', startIndex=38, endIndex=39, @@ -185,7 +185,7 @@ Field( item="63C", name='RACE_ASIAN', - friendly_name="Race/Ethnicity: Asian", + friendly_name="Asian", type='number', startIndex=39, endIndex=40, @@ -195,7 +195,7 @@ Field( item="63D", name='RACE_BLACK', - friendly_name="Race/Ethnicity: Black or African American", + friendly_name="Black or African American", type='number', startIndex=40, endIndex=41, @@ -205,7 +205,7 @@ Field( item="63E", name='RACE_HAWAIIAN', - friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type='number', startIndex=41, endIndex=42, @@ -215,7 +215,7 @@ Field( item="63F", name='RACE_WHITE', - friendly_name="Race/Ethnicity: White", + friendly_name="White", type='number', startIndex=42, endIndex=43, @@ -245,7 +245,7 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or " + + friendly_name="Receives Disability Benefits: SSI Under Title XVI-SSI or " + "Aged, Blind, and Disabled Under Title XVI-AABD", type='number', startIndex=45, @@ -480,7 +480,7 @@ Field( item="63A", name='RACE_HISPANIC', - friendly_name="Race/Ethnicity: Hispanic or Latino", + friendly_name="Hispanic or Latino", type='number', startIndex=78, endIndex=79, @@ -490,7 +490,7 @@ Field( item="63B", name='RACE_AMER_INDIAN', - friendly_name="Race/Ethnicity: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type='number', startIndex=79, endIndex=80, @@ -500,7 +500,7 @@ Field( item="63C", name='RACE_ASIAN', - friendly_name="Race/Ethnicity: Asian", + friendly_name="Asian", type='number', startIndex=80, endIndex=81, @@ -510,7 +510,7 @@ Field( item="63D", name='RACE_BLACK', - friendly_name="Race/Ethnicity: Black or African American", + friendly_name="Black or African American", type='number', startIndex=81, endIndex=82, @@ -520,7 +520,7 @@ Field( item="63E", name='RACE_HAWAIIAN', - friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type='number', startIndex=82, endIndex=83, @@ -530,7 +530,7 @@ Field( item="63F", name='RACE_WHITE', - friendly_name="Race/Ethnicity: White", + friendly_name="White", type='number', startIndex=83, endIndex=84, @@ -550,7 +550,7 @@ Field( item="65A", name='RECEIVE_NONSSI_BENEFITS', - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type='number', startIndex=85, endIndex=86, @@ -560,8 +560,7 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI or " + - "Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Receives Disability Benefits: SSI or AABD", type='number', startIndex=86, endIndex=87, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py index 7fca57786..c5a140aa6 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py @@ -57,7 +57,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="County FIPS Code", + friendly_name="County FIPS code", type="string", startIndex=19, endIndex=22, @@ -132,7 +132,7 @@ Field( item="11", name="REC_FOOD_STAMPS", - friendly_name="Received Assistance from the Supplemental Nutrition Assistance Program (SNAP)", + friendly_name="Received Assistance from SNAP", type="number", startIndex=34, endIndex=35, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py index c546abdf3..a09ac1eea 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m5.py @@ -178,7 +178,7 @@ Field( item="16A", name="RACE_HISPANIC", - friendly_name="Race/Ethnicity: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -188,7 +188,7 @@ Field( item="16B", name="RACE_AMER_INDIAN", - friendly_name="Race/Ethnicity: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type="number", startIndex=38, endIndex=39, @@ -198,7 +198,7 @@ Field( item="16C", name="RACE_ASIAN", - friendly_name="Race/Ethnicity: Asian", + friendly_name="Asian", type="number", startIndex=39, endIndex=40, @@ -208,7 +208,7 @@ Field( item="16D", name="RACE_BLACK", - friendly_name="Race/Ethnicity: Black or African American", + friendly_name="Black or African American", type="number", startIndex=40, endIndex=41, @@ -218,7 +218,7 @@ Field( item="16E", name="RACE_HAWAIIAN", - friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -228,7 +228,7 @@ Field( item="16F", name="RACE_WHITE", - friendly_name="Race/Ethnicity: White", + friendly_name="White", type="number", startIndex=42, endIndex=43, @@ -258,7 +258,7 @@ Field( item="18B", name="REC_FEDERAL_DISABILITY", - friendly_name="Received Disability Benefits: Federal Disability Status", + friendly_name="Received Disability Benefits: Other Federal Disability Status", type="number", startIndex=45, endIndex=46, @@ -268,7 +268,7 @@ Field( item="18C", name="REC_AID_TOTALLY_DISABLED", - friendly_name="Received Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", + friendly_name="Received Disability Benefits: Permanently and Totally Disabled", type="number", startIndex=46, endIndex=47, @@ -278,7 +278,7 @@ Field( item="18D", name="REC_AID_AGED_BLIND", - friendly_name="Received Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Received Disability Benefits: AABD", type="number", startIndex=47, endIndex=48, @@ -288,7 +288,7 @@ Field( item="18E", name="REC_SSI", - friendly_name="Received Disability Benefits: Supplemental Security Income Under Title XVI-SSI", + friendly_name="Received Disability Benefits: SSI", type="number", startIndex=48, endIndex=49, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py index 869c113dc..f67dacce1 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m7.py @@ -70,7 +70,7 @@ Field( item="3", name="TDRS_SECTION_IND", - friendly_name="TDRS Section Indicator", + friendly_name="SDR Section Indicator", type="string", startIndex=section_ind_index, endIndex=section_ind_index + 1, @@ -90,7 +90,7 @@ Field( item=families_item_numbers[i - 1], name="FAMILIES_MONTH", - friendly_name="Families Month", + friendly_name="Number of Families", type="number", startIndex=families_index, endIndex=families_index + 7, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index be641cb8c..2a2cc5c1a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -280,7 +280,7 @@ Field( item="15", name="RECEIVES_FOOD_STAMPS", - friendly_name="Receives Assistance from the Supplemental Nutrition Assistance Program (SNAP)", + friendly_name="Receives Assistance from the SNAP", type="number", startIndex=37, endIndex=38, @@ -292,7 +292,7 @@ Field( item="16", name="AMT_FOOD_STAMP_ASSISTANCE", - friendly_name="Amount of Supplemental Nutrition Assistance Program (SNAP) Benefits", + friendly_name="Amount of SNAP Benefits", type="number", startIndex=38, endIndex=42, @@ -352,7 +352,7 @@ Field( item="21A", name="CASH_AMOUNT", - friendly_name="Cash and Cash Equivalents: Amount", + friendly_name="Cash Amount", type="number", startIndex=55, endIndex=59, @@ -376,7 +376,7 @@ Field( item="22A", name="CC_AMOUNT", - friendly_name="TANF Child Care: Amount", + friendly_name="Child Care Amount", type="number", startIndex=62, endIndex=66, @@ -484,7 +484,7 @@ Field( item="26AI", name="SANC_REDUCTION_AMT", - friendly_name="Total Dollar Amount of Reductions due to Sanctions", + friendly_name="Total Dollar Amount of Reductions Due to Sanctions", type="number", startIndex=92, endIndex=96, @@ -508,7 +508,7 @@ Field( item="26AIII", name="FAMILY_SANC_ADULT", - friendly_name="Sanctions: Code no longer in use", + friendly_name="Family Sanction", type="number", startIndex=97, endIndex=98, @@ -616,7 +616,7 @@ Field( item="26CIV", name="OTHER_NON_SANCTION", - friendly_name="Other: Non-Sanction, Non-Recoupment", + friendly_name="Non-Sanction", type="number", startIndex=112, endIndex=113, @@ -628,7 +628,7 @@ Field( item="27", name="WAIVER_EVAL_CONTROL_GRPS", - friendly_name="Waiver Evaluation Experimental and Control Groups", + friendly_name="Waiver Evaluation", type="string", startIndex=113, endIndex=114, @@ -651,7 +651,7 @@ Field( item="29", name="FAMILY_NEW_CHILD", - friendly_name="TANF Family a New Child-Only Family: Code no longer in use", + friendly_name="TANF Family a New Child-Only Family", type="number", startIndex=116, endIndex=117, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 5ae06e9ed..62b19a15c 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -133,7 +133,7 @@ Field( item="0", name="RecordType", - friendly_name="record type", + friendly_name="Record Type", type="string", startIndex=0, endIndex=2, @@ -212,7 +212,7 @@ Field( item="34A", name="RACE_HISPANIC", - friendly_name="Race/Ethnicity: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=38, endIndex=39, @@ -222,7 +222,7 @@ Field( item="34B", name="RACE_AMER_INDIAN", - friendly_name="Race/Ethnicity: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type="number", startIndex=39, endIndex=40, @@ -232,7 +232,7 @@ Field( item="34C", name="RACE_ASIAN", - friendly_name="Race/Ethnicity: Asian", + friendly_name="Asian", type="number", startIndex=40, endIndex=41, @@ -242,7 +242,7 @@ Field( item="34D", name="RACE_BLACK", - friendly_name="Race/Ethnicity: Black or African American", + friendly_name="Black or African American", type="number", startIndex=41, endIndex=42, @@ -252,7 +252,7 @@ Field( item="34E", name="RACE_HAWAIIAN", - friendly_name="Race/Ethnicity: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=42, endIndex=43, @@ -262,7 +262,7 @@ Field( item="34F", name="RACE_WHITE", - friendly_name="Race/Ethnicity: White", + friendly_name="White", type="number", startIndex=43, endIndex=44, @@ -284,7 +284,7 @@ Field( item="36A", name="FED_OASDI_PROGRAM", - friendly_name="Receives Disability Benefits: OASDI Program", + friendly_name="Receives Disability Benefits: SSDI", type="number", startIndex=45, endIndex=46, @@ -294,7 +294,7 @@ Field( item="36B", name="FED_DISABILITY_STATUS", - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type="number", startIndex=46, endIndex=47, @@ -304,7 +304,7 @@ Field( item="36C", name="DISABLED_TITLE_XIVAPDT", - friendly_name="Receives Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", + friendly_name="Receives Disability Benefits: Permanently and Totally Disabled", type="string", startIndex=47, endIndex=48, @@ -319,7 +319,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="Receives Disability Benefits: Code no longer in use", + friendly_name="Receives Disability Benefits: AABD", type="number", startIndex=48, endIndex=49, @@ -331,7 +331,7 @@ Field( item="36E", name="RECEIVE_SSI", - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI", + friendly_name="Receives Disability Benefits: SSI", type="number", startIndex=49, endIndex=50, @@ -440,7 +440,7 @@ Field( item="45", name="MONTHS_STATE_TIME_LIMIT", - friendly_name="Months Remaining Under State's Time Limit: Code no longer in use", + friendly_name="Months Remaining Under State's Time Limit", type="string", startIndex=62, endIndex=64, @@ -541,7 +541,7 @@ Field( item="52", name="SUB_PUBLIC_EMPLOYMENT", - friendly_name="Subsidized Public-Sector Employment ", + friendly_name="Subsidized Public-Sector Employment", type="string", startIndex=74, endIndex=76, @@ -797,7 +797,7 @@ Field( item="60B", name="SCHOOL_ATTENDENCE_EA", - friendly_name="Satisfactory School Attendance for Individuals with No High School " + + friendly_name="Satisfactory School Attendance for Individuals with No High School" + "Diploma or Certificate: Hours of Ecused Absences", type="string", startIndex=116, @@ -810,7 +810,7 @@ Field( item="60C", name="SCHOOL_ATTENDENCE_HOL", - friendly_name="Satisfactory School Attendance for Individuals with No High School " + + friendly_name="Satisfactory School Attendance for Individuals with No High School" + "Diploma or Certificate: Hours of Holidays", type="string", startIndex=118, @@ -823,7 +823,7 @@ Field( item="61A", name="PROVIDE_CC_HOP", - friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + friendly_name="Providing Child Care for an Individual Who Is Participating" + "in a Community Service Program: Hours of Participation", type="string", startIndex=120, @@ -836,7 +836,7 @@ Field( item="61B", name="PROVIDE_CC_EA", - friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + friendly_name="Providing Child Care for an Individual Who Is Participating" + "in a Community Service Program: Hours of Excused Absences", type="string", startIndex=122, @@ -849,7 +849,7 @@ Field( item="61C", name="PROVIDE_CC_HOL", - friendly_name="Providing Child Care Services to an Individual Who Is Participating " + + friendly_name="Providing Child Care Services for an Individual Who Is Participating" + "in a Community Service Program: Hours of Holidays", type="string", startIndex=124, @@ -910,7 +910,7 @@ Field( item="66A", name="UNEARNED_INCOME_TAX_CREDIT", - friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC): Code no longer in use", + friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC)", type="string", startIndex=136, endIndex=140, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 561ffde95..f96398783 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -263,7 +263,7 @@ Field( item="74", name="PARENT_MINOR_CHILD", - friendly_name="Parental status of minor who is not a head-of-household or spouse of the head-of-household", + friendly_name="Parental Status of Minor", type="number", startIndex=48, endIndex=49, @@ -474,7 +474,7 @@ Field( item="70A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=78, endIndex=79, @@ -484,7 +484,7 @@ Field( item="70B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type="number", startIndex=79, endIndex=80, @@ -494,7 +494,7 @@ Field( item="70C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=80, endIndex=81, @@ -504,7 +504,7 @@ Field( item="70D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=81, endIndex=82, @@ -514,7 +514,7 @@ Field( item="70E", name="RACE_HAWAIIAN", - friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=82, endIndex=83, @@ -524,7 +524,7 @@ Field( item="70F", name="RACE_WHITE", - friendly_name="Ethnicity/Race: White", + friendly_name="White", type="number", startIndex=83, endIndex=84, @@ -544,7 +544,7 @@ Field( item="72A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type="number", startIndex=85, endIndex=86, @@ -554,7 +554,7 @@ Field( item="72B", name="RECEIVE_SSI", - friendly_name="Receives Disability Benefits: SSI Under Title XVI-SSI or AABD Under Title XVI-AABD", + friendly_name="Receives Disability Benefits: SSI or AABD", type="number", startIndex=86, endIndex=87, @@ -574,7 +574,7 @@ Field( item="74", name="PARENT_MINOR_CHILD", - friendly_name="Parental status of minor who is not a head-of-household or spouse of the head-of-household", + friendly_name="Parental Status of Minor", type="number", startIndex=89, endIndex=90, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py index bc1941d41..e2e3953d8 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py @@ -58,7 +58,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="County FIPS Code", + friendly_name="County FIPS code", type="string", startIndex=19, endIndex=22, @@ -133,7 +133,7 @@ Field( item="12", name="REC_FOOD_STAMPS", - friendly_name="Received Assistance from the Supplemental Nutrition Assistance Program (SNAP)", + friendly_name="Received Assistance from SNAP", type="number", startIndex=34, endIndex=35, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index f6fdd9d5a..2f98c6220 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -179,7 +179,7 @@ Field( item="17A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hisapic or Latino", + friendly_name="Hisapic or Latino", type="number", startIndex=37, endIndex=38, @@ -189,7 +189,7 @@ Field( item="17B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Native ", + friendly_name="American Indian or Alaska Native ", type="number", startIndex=38, endIndex=39, @@ -199,7 +199,7 @@ Field( item="17C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=39, endIndex=40, @@ -209,7 +209,7 @@ Field( item="17D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=40, endIndex=41, @@ -219,7 +219,7 @@ Field( item="17E", name="RACE_HAWAIIAN", - friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -229,7 +229,7 @@ Field( item="17F", name="RACE_WHITE", - friendly_name="Ethnicity/Race: White", + friendly_name="White", type="number", startIndex=42, endIndex=43, @@ -259,7 +259,7 @@ Field( item="19B", name="REC_FEDERAL_DISABILITY", - friendly_name="Received Disability Benefits: Federal Disability Status", + friendly_name="Received Disability Benefits: Other Federal Disability Status", type="number", startIndex=45, endIndex=46, @@ -269,7 +269,7 @@ Field( item="19C", name="REC_AID_TOTALLY_DISABLED", - friendly_name="Received Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", + friendly_name="Received Disability Benefits: Permanently and Totally Disabled", type="number", startIndex=46, endIndex=47, @@ -279,7 +279,7 @@ Field( item="19D", name="REC_AID_AGED_BLIND", - friendly_name="Received Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Received Disability Benefits: AABD", type="number", startIndex=47, endIndex=48, @@ -289,7 +289,7 @@ Field( item="19E", name="REC_SSI", - friendly_name="Received Disability Benefits: Supplemental Security Income Under Title XVI-SSI", + friendly_name="Received Disability Benefits: SSI", type="number", startIndex=48, endIndex=49, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py index 2a55e291b..61a6b5cf6 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t7.py @@ -70,7 +70,7 @@ Field( item="4", name="TDRS_SECTION_IND", - friendly_name="TDRS Section Indicator", + friendly_name="TDR Section Indicator", type="string", startIndex=section_ind_index, endIndex=section_ind_index + 1, @@ -90,7 +90,7 @@ Field( item=families_value_item_number, name="FAMILIES_MONTH", - friendly_name="Families Month", + friendly_name="Number of Families", type="number", startIndex=families_index, endIndex=families_index + 7, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py index c5f819430..6bffd5553 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t1.py @@ -352,7 +352,7 @@ Field( item="21A", name="CASH_AMOUNT", - friendly_name="Cash and Cash Equivalents", + friendly_name="Cash Amount", type="number", startIndex=55, endIndex=59, @@ -508,7 +508,7 @@ Field( item="26AIII", name="FAMILY_SANC_ADULT", - friendly_name="Family Sanction for an Adult with No High School Diploma orEquivalent:", + friendly_name="Family Sanction for an Adult with No High School Diploma or Equivalent:", type="number", startIndex=97, endIndex=98, @@ -638,7 +638,7 @@ Field( item="28", name="FAMILY_EXEMPT_TIME_LIMITS", - friendly_name="Exempt during the reporting month from theTribal Time-Limit Provisions", + friendly_name="Exempt during reporting month from the Tribal Time-Limit Provisions", type="number", startIndex=114, endIndex=116, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index 52def22f2..830c0b59c 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -200,7 +200,7 @@ Field( item="34A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=38, endIndex=39, @@ -210,7 +210,7 @@ Field( item="34B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type="number", startIndex=39, endIndex=40, @@ -220,7 +220,7 @@ Field( item="34C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=40, endIndex=41, @@ -230,7 +230,7 @@ Field( item="34D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=41, endIndex=42, @@ -240,7 +240,7 @@ Field( item="34E", name="RACE_HAWAIIAN", - friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=42, endIndex=43, @@ -250,7 +250,7 @@ Field( item="34F", name="RACE_WHITE", - friendly_name="Ethnicity/Race: White", + friendly_name="White", type="number", startIndex=43, endIndex=44, @@ -282,7 +282,7 @@ Field( item="36B", name="FED_DISABILITY_STATUS", - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type="number", startIndex=46, endIndex=47, @@ -292,7 +292,7 @@ Field( item="36C", name="DISABLED_TITLE_XIVAPDT", - friendly_name="Receives Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", + friendly_name="Receives Disability Benefits: Permanently and Totally Disabled", type="string", startIndex=47, endIndex=48, @@ -306,7 +306,7 @@ Field( item="36D", name="AID_AGED_BLIND", - friendly_name="Receives Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Receives Disability Benefits: AABD", type="number", startIndex=48, endIndex=49, @@ -318,7 +318,7 @@ Field( item="36E", name="RECEIVE_SSI", - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI", + friendly_name="Receives Disability Benefits: SSI", type="number", startIndex=49, endIndex=50, @@ -439,7 +439,7 @@ Field( item="46", name="CURRENT_MONTH_STATE_EXEMPT", - friendly_name="Is Current Month Exempt from the State's (Tribe's) Time Limit", + friendly_name="Current Month Exempt from the (Tribe's) Time Limit", type="number", startIndex=64, endIndex=65, @@ -588,8 +588,7 @@ Field( item="58", name="ED_NO_HIGH_SCHOOL_DIPLOMA", - friendly_name="Education Directly Related to Employment for Individuals with no High " + - "School Diploma or Certificate of High SchoolEquivalency", + friendly_name="Education Directly Related to Employment", type="string", startIndex=86, endIndex=88, @@ -601,8 +600,7 @@ Field( item="59", name="SCHOOL_ATTENDENCE", - friendly_name="Satisfactory School Attendance for Individuals with No High School " + - "Diploma or Certificate of High School Equivalency", + friendly_name="Satisfactory School Attendance", type="string", startIndex=88, endIndex=90, @@ -614,8 +612,7 @@ Field( item="60", name="PROVIDE_CC", - friendly_name="Providing Child Care Services to an Individual Who Is Participating " + - "in a Community Service Program", + friendly_name="Providing Child Care", type="string", startIndex=90, endIndex=92, @@ -675,7 +672,7 @@ Field( item="65A", name="UNEARNED_INCOME_TAX_CREDIT", - friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC)", + friendly_name="Amount of Unearned Income", type="string", startIndex=102, endIndex=106, @@ -687,7 +684,7 @@ Field( item="65B", name="UNEARNED_SOCIAL_SECURITY", - friendly_name="Amount of Unearned Income: Social Security", + friendly_name="Amount of Unearned Income: SSI", type="string", startIndex=106, endIndex=110, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py index cfb839b0f..eacccf5b0 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t3.py @@ -163,7 +163,7 @@ Field( item="69A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -173,7 +173,7 @@ Field( item="69B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type="number", startIndex=38, endIndex=39, @@ -183,7 +183,7 @@ Field( item="69C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=39, endIndex=40, @@ -193,7 +193,7 @@ Field( item="69D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=40, endIndex=41, @@ -203,7 +203,7 @@ Field( item="69E", name="RACE_HAWAIIAN", - friendly_name="Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -233,7 +233,7 @@ Field( item="71A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="Receives Benefits Based on Federal Disability Status under Non-Social Security Act Programs", + friendly_name="Received Disability Benefits: Other Federal Disability Status", type="number", startIndex=44, endIndex=45, @@ -243,7 +243,7 @@ Field( item="71B", name="RECEIVE_SSI", - friendly_name="Receives Supplemental Security Income under Title XVI-SSI of the Social Security Act", + friendly_name="Receives Supplemental Security Income: SSI", type="number", startIndex=45, endIndex=46, @@ -474,7 +474,7 @@ Field( item="69A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=78, endIndex=79, @@ -484,7 +484,7 @@ Field( item="69B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Natve", + friendly_name="American Indian or Alaska Natve", type="number", startIndex=79, endIndex=80, @@ -494,7 +494,7 @@ Field( item="69C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=80, endIndex=81, @@ -504,7 +504,7 @@ Field( item="69D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=81, endIndex=82, @@ -514,7 +514,7 @@ Field( item="69E", name="RACE_HAWAIIAN", - friendly_name="Ethnicity/Race: Native Hawaiian or Other Pacific Islander", + friendly_name="Native Hawaiian or Other Pacific Islander", type="number", startIndex=82, endIndex=83, @@ -524,7 +524,7 @@ Field( item="69F", name="RACE_WHITE", - friendly_name="Ethnicity/Race: White", + friendly_name="White", type="number", startIndex=83, endIndex=84, @@ -544,7 +544,7 @@ Field( item="71A", name="RECEIVE_NONSSA_BENEFITS", - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type="number", startIndex=85, endIndex=86, @@ -554,7 +554,7 @@ Field( item="71B", name="RECEIVE_SSI", - friendly_name="Receives Disability Benefits: Supplemental Security Income Under Title XVI-SSI", + friendly_name="Receives Disability Benefits: SSI", type="number", startIndex=86, endIndex=87, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index eecfd3ce6..ca6d9a9c8 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -57,7 +57,7 @@ Field( item="2", name="COUNTY_FIPS_CODE", - friendly_name="County FIPS Code", + friendly_name="County FIPS code", type="string", startIndex=19, endIndex=22, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py index c90db77e5..dd2f887d5 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t5.py @@ -173,7 +173,7 @@ Field( item="17A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -183,7 +183,7 @@ Field( item="17B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Native", + friendly_name="American Indian or Alaska Native", type="number", startIndex=38, endIndex=39, @@ -193,7 +193,7 @@ Field( item="17C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=39, endIndex=40, @@ -203,7 +203,7 @@ Field( item="17D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=40, endIndex=41, @@ -213,7 +213,7 @@ Field( item="17E", name="RACE_HAWAIIAN", - friendly_name="Ethnicity/Race: Hawaiian or Other Pacific Islander", + friendly_name="Hawaiian or Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -223,7 +223,7 @@ Field( item="17F", name="RACE_WHITE", - friendly_name="Ethnicity/Race: White", + friendly_name="White", type="number", startIndex=42, endIndex=43, @@ -253,7 +253,7 @@ Field( item="19B", name="REC_FEDERAL_DISABILITY", - friendly_name="Receives Disability Benefits: Federal Disability Status", + friendly_name="Receives Disability Benefits: Other Federal Disability Status", type="number", startIndex=45, endIndex=46, @@ -263,7 +263,7 @@ Field( item="19C", name="REC_AID_TOTALLY_DISABLED", - friendly_name="Received Disability Benefits: Permanently and Totally Disabled Under Title XIV-APDT", + friendly_name="Received Disability Benefits: Permanently and Totally Disabled", type="number", startIndex=46, endIndex=47, @@ -273,7 +273,7 @@ Field( item="19D", name="REC_AID_AGED_BLIND", - friendly_name="Received Disability Benefits: Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Received Disability Benefits: AABD", type="number", startIndex=47, endIndex=48, @@ -283,7 +283,7 @@ Field( item="19E", name="REC_SSI", - friendly_name="Received Disability Benefits: Supplemental Security Income Under Title XVI-SSI", + friendly_name="Received Disability Benefits: SSI", type="number", startIndex=48, endIndex=49, @@ -362,7 +362,7 @@ Field( item="26", name="COUNTABLE_MONTH_FED_TIME", - friendly_name="Number of Months Countable toward Tribal Time Limit:", + friendly_name="Number of Months Countable Toward Tribal Time Limit", type="string", startIndex=57, endIndex=60, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py index 6e06f9f0b..dbadc1c5a 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t7.py @@ -70,7 +70,7 @@ Field( item="4", name="TDRS_SECTION_IND", - friendly_name="TDRS Section Indicator", + friendly_name="Section Indicator", type="string", startIndex=section_ind_index, endIndex=section_ind_index + 1, @@ -90,7 +90,7 @@ Field( item=families_value_item_number, name="FAMILIES_MONTH", - friendly_name="Families Month", + friendly_name="Number of Families", type="number", startIndex=families_index, endIndex=families_index + 7, From 8c3a4a197d5c35785a71918f2d45e6d31e1f966d Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Fri, 17 May 2024 12:35:25 -0700 Subject: [PATCH 14/46] rewrote 54 job search --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index 830c0b59c..5360a944b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -540,7 +540,7 @@ Field( item="54", name="JOB_SEARCH", - friendly_name="Job Search and Job Readiness Assistance", + friendly_name="Job Search and Job Readiness", type="string", startIndex=78, endIndex=80, @@ -576,7 +576,7 @@ Field( item="57", name="JOB_SKILLS_TRAINING", - friendly_name="Job Skills Training Directly Related to Employment", + friendly_name="Job Skills Training", type="string", startIndex=84, endIndex=86, From d44eb3e529ba2fff3a2e343a4c9e92777fbf9138 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Fri, 17 May 2024 12:40:02 -0700 Subject: [PATCH 15/46] finished resolving conflicts --- .../tdpservice/parsers/schema_defs/tribal_tanf/t4.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index d8521d35f..ef45c6ee0 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -149,15 +149,9 @@ validators=[validators.isInLimits(1, 3)], ), Field( -<<<<<<< HEAD - item="14", - name="FAMILY_AFFILIATION", - friendly_name="Family Affiliation", -======= item="-1", name="BLANK", friendly_name="blank", ->>>>>>> 9bcf9b93bc83220f701ab924a2bdf0b6f5066393 type="string", startIndex=36, endIndex=71, From f19bb83ec65a7f942169aaeee7d7a2bd51d8a641 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Fri, 17 May 2024 13:07:00 -0700 Subject: [PATCH 16/46] updated test_api.py finding lint issues --- tdrs-backend/tdpservice/data_files/test/test_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/data_files/test/test_api.py b/tdrs-backend/tdpservice/data_files/test/test_api.py index 6eb0b7a55..2e0783555 100644 --- a/tdrs-backend/tdpservice/data_files/test/test_api.py +++ b/tdrs-backend/tdpservice/data_files/test/test_api.py @@ -100,8 +100,8 @@ def assert_error_report_tanf_file_content_matches_with_friendly_names(response): assert ws.cell(row=1, column=1).value == "Error reporting in TDP is still in development.We'll" \ + " be in touch when it's ready to use!For now please refer to the reports you receive via email" - assert ws.cell(row=4, column=COL_ERROR_MESSAGE).value == "if Cash and Cash Equivalents: Amount :873 " + \ - "validator1 passed then Cash and Cash Equivalents: Number of Months T1: 0 is not larger than 0." + assert ws.cell(row=5, column=COL_ERROR_MESSAGE).value == "Every T1 record should have at least one " + \ + "corresponding T2 or T3 record with the same RPT_MONTH_YEAR and CASE_NUMBER." @staticmethod def assert_error_report_ssp_file_content_matches_with_friendly_names(response): From 484b655a2e532d943ebfeebf543952bbe7458a70 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Mon, 20 May 2024 12:40:07 -0700 Subject: [PATCH 17/46] corrected message --- tdrs-backend/tdpservice/data_files/test/test_api.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/data_files/test/test_api.py b/tdrs-backend/tdpservice/data_files/test/test_api.py index 2e0783555..57fda6182 100644 --- a/tdrs-backend/tdpservice/data_files/test/test_api.py +++ b/tdrs-backend/tdpservice/data_files/test/test_api.py @@ -100,8 +100,8 @@ def assert_error_report_tanf_file_content_matches_with_friendly_names(response): assert ws.cell(row=1, column=1).value == "Error reporting in TDP is still in development.We'll" \ + " be in touch when it's ready to use!For now please refer to the reports you receive via email" - assert ws.cell(row=5, column=COL_ERROR_MESSAGE).value == "Every T1 record should have at least one " + \ - "corresponding T2 or T3 record with the same RPT_MONTH_YEAR and CASE_NUMBER." + assert ws.cell(row=5, column=COL_ERROR_MESSAGE).value == "if Cash Amount :873 validator1 passed then " + \ + "Cash and Cash Equivalents: Number of Months T1: 0 is not larger than 0." @staticmethod def assert_error_report_ssp_file_content_matches_with_friendly_names(response): From 2ca2b17a5da9e1362da53407de2f47284bf09dea Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Mon, 20 May 2024 12:40:39 -0700 Subject: [PATCH 18/46] updated friendly names --- .../tdpservice/parsers/schema_defs/ssp/m1.py | 2 +- .../tdpservice/parsers/schema_defs/ssp/m2.py | 42 ++++++++-------- .../tdpservice/parsers/schema_defs/ssp/m4.py | 2 +- .../tdpservice/parsers/schema_defs/tanf/t1.py | 2 +- .../tdpservice/parsers/schema_defs/tanf/t2.py | 50 +++++++++---------- .../tdpservice/parsers/schema_defs/tanf/t4.py | 2 +- .../parsers/schema_defs/tribal_tanf/t4.py | 2 +- 7 files changed, 51 insertions(+), 51 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py index dc79a60d3..feecada7b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m1.py @@ -226,7 +226,7 @@ Field( item="13", name='RECEIVES_FOOD_STAMPS', - friendly_name="Receives Assistance from SNAP", + friendly_name="Receives SNAP Assistance", type='number', startIndex=36, endIndex=37, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py index b212be5f3..d3ca888bc 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m2.py @@ -508,7 +508,7 @@ Field( item="48A", name='JOB_SEARCH_HOP', - friendly_name="Job Search and Job Readiness Assistance: Hours of Participation", + friendly_name="Job Search and Job Readiness: Hours of Participation", type='number', startIndex=78, endIndex=80, @@ -518,7 +518,7 @@ Field( item="48B", name='JOB_SEARCH_EA', - friendly_name="Job Search and Job Readiness Assistance: Hours of Excused Absences", + friendly_name="Job Search and Job Readiness: Hours of Excused Absences", type='number', startIndex=80, endIndex=82, @@ -528,7 +528,7 @@ Field( item="48C", name='JOB_SEARCH_HOL', - friendly_name="Job Search and Job Readiness Assistance: Hours of Holidays", + friendly_name="Job Search and Job Readiness: Hours of Holidays", type='number', startIndex=82, endIndex=84, @@ -628,8 +628,8 @@ Field( item="52A", name='ED_NO_HIGH_SCHOOL_DIPL_HOP', - friendly_name="Education Directly Related to Employment for an Individual with NO High" + - "School Diploma or Certificate of High School Equivalency: Hours of Participation", + friendly_name="Education Directly Related to Employment: " + + "Hours of Participation", type='number', startIndex=102, endIndex=104, @@ -639,8 +639,8 @@ Field( item="52B", name='ED_NO_HIGH_SCHOOL_DIPL_EA', - friendly_name="Education Directly Related to Employment for an Individual with NO High" + - "School Diploma or Certificate of High School Equivalency: Hours of Excused Absences", + friendly_name="Education Directly Related to Employment: " + + "Hours of Excused Absences", type='number', startIndex=104, endIndex=106, @@ -650,8 +650,8 @@ Field( item="52C", name='ED_NO_HIGH_SCHOOL_DIPL_HOL', - friendly_name="Education Directly Related to Employment for an Individual with NO High" + - "School Diploma or Certificate of High School Equivalency: Hours of Holidays", + friendly_name="Education Directly Related to Employment: " + + "Hours of Holidays", type='number', startIndex=106, endIndex=108, @@ -661,8 +661,8 @@ Field( item="53A", name='SCHOOL_ATTENDENCE_HOP', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma" + - "or Certificate of High School Equivalency: Hours of Participation", + friendly_name="Satisfactory School Attendance: " + + "Hours of Participation", type='number', startIndex=108, endIndex=110, @@ -672,8 +672,8 @@ Field( item="53B", name='SCHOOL_ATTENDENCE_EA', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma or" + - "Certificate of High School Equivalency: Hours of Excused Absences", + friendly_name="Satisfactory School Attendance: " + + "Hours of Excused Absences", type='number', startIndex=110, endIndex=112, @@ -683,8 +683,8 @@ Field( item="53C", name='SCHOOL_ATTENDENCE_HOL', - friendly_name="Satisfactory School Attendance for Individuals with No High School Diploma" + - "or Certificate: Hours of Holidays", + friendly_name="Satisfactory School Attendance: " + + "Hours of Holidays", type='number', startIndex=112, endIndex=114, @@ -694,8 +694,8 @@ Field( item="54A", name='PROVIDE_CC_HOP', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a" + - "Community Service Program: Hours of Participation", + friendly_name="Providing Child Care Services: " + + "Hours of Participation", type='number', startIndex=114, endIndex=116, @@ -705,8 +705,8 @@ Field( item="54B", name='PROVIDE_CC_EA', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a " + - "Community Service Program: Hours of Excused Absences", + friendly_name="Providing Child Care Services: " + + "Hours of Excused Absences", type='number', startIndex=116, endIndex=118, @@ -716,8 +716,8 @@ Field( item="54C", name='PROVIDE_CC_HOL', - friendly_name="Providing Child Care Services to an Individual Who Is Participating in a" + - "Community Service Program: Hours of Holidays", + friendly_name="Providing Child Care Services: " + + "Hours of Holidays", type='number', startIndex=118, endIndex=120, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py index c5a140aa6..91fb4c65b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m4.py @@ -132,7 +132,7 @@ Field( item="11", name="REC_FOOD_STAMPS", - friendly_name="Received Assistance from SNAP", + friendly_name="Received SNAP Assistance", type="number", startIndex=34, endIndex=35, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 2a2cc5c1a..48848fa14 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -280,7 +280,7 @@ Field( item="15", name="RECEIVES_FOOD_STAMPS", - friendly_name="Receives Assistance from the SNAP", + friendly_name="Receives SNAP Assistance", type="number", startIndex=37, endIndex=38, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 62b19a15c..5b2e59ec9 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -601,7 +601,7 @@ Field( item="55A", name="JOB_SEARCH_HOP", - friendly_name="Job Search and Job Readiness Assistance: Hours of Participation", + friendly_name="Job Search and Job Readiness: Hours of Participation", type="string", startIndex=84, endIndex=86, @@ -613,7 +613,7 @@ Field( item="55B", name="JOB_SEARCH_EA", - friendly_name="Job Search and Job Readiness Assistance: Hours of Excused Absences", + friendly_name="Job Search and Job Readiness: Hours of Excused Absences", type="string", startIndex=86, endIndex=88, @@ -625,7 +625,7 @@ Field( item="55C", name="JOB_SEARCH_HOL", - friendly_name="Job Search and Job Readiness Assistance: Hours of Holidays", + friendly_name="Job Search and Job Readiness: Hours of Holidays", type="string", startIndex=88, endIndex=90, @@ -709,7 +709,7 @@ Field( item="58A", name="JOB_SKILLS_TRAINING_HOP", - friendly_name="Job Skills Training Directly Related to Employment: Hours of Participation", + friendly_name="Job Skills Training: Hours of Participation", type="string", startIndex=102, endIndex=104, @@ -721,7 +721,7 @@ Field( item="58B", name="JOB_SKILLS_TRAINING_EA", - friendly_name="Job Skills Training Directly Related to Employment: Hours of Excused Absences", + friendly_name="Job Skills Training: Hours of Excused Absences", type="string", startIndex=104, endIndex=106, @@ -733,7 +733,7 @@ Field( item="58C", name="JOB_SKILLS_TRAINING_HOL", - friendly_name="Job Skills Training Directly Related to Employment: Hours of Holidays", + friendly_name="Job Skills Training: Hours of Holidays", type="string", startIndex=106, endIndex=108, @@ -745,8 +745,8 @@ Field( item="59A", name="ED_NO_HIGH_SCHOOL_DIPL_HOP", - friendly_name="Education Directly Related to Employment for an Individual with NO High " + - "School Diploma or Certificate of High School Equivalency: Hours of Participation", + friendly_name="Education Directly Related to Employment: " + + "Hours of Participation", type="string", startIndex=108, endIndex=110, @@ -758,8 +758,8 @@ Field( item="59B", name="ED_NO_HIGH_SCHOOL_DIPL_EA", - friendly_name="Education Directly Related to Employment for an Individual with NO High " + - "School Diploma or Certificate: Hours of Excused Absences", + friendly_name="Education Directly Related to Employment: " + + "Hours of Excused Absences", type="string", startIndex=110, endIndex=112, @@ -771,8 +771,8 @@ Field( item="59C", name="ED_NO_HIGH_SCHOOL_DIPL_HOL", - friendly_name="Education Directly Related to Employment for an Individual with NO High " + - "School Diploma or Certificate: Hours of Holidays", + friendly_name="Education Directly Related to Employment: " + + "Hours of Holidays", type="string", startIndex=112, endIndex=114, @@ -784,8 +784,8 @@ Field( item="60A", name="SCHOOL_ATTENDENCE_HOP", - friendly_name="Satisfactory School Attendance for Individuals with No High School " + - "Diploma or Certificate: Hours of Participation", + friendly_name="Satisfactory School Attendance: " + + "Hours of Participation", type="string", startIndex=114, endIndex=116, @@ -797,8 +797,8 @@ Field( item="60B", name="SCHOOL_ATTENDENCE_EA", - friendly_name="Satisfactory School Attendance for Individuals with No High School" + - "Diploma or Certificate: Hours of Ecused Absences", + friendly_name="Satisfactory School Attendance: " + + "Hours of Ecused Absences", type="string", startIndex=116, endIndex=118, @@ -810,8 +810,8 @@ Field( item="60C", name="SCHOOL_ATTENDENCE_HOL", - friendly_name="Satisfactory School Attendance for Individuals with No High School" + - "Diploma or Certificate: Hours of Holidays", + friendly_name="Satisfactory School Attendance: " + + "Hours of Holidays", type="string", startIndex=118, endIndex=120, @@ -823,8 +823,8 @@ Field( item="61A", name="PROVIDE_CC_HOP", - friendly_name="Providing Child Care for an Individual Who Is Participating" + - "in a Community Service Program: Hours of Participation", + friendly_name="Providing Child Care: " + + "Hours of Participation", type="string", startIndex=120, endIndex=122, @@ -836,8 +836,8 @@ Field( item="61B", name="PROVIDE_CC_EA", - friendly_name="Providing Child Care for an Individual Who Is Participating" + - "in a Community Service Program: Hours of Excused Absences", + friendly_name="Providing Child Care: " + + "Hours of Excused Absences", type="string", startIndex=122, endIndex=124, @@ -849,8 +849,8 @@ Field( item="61C", name="PROVIDE_CC_HOL", - friendly_name="Providing Child Care Services for an Individual Who Is Participating" + - "in a Community Service Program: Hours of Holidays", + friendly_name="Providing Child Care Services: " + + "Hours of Holidays", type="string", startIndex=124, endIndex=126, @@ -910,7 +910,7 @@ Field( item="66A", name="UNEARNED_INCOME_TAX_CREDIT", - friendly_name="Amount of Unearned Income: Earned Income Tax Credit (EITC)", + friendly_name="Amount of Unearned Income: EITC", type="string", startIndex=136, endIndex=140, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py index 337ec4b2f..3fa6718d4 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t4.py @@ -133,7 +133,7 @@ Field( item="12", name="REC_FOOD_STAMPS", - friendly_name="Received Assistance from SNAP", + friendly_name="Received SNAP Assistance", type="number", startIndex=34, endIndex=35, diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py index ef45c6ee0..0a9144737 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t4.py @@ -131,7 +131,7 @@ Field( item="12", name="REC_FOOD_STAMPS", - friendly_name="Received Food Stamps", + friendly_name="Received SNAP Assistance", type="number", startIndex=34, endIndex=35, From f3f8fbca575ef3bf89bd5b7db8a563adab0b8e61 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 21 May 2024 15:27:39 -0400 Subject: [PATCH 19/46] - getting test case back its expected state --- tdrs-backend/tdpservice/parsers/test/data/bad_trailer_2.txt | 2 +- tdrs-backend/tdpservice/parsers/test/test_parse.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/data/bad_trailer_2.txt b/tdrs-backend/tdpservice/parsers/test/data/bad_trailer_2.txt index 9060606ce..0ed792a8a 100644 --- a/tdrs-backend/tdpservice/parsers/test/data/bad_trailer_2.txt +++ b/tdrs-backend/tdpservice/parsers/test/data/bad_trailer_2.txt @@ -1,3 +1,3 @@ HEADER20204A06 TAN1 D -T12020101111111111223003403361110213120000300000000000008730010000000000000000000000000000000000222222000000002229012 +T12020101111111111223003403361110213320000300000000000008730010000000000000000000000000000000000222222000000002229012 T1trash \ No newline at end of file diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index b36e975db..a8ae171b2 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -428,7 +428,6 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): assert row_3_error.error_message in { 'T1 record length of 7 characters is not in the range [117, 156].', 'T1: Reporting month year None does not match file reporting year:2021, quarter:Q1.', - 'T1trash does not start with TRAILER.', 'TRAILER record length is 7 characters but must be 23.', 'T1: Case number T1trash cannot contain blanks.', 'Your file does not end with a TRAILER record.'} From 637bb0e3dd8658b19655ab0490d66aa7bc726fe2 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Mon, 1 Jul 2024 07:33:42 -0400 Subject: [PATCH 20/46] - Updated tests to use new friendly names --- tdrs-backend/tdpservice/parsers/test/conftest.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/conftest.py b/tdrs-backend/tdpservice/parsers/test/conftest.py index 3dedf650e..9fab9e8d2 100644 --- a/tdrs-backend/tdpservice/parsers/test/conftest.py +++ b/tdrs-backend/tdpservice/parsers/test/conftest.py @@ -711,21 +711,21 @@ def tanf_s4_partial_dup_file(): def partial_dup_t1_err_msg(): """Fixture for t1 record partial duplicate error.""" return ("Partial duplicate record detected with record type {record_type} at line 3. Record is a partial " - "duplicate of the record at line number 2. Duplicated fields causing error: record type, " - "reporting month and year, and case number.") + "duplicate of the record at line number 2. Duplicated fields causing error: Record Type, " + "Reporting Year and Month, and Case Number.") @pytest.fixture def partial_dup_t5_err_msg(): """Fixture for t5 record partial duplicate error.""" return ("Partial duplicate record detected with record type {record_type} at line 3. Record is a partial " - "duplicate of the record at line number 2. Duplicated fields causing error: record type, " - "reporting month and year, case number, family affiliation, date of birth, and social security number.") + "duplicate of the record at line number 2. Duplicated fields causing error: Record Type, " + "Reporting Year and Month, Case Number, Family Affiliation, Date of Birth, and Social Security Number.") @pytest.fixture def partial_dup_s3_s4_err_msg(): """Fixture for t7 record partial duplicate error.""" return ("Partial duplicate record detected with record type {record_type} at line 3. Record is a partial " - "duplicate of the record at line number 2. Duplicated fields causing error: record type.") + "duplicate of the record at line number 2. Duplicated fields causing error: Record Type.") @pytest.fixture def cat4_edge_case_file(stt_user, stt): From 1fd0aa37ae954342704caa74189455ad2e27df1f Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:00:03 -0400 Subject: [PATCH 21/46] Update tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py index d1c8522ea..4690e269c 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py @@ -275,7 +275,7 @@ Field( item="7B", name='NUM_RECIPIENTS', - friendly_name='SSP-MOERecipients', + friendly_name='SSP-MOE Recipients', type='number', startIndex=111, endIndex=119, From 4e530df1938b9c6c3fc14c8971e92d5221c5720b Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:00:19 -0400 Subject: [PATCH 22/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index e72ad08ea..2d0551aa5 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -801,7 +801,7 @@ item="60B", name="SCHOOL_ATTENDENCE_EA", friendly_name="Satisfactory School Attendance: " + - "Hours of Ecused Absences", + "Hours of Excused Absences", type="string", startIndex=116, endIndex=118, From 49a311b93d700943a4f1413ccca84592b965f04f Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 2 Jul 2024 12:01:28 -0400 Subject: [PATCH 23/46] - remove 19 --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index e72ad08ea..0211649cd 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -511,7 +511,6 @@ "16", "17", "18", - "19", "99", ] ) From ca400427fed50d41390980275a9fc51d224c8588 Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:01:49 -0400 Subject: [PATCH 24/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py index 20edec16f..37fa131f4 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py @@ -107,7 +107,7 @@ Field( item="7A", name="ASSISTANCE", - friendly_name="Total Number of Cash Assistance", + friendly_name="Total Amount of Cash Assistance", type="number", startIndex=79, endIndex=91, From ce38703ea40ce2d370626d1d59bf96804dbdef2c Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:02:11 -0400 Subject: [PATCH 25/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py index 37fa131f4..e772f2819 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py @@ -517,7 +517,7 @@ Field( item="5C", name="NUM_APPROVED", - friendly_name="Total Number of Applications", + friendly_name="Total Number of Approved Applications", type="number", startIndex=47, endIndex=55, From 6238578e9bf1783dcb51c07b0ebe21b1a5c68e45 Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:02:21 -0400 Subject: [PATCH 26/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py index e772f2819..4b355c4ed 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t6.py @@ -537,7 +537,7 @@ Field( item="7C", name="ASSISTANCE", - friendly_name="Total Number of Cash Assistance", + friendly_name="Total Amount of Cash Assistance", type="number", startIndex=103, endIndex=115, From 5a1a0201984b09c5180cd875280ed3399f40352e Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:02:35 -0400 Subject: [PATCH 27/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py index d00040a19..3a8610dc0 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py @@ -125,7 +125,7 @@ Field( item="10A", name="NUM_1_PARENTS", - friendly_name="Total Number of No-Parent Families", + friendly_name="Total Number of One-Parent Families", type="number", startIndex=163, endIndex=171, From ac537a87be216ae7a22ceb42a25efa4b9abd541a Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:02:49 -0400 Subject: [PATCH 28/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py index 3a8610dc0..30bb14d28 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py @@ -135,7 +135,7 @@ Field( item="11A", name="NUM_NO_PARENTS", - friendly_name="Total Number of No Parent Families", + friendly_name="Total Number of No-Parent Families", type="number", startIndex=187, endIndex=195, From 3c478478248dce57c9a0270eed78b233144ae9fc Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:03:05 -0400 Subject: [PATCH 29/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py index 30bb14d28..4d1ad7739 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py @@ -268,7 +268,7 @@ Field( item="4B", name="NUM_APPLICATIONS", - friendly_name="Total Number of Applicants", + friendly_name="Total Number of Applications", type="number", startIndex=15, endIndex=23, From d85d13735a1cd3782fe55e0acf8c58005deb7f23 Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:03:17 -0400 Subject: [PATCH 30/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py index 4d1ad7739..a85ca325e 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t6.py @@ -541,7 +541,7 @@ Field( item="11C", name="NUM_NO_PARENTS", - friendly_name="Total Number of No parent Families", + friendly_name="Total Number of No-parent Families", type="number", startIndex=203, endIndex=211, From d53d4f6ef21b06ec76e542b239f73660fc49782c Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:03:58 -0400 Subject: [PATCH 31/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 313898ede..d7846fc1b 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -121,7 +121,6 @@ "CASH_AMOUNT", "CC_AMOUNT", "TRANSP_AMOUNT", - "TRANSITION_SERVICES_AMOUNT", "OTHER_AMOUNT", ), 0, From a5eb48dff207c2c0c857f4d5de5b33ad263fa0de Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:04:25 -0400 Subject: [PATCH 32/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index d7846fc1b..1bf5a8c62 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -121,7 +121,6 @@ "CASH_AMOUNT", "CC_AMOUNT", "TRANSP_AMOUNT", - "OTHER_AMOUNT", ), 0, ), From ba065060bd1325a718e54d967236031a260debeb Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 2 Jul 2024 12:05:00 -0400 Subject: [PATCH 33/46] - revert debug comment --- tdrs-backend/tdpservice/settings/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/settings/common.py b/tdrs-backend/tdpservice/settings/common.py index 4631f4cc4..ad7c4379d 100644 --- a/tdrs-backend/tdpservice/settings/common.py +++ b/tdrs-backend/tdpservice/settings/common.py @@ -194,7 +194,7 @@ class Common(Configuration): # Logging # set level as 'INFO' if env var is not set - LOGGING_LEVEL = 'WARNING'#os.getenv('LOGGING_LEVEL', 'INFO') + LOGGING_LEVEL = os.getenv('LOGGING_LEVEL', 'INFO') LOGGING = { "version": 1, "disable_existing_loggers": False, From 080a2da7daffeabbd2045ac67b3e79559612196b Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:05:10 -0400 Subject: [PATCH 34/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 1bf5a8c62..84a5fd2da 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -203,7 +203,7 @@ endIndex=30, required=True, validators=[ - validators.isInLimits(1, 3), + validators.isInLimits(1, 2), ], ), Field( From 0f49dea9f9b6c96a2d7d8d78e8411ad955d70c65 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 2 Jul 2024 12:06:11 -0400 Subject: [PATCH 35/46] - revert validator changes --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py index 313898ede..64ed26c28 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t1.py @@ -217,7 +217,7 @@ endIndex=31, required=True, validators=[ - validators.oneOf([1, 2]), + validators.matches(1), ], ), Field( @@ -265,7 +265,7 @@ endIndex=36, required=True, validators=[ - validators.isInLimits(1, 3), + validators.isInLimits(1, 2), ], ), Field( From 111628e51ff2ccc5fcd7ae70872eb3de9e4c9dc3 Mon Sep 17 00:00:00 2001 From: Eric Lipe <125676261+elipe17@users.noreply.github.com> Date: Tue, 2 Jul 2024 12:06:23 -0400 Subject: [PATCH 36/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py index 175f9e85c..a067b58ce 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tribal_tanf/t2.py @@ -689,7 +689,7 @@ Field( item="65B", name="UNEARNED_SOCIAL_SECURITY", - friendly_name="Amount of Unearned Income: SSI", + friendly_name="Amount of Unearned Income: Social Security", type="string", startIndex=106, endIndex=110, From ea27763bbb5bc9b1d36996ea6a8ec68994d174ba Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 2 Jul 2024 12:51:18 -0400 Subject: [PATCH 37/46] - Fixing unresolved merge conflict --- tdrs-backend/tdpservice/parsers/test/test_parse.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index d8a37092c..a2054cb78 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -138,9 +138,9 @@ def test_parse_big_file(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 From a93705bb6414a3a93121a275b1bcac2a85258e68 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 2 Jul 2024 13:10:49 -0400 Subject: [PATCH 38/46] - resolved merge conflicts causing failure --- .../tdpservice/parsers/test/test_parse.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index a2054cb78..652638c35 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -313,7 +313,7 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): errors = parse.parse_datafile(bad_trailer_file_2, dfs) parser_errors = ParserError.objects.filter(file=bad_trailer_file_2) - assert parser_errors.count() == 8 + assert parser_errors.count() == 9 trailer_errors = list(parser_errors.filter(row_number=3).order_by('id')) @@ -329,7 +329,8 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): assert trailer_error_2.content_type is None assert trailer_error_2.object_id is None - row_2_error = parser_errors.get(row_number=2) + row_2_errors = parser_errors.filter(row_number=2).order_by('id') + row_2_error = row_2_errors.first() assert row_2_error.error_type == ParserErrorCategoryChoices.FIELD_VALUE assert row_2_error.error_message == 'T1: 3 is not larger or equal to 1 and smaller or equal to 2.' @@ -352,8 +353,9 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): errors_2_0 = errors["2_0"] errors_3_0 = errors["3_0"] error_trailer = errors["trailer"] + row_2_error_set = set(row_2_errors) for error_2_0 in errors_2_0: - assert error_2_0 in [row_2_error] + assert error_2_0 in row_2_error_set for error_3_0 in errors_3_0: assert error_3_0 in row_3_error_list assert error_trailer == [trailer_error_1, trailer_error_2] @@ -366,14 +368,6 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): assert length_error.content_type is None assert length_error.object_id is None - errors_2_0 = errors["2_0"] - errors_3_0 = errors["3_0"] - error_trailer = errors["trailer"] - for error_2_0 in errors_2_0: - assert error_2_0 in [row_2_error] - for error_3_0 in errors_3_0: - assert error_3_0 in row_3_error_list - assert error_trailer == [trailer_error_1, trailer_error_2] trailer_error_3 = trailer_errors[3] assert trailer_error_3.error_type == ParserErrorCategoryChoices.PRE_CHECK assert trailer_error_3.error_message == 'T1: Case number T1trash cannot contain blanks.' From 1b706e6c7114a2f572b2cc3bcfd27d85477074ec Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 2 Jul 2024 13:12:26 -0400 Subject: [PATCH 39/46] - resolve merge conflict causing failure --- tdrs-backend/tdpservice/parsers/test/test_parse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index 652638c35..230738c8f 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -506,11 +506,11 @@ 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 == {'months': [ - {'month': 'Oct', 'accepted_without_errors': 5, 'accepted_with_errors': 0}, + {'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} From bf1ad61deeb754e738872599b022296c41596833 Mon Sep 17 00:00:00 2001 From: Victoria Amoroso <106103383+victoriaatraft@users.noreply.github.com> Date: Wed, 3 Jul 2024 12:19:44 -0700 Subject: [PATCH 40/46] Update tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py Co-authored-by: Alex P. <63075587+ADPennington@users.noreply.github.com> --- tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py index f10d865d1..471a067cc 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t5.py @@ -182,7 +182,7 @@ Field( item="17A", name="RACE_HISPANIC", - friendly_name="Hisapic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=37, endIndex=38, From 8cc001d9e9c0195d94f8545a44982565f6a8a3ec Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Fri, 5 Jul 2024 08:52:29 -0700 Subject: [PATCH 41/46] Update t3.py Removed Ethnicity/Race --- .../tdpservice/parsers/schema_defs/tanf/t3.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py index 8dcb220d0..901271a89 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t3.py @@ -169,7 +169,7 @@ Field( item="70A", name="RACE_HISPANIC", - friendly_name="Ethnicity/Race: Hispanic or Latino", + friendly_name="Hispanic or Latino", type="number", startIndex=37, endIndex=38, @@ -179,7 +179,7 @@ Field( item="70B", name="RACE_AMER_INDIAN", - friendly_name="Ethnicity/Race: American Indian or Alaska Native ", + friendly_name="American Indian or Alaska Native ", type="number", startIndex=38, endIndex=39, @@ -189,7 +189,7 @@ Field( item="70C", name="RACE_ASIAN", - friendly_name="Ethnicity/Race: Asian", + friendly_name="Asian", type="number", startIndex=39, endIndex=40, @@ -199,7 +199,7 @@ Field( item="70D", name="RACE_BLACK", - friendly_name="Ethnicity/Race: Black or African American", + friendly_name="Black or African American", type="number", startIndex=40, endIndex=41, @@ -209,7 +209,7 @@ Field( item="70E", name="RACE_HAWAIIAN", - friendly_name="Ethnicity/Race: Native Hawaiian or Pacific Islander", + friendly_name="Native Hawaiian or Pacific Islander", type="number", startIndex=41, endIndex=42, @@ -219,7 +219,7 @@ Field( item="70F", name="RACE_WHITE", - friendly_name="Ethnicity/Race: White", + friendly_name="White", type="number", startIndex=42, endIndex=43, From b15077cd09db00fa5ac44dca5154c8a8ce0211c2 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 5 Jul 2024 12:25:54 -0400 Subject: [PATCH 42/46] - resolved merge conflicts --- tdrs-backend/tdpservice/parsers/test/test_parse.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index db4cfa75b..478b0d497 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -333,7 +333,7 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): row_2_error = row_2_errors.first() assert row_2_error.error_type == ParserErrorCategoryChoices.FIELD_VALUE assert row_2_error.error_message == ( - 'T1 Item 13 (receives subsidized housing): 3 is not ' + 'T1 Item 13 (Receives Subsidized Housing): 3 is not ' 'larger or equal to 1 and smaller or equal to 2.' ) @@ -347,7 +347,7 @@ def test_parse_bad_trailer_file2(bad_trailer_file_2, dfs): assert row_3_error.error_message in { 'T1: record length of 7 characters is not in the range [117, 156].', 'T1: Reporting month year None does not match file reporting year:2021, quarter:Q1.', - 'TRAILER record length is 7 characters but must be 23.', + 'TRAILER: record length is 7 characters but must be 23.', 'T1: Case number T1trash cannot contain blanks.', 'Your file does not end with a TRAILER record.'} assert row_3_error.content_type is None From 880f13b5032f0e178ea45c1e9831279654434fcb Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Fri, 5 Jul 2024 14:33:59 -0400 Subject: [PATCH 43/46] - fixed failing tests --- .../tdpservice/parsers/test/test_parse.py | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/test/test_parse.py b/tdrs-backend/tdpservice/parsers/test/test_parse.py index 478b0d497..0c3cf0113 100644 --- a/tdrs-backend/tdpservice/parsers/test/test_parse.py +++ b/tdrs-backend/tdpservice/parsers/test/test_parse.py @@ -482,7 +482,7 @@ def test_parse_ssp_section1_datafile(ssp_section1_datafile, dfs): assert err.row_number == 2 assert err.error_type == ParserErrorCategoryChoices.FIELD_VALUE assert err.error_message == ( - 'M1 Item 11 (receives subsidized housing): 3 is not larger or equal to 1 and smaller or equal to 2.' + 'M1 Item 11 (Receives Subsidized Housing): 3 is not larger or equal to 1 and smaller or equal to 2.' ) assert err.content_type is not None assert err.object_id is not None @@ -882,7 +882,7 @@ def test_parse_tanf_section2_file(tanf_section2_file, dfs): err = parser_errors.first() assert err.error_type == ParserErrorCategoryChoices.FIELD_VALUE assert err.error_message == ( - "T4 Item 10 (receives subsidized housing): 3 " + "T4 Item 10 (Received Subsidized Housing): 3 " "is not larger or equal to 1 and smaller or equal to 2." ) assert err.content_type.model == "tanf_t4" @@ -1377,7 +1377,7 @@ def test_parse_tribal_section_4_file(tribal_section_4_file, dfs): ' and must be at least 101 characters.'), ('t3_file_two_child_with_space_filled', 2, 0, ''), ('two_child_second_filled', 2, 8, - 'T3 Item 68 (date of birth): Year 6 must be larger than 1900.'), + 'T3 Item 68 (Date of Birth): Year 6 must be larger than 1900.'), ('t3_file_zero_filled_second', 1, 0, '')]) @pytest.mark.django_db() def test_misformatted_multi_records(file_fixture, result, number_of_errors, error_message, request, dfs): @@ -1393,7 +1393,6 @@ def test_misformatted_multi_records(file_fixture, result, number_of_errors, erro assert parser_errors.count() == number_of_errors if number_of_errors > 0: error_messages = [parser_error.error_message for parser_error in parser_errors] - print(error_messages) assert error_message in error_messages parser_errors = ParserError.objects.all().exclude( @@ -1417,7 +1416,7 @@ def test_empty_t4_t5_values(t4_t5_empty_values, dfs): logger.info(t4[0].__dict__) assert t5.count() == 1 assert parser_errors[0].error_message == ( - "T4 Item 10 (receives subsidized housing): 3 is " + "T4 Item 10 (Received Subsidized Housing): 3 is " "not larger or equal to 1 and smaller or equal to 2." ) @@ -1438,9 +1437,9 @@ def test_parse_t2_invalid_dob(t2_invalid_dob_file, dfs): year_error = parser_errors[1] digits_error = parser_errors[0] - assert month_error.error_message == "T2 Item 32 (date of birth): $9 is not a valid month." - assert year_error.error_message == "T2 Item 32 (date of birth): Year Q897 must be larger than 1900." - assert digits_error.error_message == "T2 Item 32 (date of birth): Q897$9 3 does not have exactly 8 digits." + assert month_error.error_message == "T2 Item 32 (Date of Birth): $9 is not a valid month." + assert year_error.error_message == "T2 Item 32 (Date of Birth): Year Q897 must be larger than 1900." + assert digits_error.error_message == "T2 Item 32 (Date of Birth): Q897$9 3 does not have exactly 8 digits." @pytest.mark.django_db def test_bulk_create_returns_rollback_response_on_bulk_index_exception(small_correct_file, mocker, dfs): @@ -1619,7 +1618,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 status): 0 is not in [1, 2, 9]." + assert e.error_message == "T3 Item 76 (Citizenship/Immigration Status): 0 is not in [1, 2, 9]." @pytest.mark.django_db() @@ -1639,10 +1638,10 @@ def test_parse_m2_cat2_invalid_37_38_39_file(m2_cat2_invalid_37_38_39_file, dfs) assert parser_errors.count() == 3 - error_msgs = {"M2 Item 37 (education level): 00 is not in range [1, 16]. " - "or M2 Item 37 (education level): 00 is not in range [98, 99].", - "M2 Item 38 (citizenship status): 0 is not in [1, 2, 3, 9].", - "M2 Item 39 (cooperation with child support): 0 is not in [1, 2, 9]."} + error_msgs = {"M2 Item 37 (Educational Level): 00 is not in range [1, 16]. or M2 Item 37 (Educational Level): " + + "00 is not in range [98, 99].", + "M2 Item 38 (Citizenship/Immigration Status): 0 is not in [1, 2, 3, 9].", + "M2 Item 39 (Cooperated with Child Support): 0 is not in [1, 2, 9]."} for e in parser_errors: assert e.error_message in error_msgs @@ -1663,9 +1662,12 @@ def test_parse_m3_cat2_invalid_68_69_file(m3_cat2_invalid_68_69_file, dfs): assert parser_errors.count() == 4 - error_msgs = {"M3 Item 68 (education level): 00 is not in range [1, 16]. " - "or M3 Item 68 (education level): 00 is not in range [98, 99].", - "M3 Item 69 (citizenship status): 0 is not in [1, 2, 3, 9]."} + error_msgs = {"M3 Item 68 (Educational Level): 00 is not in range [1, 16]. or M3 Item 68 (Educational Level): " + + "00 is not in range [98, 99].", + "M3 Item 69 (Citizenship/Immigration Status): 0 is not in [1, 2, 3, 9].", + "M3 Item 68 (Educational Level): 00 is not in range [1, 16]. or M3 Item 68 (Educational Level): " + + "00 is not in range [98, 99].", + "M3 Item 69 (Citizenship/Immigration Status): 0 is not in [1, 2, 3, 9]."} for e in parser_errors: assert e.error_message in error_msgs @@ -1687,8 +1689,8 @@ def test_parse_m5_cat2_invalid_23_24_file(m5_cat2_invalid_23_24_file, dfs): assert parser_errors.count() == 2 - error_msgs = {"M5 Item 23 (education level): 00 matches 00.", - "M5 Item 24 (citizenship status): 0 is not in [1, 2, 3, 9]."} + error_msgs = {"M5 Item 23 (Educational Level): 00 matches 00.", + "M5 Item 24 (Citizenship/Immigration Status): 0 is not in [1, 2, 3, 9]."} for e in parser_errors: assert e.error_message in error_msgs From 63492d188d898c25091dca5255a2eef0e91fa72e Mon Sep 17 00:00:00 2001 From: Victoria Amoroso Date: Tue, 9 Jul 2024 07:25:05 -0700 Subject: [PATCH 44/46] Updated mp3.py Shortened Receives Disability Benefits: SSI or AABD --- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index e7abaa583..72fabf613 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -253,8 +253,7 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: SSI Under Title XVI-SSI or " + - "Aged, Blind, and Disabled Under Title XVI-AABD", + friendly_name="Receives Disability Benefits: SSI or AABD" type='number', startIndex=45, endIndex=46, From 3af861bb66606e530067e8740cd0e413e083a025 Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Tue, 9 Jul 2024 12:20:56 -0400 Subject: [PATCH 45/46] - fixed missed comma error --- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py index 72fabf613..9705145c9 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m3.py @@ -253,7 +253,7 @@ Field( item="65B", name='RECEIVE_SSI', - friendly_name="Receives Disability Benefits: SSI or AABD" + friendly_name="Receives Disability Benefits: SSI or AABD", type='number', startIndex=45, endIndex=46, From de09be43dd25c071a40b7f6764ef0fb9f84c8cbb Mon Sep 17 00:00:00 2001 From: Eric Lipe Date: Thu, 11 Jul 2024 14:33:40 -0400 Subject: [PATCH 46/46] - fixed issues --- tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py | 2 ++ tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py index 4690e269c..43d9ec7f5 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/ssp/m6.py @@ -174,6 +174,7 @@ s2 = RowSchema( record_type="M6", document=SSP_M6DataSubmissionDocument(), + quiet_preparser_errors=True, preparsing_validators=[ validators.recordHasLength(259), validators.field_year_month_with_header_year_quarter(), @@ -338,6 +339,7 @@ s3 = RowSchema( record_type="M6", document=SSP_M6DataSubmissionDocument(), + quiet_preparser_errors=True, preparsing_validators=[ validators.recordHasLength(259), validators.field_year_month_with_header_year_quarter(), diff --git a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py index 35f240594..78d83709e 100644 --- a/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py +++ b/tdrs-backend/tdpservice/parsers/schema_defs/tanf/t2.py @@ -498,7 +498,7 @@ type="string", startIndex=68, endIndex=70, - required=False, + required=True, validators=[ validators.oneOf( [