diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 5108cfd8e..9713ff1d8 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -280,7 +280,7 @@ class DomainApplicationAdmin(ListHeaderAdmin): # for the side effects (like an email send). Same # comment applies to original_obj method calls below. original_obj.submit(updated_domain_application=obj) - elif obj.status == models.DomainApplication.INVESTIGATING: + elif obj.status == models.DomainApplication.IN_REVIEW: original_obj.in_review(updated_domain_application=obj) elif obj.status == models.DomainApplication.APPROVED: original_obj.approve(updated_domain_application=obj) diff --git a/src/registrar/fixtures.py b/src/registrar/fixtures.py index 35a72ab15..909ff5f58 100644 --- a/src/registrar/fixtures.py +++ b/src/registrar/fixtures.py @@ -202,11 +202,11 @@ class DomainApplicationFixture: "organization_name": "Example - Submitted but pending Investigation", }, { - "status": "investigating", + "status": "in review", "organization_name": "Example - In Investigation", }, { - "status": "investigating", + "status": "in review", "organization_name": "Example - Approved", }, { @@ -378,9 +378,9 @@ class DomainFixture(DomainApplicationFixture): return for user in users: - # approve one of each users investigating status domains + # approve one of each users in review status domains application = DomainApplication.objects.filter( - creator=user, status=DomainApplication.INVESTIGATING + creator=user, status=DomainApplication.IN_REVIEW ).last() logger.debug(f"Approving {application} for {user}") application.approve() diff --git a/src/registrar/migrations/0028_alter_domainapplication_status.py b/src/registrar/migrations/0028_alter_domainapplication_status.py new file mode 100644 index 000000000..6ae989ed6 --- /dev/null +++ b/src/registrar/migrations/0028_alter_domainapplication_status.py @@ -0,0 +1,28 @@ +# Generated by Django 4.2.2 on 2023-07-13 17:56 + +from django.db import migrations +import django_fsm + + +class Migration(migrations.Migration): + dependencies = [ + ("registrar", "0027_alter_domaininformation_address_line1_and_more"), + ] + + operations = [ + migrations.AlterField( + model_name="domainapplication", + name="status", + field=django_fsm.FSMField( + choices=[ + ("started", "started"), + ("submitted", "submitted"), + ("in review", "in review"), + ("approved", "approved"), + ("withdrawn", "withdrawn"), + ], + default="started", + max_length=50, + ), + ), + ] diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index a50cb34b8..fd0c83e94 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -21,13 +21,13 @@ class DomainApplication(TimeStampedModel): # #### Contants for choice fields #### STARTED = "started" SUBMITTED = "submitted" - INVESTIGATING = "investigating" + IN_REVIEW = "in review" APPROVED = "approved" WITHDRAWN = "withdrawn" STATUS_CHOICES = [ (STARTED, STARTED), (SUBMITTED, SUBMITTED), - (INVESTIGATING, INVESTIGATING), + (IN_REVIEW, IN_REVIEW), (APPROVED, APPROVED), (WITHDRAWN, WITHDRAWN), ] @@ -538,7 +538,7 @@ class DomainApplication(TimeStampedModel): "emails/submission_confirmation_subject.txt", ) - @transition(field="status", source=SUBMITTED, target=INVESTIGATING) + @transition(field="status", source=SUBMITTED, target=IN_REVIEW) def in_review(self, updated_domain_application): """Investigate an application that has been submitted. @@ -555,7 +555,7 @@ class DomainApplication(TimeStampedModel): "emails/status_change_in_review_subject.txt", ) - @transition(field="status", source=[SUBMITTED, INVESTIGATING], target=APPROVED) + @transition(field="status", source=[SUBMITTED, IN_REVIEW], target=APPROVED) def approve(self, updated_domain_application=None): """Approve an application that has been submitted. @@ -601,7 +601,7 @@ class DomainApplication(TimeStampedModel): "emails/status_change_approved_subject.txt", ) - @transition(field="status", source=[SUBMITTED, INVESTIGATING], target=WITHDRAWN) + @transition(field="status", source=[SUBMITTED, IN_REVIEW], target=WITHDRAWN) def withdraw(self): """Withdraw an application that has been submitted.""" diff --git a/src/registrar/templates/application_status.html b/src/registrar/templates/application_status.html index 3d0f44a9f..05235a704 100644 --- a/src/registrar/templates/application_status.html +++ b/src/registrar/templates/application_status.html @@ -20,7 +20,7 @@ Status: {% if domainapplication.status == 'approved' %} Approved - {% elif domainapplication.status == 'investigating' %} In Review + {% elif domainapplication.status == 'in review' %} In Review {% elif domainapplication.status == 'submitted' %} Received {% else %}ERROR Please contact technical support/dev {% endif %} diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index db875324e..d4d43a7b8 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -86,7 +86,7 @@ class TestDomainApplicationAdmin(TestCase): model_admin = DomainApplicationAdmin(DomainApplication, self.site) # Modify the application's property - application.status = DomainApplication.INVESTIGATING + application.status = DomainApplication.IN_REVIEW # Use the model admin's save_model method model_admin.save_model(request, application, form=None, change=True) @@ -124,7 +124,7 @@ class TestDomainApplicationAdmin(TestCase): with boto3_mocking.clients.handler_for("sesv2", mock_client): # Create a sample application - application = completed_application(status=DomainApplication.INVESTIGATING) + application = completed_application(status=DomainApplication.IN_REVIEW) # Create a mock request request = self.factory.post( diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py index ba02fa971..c7f2e26e5 100644 --- a/src/registrar/tests/test_models.py +++ b/src/registrar/tests/test_models.py @@ -144,11 +144,11 @@ class TestDomainApplication(TestCase): with self.assertRaises(TransitionNotAllowed): application.submit() - def test_transition_not_allowed_investigating_submitted(self): - """Create an application with status investigating and call submit + def test_transition_not_allowed_in_review_submitted(self): + """Create an application with status in review and call submit against transition rules""" - application = completed_application(status=DomainApplication.INVESTIGATING) + application = completed_application(status=DomainApplication.IN_REVIEW) with self.assertRaises(TransitionNotAllowed): application.submit() @@ -162,7 +162,7 @@ class TestDomainApplication(TestCase): with self.assertRaises(TransitionNotAllowed): application.submit() - def test_transition_not_allowed_started_investigating(self): + def test_transition_not_allowed_started_in_review(self): """Create an application with status started and call in_review against transition rules""" @@ -171,16 +171,16 @@ class TestDomainApplication(TestCase): with self.assertRaises(TransitionNotAllowed): application.in_review() - def test_transition_not_allowed_investigating_investigating(self): - """Create an application with status investigating and call in_review + def test_transition_not_allowed_in_review_in_review(self): + """Create an application with status in review and call in_review against transition rules""" - application = completed_application(status=DomainApplication.INVESTIGATING) + application = completed_application(status=DomainApplication.IN_REVIEW) with self.assertRaises(TransitionNotAllowed): application.in_review() - def test_transition_not_allowed_approved_investigating(self): + def test_transition_not_allowed_approved_in_review(self): """Create an application with status approved and call in_review against transition rules""" @@ -189,7 +189,7 @@ class TestDomainApplication(TestCase): with self.assertRaises(TransitionNotAllowed): application.in_review() - def test_transition_not_allowed_withdrawn_investigating(self): + def test_transition_not_allowed_withdrawn_in_review(self): """Create an application with status withdrawn and call in_review against transition rules"""