Skip to content

Commit

Permalink
Merge branch 'feat/1613-case-aggregates' into 1612-case-aggregates-fr…
Browse files Browse the repository at this point in the history 
…ontend
  • Loading branch information
@jtimpe
jtimpe committed Sep 22, 2023
2 parents 30cd7e5 + cd07fea commit 985845b
Show file tree
Hide file tree
Showing 8 changed files with 486 additions and 398 deletions.
11 changes: 1 addition & 10 deletions tdrs-backend/tdpservice/parsers/migrations/0002_alter_parsererror_error_type.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,5 @@ class Migration(migrations.Migration):
model_name='parsererror',
name='error_type',
field=models.TextField(choices=[('1', 'File pre-check'), ('2', 'Record value invalid'), ('3', 'Record value consistency'), ('4', 'Case consistency'), ('5', 'Section consistency'), ('6', 'Historical consistency')], max_length=128),
),
migrations.CreateModel(
name='DataFileSummary',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('status', models.CharField(choices=[('Pending', 'Pending'), ('Accepted', 'Accepted'), ('Accepted with Errors', 'Accepted With Errors'), ('Rejected', 'Rejected')], default='Pending', max_length=50)),
('case_aggregates', models.JSONField(null=True)),
('datafile', models.ForeignKey(on_delete=models.deletion.CASCADE, to='data_files.datafile')),
],
),
)
]
24 changes: 24 additions & 0 deletions tdrs-backend/tdpservice/parsers/migrations/0007_datafilesummary.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# Generated by Django 3.2.15 on 2023-09-20 15:35

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('data_files', '0012_datafile_s3_versioning_id'),
('parsers', '0006_auto_20230810_1500'),
]

operations = [
migrations.CreateModel(
name='DataFileSummary',
fields=[
('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('status', models.CharField(choices=[('Pending', 'Pending'), ('Accepted', 'Accepted'), ('Accepted with Errors', 'Accepted With Errors'), ('Rejected', 'Rejected')], default='Pending', max_length=50)),
('case_aggregates', models.JSONField(null=True)),
('datafile', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='data_files.datafile')),
],
),
]
178 changes: 14 additions & 164 deletions ...xes/migrations/0015_auto_20230810_1500.py → ...xes/migrations/0015_auto_20230724_1830.py
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Generated by Django 3.2.15 on 2023-08-10 15:00
# Generated by Django 3.2.15 on 2023-07-24 18:30

from django.db import migrations, models

Expand Down Expand Up @@ -190,7 +190,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t4',
name='CLOSURE_REASON',
field=models.CharField(max_length=2, null=True),
field=models.IntegerField(null=True),
),
migrations.AddField(
model_name='tanf_t4',
Expand Down Expand Up @@ -235,7 +235,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t4',
name='STRATUM',
field=models.CharField(max_length=2, null=True),
field=models.IntegerField(null=True),
),
migrations.AddField(
model_name='tanf_t4',
Expand All @@ -245,12 +245,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='AMOUNT_EARNED_INCOME',
field=models.CharField(max_length=4, null=True),
field=models.IntegerField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
name='AMOUNT_UNEARNED_INCOME',
field=models.CharField(max_length=4, null=True),
field=models.IntegerField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand All @@ -265,12 +265,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='COUNTABLE_MONTHS_STATE_TRIBE',
field=models.CharField(max_length=2, null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
name='COUNTABLE_MONTH_FED_TIME',
field=models.CharField(max_length=3, null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand All @@ -280,12 +280,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='EDUCATION_LEVEL',
field=models.CharField(max_length=2, null=True),
field=models.IntegerField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
name='EMPLOYMENT_STATUS',
field=models.IntegerField(null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand All @@ -300,7 +300,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='MARITAL_STATUS',
field=models.IntegerField(null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand Down Expand Up @@ -345,12 +345,12 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='REC_AID_AGED_BLIND',
field=models.IntegerField(null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
name='REC_AID_TOTALLY_DISABLED',
field=models.IntegerField(null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand All @@ -360,7 +360,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='REC_OASDI_INSURANCE',
field=models.IntegerField(null=True),
field=models.FloatField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand All @@ -370,7 +370,7 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name='tanf_t5',
name='RELATIONSHIP_HOH',
field=models.CharField(max_length=2, null=True),
field=models.IntegerField(null=True),
),
migrations.AddField(
model_name='tanf_t5',
Expand All @@ -387,154 +387,4 @@ class Migration(migrations.Migration):
name='SSN',
field=models.CharField(max_length=9, null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='AID_AGED_BLIND',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='CITIZENSHIP_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='COOPERATION_CHILD_SUPPORT',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='CURRENT_MONTH_STATE_EXEMPT',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='DISABLED_TITLE_XIVAPDT',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='EMPLOYMENT_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='FED_DISABILITY_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='FED_OASDI_PROGRAM',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='MARITAL_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='NEEDS_PREGNANT_WOMAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='PARENT_WITH_MINOR_CHILD',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RACE_AMER_INDIAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RACE_ASIAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RACE_BLACK',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RACE_HAWAIIAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RACE_HISPANIC',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RACE_WHITE',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RECEIVE_SSI',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t2',
name='RELATIONSHIP_HOH',
field=models.CharField(max_length=2, null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='CITIZENSHIP_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='PARENT_MINOR_CHILD',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RACE_AMER_INDIAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RACE_ASIAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RACE_BLACK',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RACE_HAWAIIAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RACE_HISPANIC',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RACE_WHITE',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RECEIVE_NONSSA_BENEFITS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RECEIVE_SSI',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t3',
name='RELATIONSHIP_HOH',
field=models.CharField(max_length=2, null=True),
),
]
83 changes: 83 additions & 0 deletions tdrs-backend/tdpservice/search_indexes/migrations/0016_auto_20230803_1721.py
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
# Generated by Django 3.2.15 on 2023-08-03 17:21

from django.db import migrations, models


class Migration(migrations.Migration):

dependencies = [
('search_indexes', '0015_auto_20230724_1830'),
]

operations = [
migrations.AlterField(
model_name='tanf_t4',
name='CLOSURE_REASON',
field=models.CharField(max_length=2, null=True),
),
migrations.AlterField(
model_name='tanf_t4',
name='COUNTY_FIPS_CODE',
field=models.CharField(max_length=3, null=True),
),
migrations.AlterField(
model_name='tanf_t4',
name='STRATUM',
field=models.CharField(max_length=2, null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='CITIZENSHIP_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='EMPLOYMENT_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='MARITAL_STATUS',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='NEEDS_OF_PREGNANT_WOMAN',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='PARENT_MINOR_CHILD',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='REC_AID_AGED_BLIND',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='REC_AID_TOTALLY_DISABLED',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='REC_FEDERAL_DISABILITY',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='REC_OASDI_INSURANCE',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='REC_SSI',
field=models.IntegerField(null=True),
),
migrations.AlterField(
model_name='tanf_t5',
name='RELATIONSHIP_HOH',
field=models.CharField(max_length=2, null=True),
),
]
Loading

0 comments on commit 985845b

Please sign in to comment.