diff --git a/src/registrar/fixtures_applications.py b/src/registrar/fixtures_applications.py index 7f6a63719..69dfd0e50 100644 --- a/src/registrar/fixtures_applications.py +++ b/src/registrar/fixtures_applications.py @@ -49,27 +49,27 @@ class DomainApplicationFixture: # }, DA = [ { - "status": "started", + "status": DomainApplication.ApplicationStatus.STARTED, "organization_name": "Example - Finished but not submitted", }, { - "status": "submitted", + "status": DomainApplication.ApplicationStatus.SUBMITTED, "organization_name": "Example - Submitted but pending investigation", }, { - "status": "in review", + "status": DomainApplication.ApplicationStatus.IN_REVIEW, "organization_name": "Example - In investigation", }, { - "status": "in review", + "status": DomainApplication.ApplicationStatus.IN_REVIEW, "organization_name": "Example - Approved", }, { - "status": "withdrawn", + "status": DomainApplication.ApplicationStatus.WITHDRAWN, "organization_name": "Example - Withdrawn", }, { - "status": "action needed", + "status": DomainApplication.ApplicationStatus.ACTION_NEEDED, "organization_name": "Example - Action needed", }, { diff --git a/src/registrar/migrations/0053_alter_domain_state_alter_domainapplication_status_and_more.py b/src/registrar/migrations/0053_alter_domain_state_alter_domainapplication_status_and_more.py index 856ce7f0f..2abf31364 100644 --- a/src/registrar/migrations/0053_alter_domain_state_alter_domainapplication_status_and_more.py +++ b/src/registrar/migrations/0053_alter_domain_state_alter_domainapplication_status_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.7 on 2023-12-05 22:07 +# Generated by Django 4.2.7 on 2023-12-06 16:16 from django.db import migrations, models import django_fsm @@ -45,6 +45,16 @@ class Migration(migrations.Migration): max_length=50, ), ), + migrations.AlterField( + model_name="domaininvitation", + name="status", + field=django_fsm.FSMField( + choices=[("invited", "Invited"), ("retrieved", "Retrieved")], + default="invited", + max_length=50, + protected=True, + ), + ), migrations.AlterField( model_name="transitiondomain", name="status", diff --git a/src/registrar/migrations/0054_alter_domainapplication_status.py b/src/registrar/migrations/0054_alter_domainapplication_status.py deleted file mode 100644 index c0c427179..000000000 --- a/src/registrar/migrations/0054_alter_domainapplication_status.py +++ /dev/null @@ -1,31 +0,0 @@ -# Generated by Django 4.2.7 on 2023-12-05 23:14 - -from django.db import migrations -import django_fsm - - -class Migration(migrations.Migration): - dependencies = [ - ("registrar", "0053_alter_domain_state_alter_domainapplication_status_and_more"), - ] - - operations = [ - migrations.AlterField( - model_name="domainapplication", - name="status", - field=django_fsm.FSMField( - choices=[ - ("started", "Started"), - ("submitted", "Submitted"), - ("in_review", "In review"), - ("action_needed", "Action needed"), - ("approved", "Approved"), - ("withdrawn", "Withdrawn"), - ("rejected", "Rejected"), - ("ineligible", "Ineligible"), - ], - default="started", - max_length=50, - ), - ), - ] diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 32cd239dc..8a56fb883 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -23,8 +23,8 @@ class DomainApplication(TimeStampedModel): class ApplicationStatus(models.TextChoices): STARTED = "started", "Started" SUBMITTED = "submitted", "Submitted" - IN_REVIEW = "in_review", "In review" - ACTION_NEEDED = "action_needed", "Action needed" + IN_REVIEW = "in review", "In review" + ACTION_NEEDED = "action needed", "Action needed" APPROVED = "approved", "Approved" WITHDRAWN = "withdrawn", "Withdrawn" REJECTED = "rejected", "Rejected"