diff --git a/src/registrar/migrations/0051_alter_domain_state.py b/src/registrar/migrations/0051_alter_domain_state.py new file mode 100644 index 000000000..df1240d93 --- /dev/null +++ b/src/registrar/migrations/0051_alter_domain_state.py @@ -0,0 +1,30 @@ +# Generated by Django 4.2.7 on 2023-12-05 21:21 + +from django.db import migrations +import django_fsm + + +class Migration(migrations.Migration): + dependencies = [ + ("registrar", "0050_alter_transitiondomain_status"), + ] + + operations = [ + migrations.AlterField( + model_name="domain", + name="state", + field=django_fsm.FSMField( + choices=[ + ("unknown", "Unknown"), + ("dns needed", "Dns needed"), + ("ready", "Ready"), + ("on hold", "On hold"), + ("deleted", "Deleted"), + ], + default="unknown", + help_text="Very basic info about the lifecycle of this domain object", + max_length=21, + protected=True, + ), + ), + ] diff --git a/src/registrar/migrations/0052_alter_domainapplication_status.py b/src/registrar/migrations/0052_alter_domainapplication_status.py new file mode 100644 index 000000000..5a274d731 --- /dev/null +++ b/src/registrar/migrations/0052_alter_domainapplication_status.py @@ -0,0 +1,31 @@ +# Generated by Django 4.2.7 on 2023-12-05 21:25 + +from django.db import migrations +import django_fsm + + +class Migration(migrations.Migration): + dependencies = [ + ("registrar", "0051_alter_domain_state"), + ] + + 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.py b/src/registrar/models/domain.py index 94430fb36..16c918f84 100644 --- a/src/registrar/models/domain.py +++ b/src/registrar/models/domain.py @@ -126,13 +126,13 @@ class Domain(TimeStampedModel, DomainHelper): # The domain object exists in the registry # but nameservers don't exist for it yet - DNS_NEEDED = "dns needed" + DNS_NEEDED = "dns needed", "Dns needed" # Domain has had nameservers set, may or may not be active READY = "ready" # Registrar manually changed state to client hold - ON_HOLD = "on hold" + ON_HOLD = "on hold", "On hold" # previously existed but has been deleted from the registry DELETED = "deleted" diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 9ab3908d4..b35ad28c8 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -29,14 +29,14 @@ class DomainApplication(TimeStampedModel): REJECTED = "rejected" INELIGIBLE = "ineligible" STATUS_CHOICES = [ - (STARTED, STARTED), - (SUBMITTED, SUBMITTED), - (IN_REVIEW, IN_REVIEW), - (ACTION_NEEDED, ACTION_NEEDED), - (APPROVED, APPROVED), - (WITHDRAWN, WITHDRAWN), - (REJECTED, REJECTED), - (INELIGIBLE, INELIGIBLE), + (STARTED, STARTED.capitalize()), + (SUBMITTED, SUBMITTED.capitalize()), + (IN_REVIEW, IN_REVIEW.capitalize()), + (ACTION_NEEDED, ACTION_NEEDED.capitalize()), + (APPROVED, APPROVED.capitalize()), + (WITHDRAWN, WITHDRAWN.capitalize()), + (REJECTED, REJECTED.capitalize()), + (INELIGIBLE, INELIGIBLE.capitalize()), ] class StateTerritoryChoices(models.TextChoices):