From 71d44353d10c714a03a61dd0d21c55038903758f Mon Sep 17 00:00:00 2001 From: Erin Song <121973038+erinysong@users.noreply.github.com> Date: Wed, 28 Aug 2024 16:30:43 -0700 Subject: [PATCH] Remove submitter refs in docs --- docs/architecture/diagrams/model_timeline.md | 3 +-- docs/architecture/diagrams/models_diagram.md | 2 -- docs/developer/generating-emails-guide.md | 8 ++++---- src/registrar/tests/test_models.py | 2 +- src/registrar/tests/test_views_request.py | 14 +++++--------- 5 files changed, 11 insertions(+), 18 deletions(-) diff --git a/docs/architecture/diagrams/model_timeline.md b/docs/architecture/diagrams/model_timeline.md index f05b9e056..eed2610eb 100644 --- a/docs/architecture/diagrams/model_timeline.md +++ b/docs/architecture/diagrams/model_timeline.md @@ -42,7 +42,6 @@ class DomainRequest { creator (User) investigator (User) senior_official (Contact) - submitter (Contact) other_contacts (Contacts) approved_domain (Domain) requested_domain (DraftDomain) @@ -80,7 +79,7 @@ class Contact { -- } -DomainRequest *-r-* Contact : senior_official, submitter, other_contacts +DomainRequest *-r-* Contact : senior_official, other_contacts class DraftDomain { Requested domain diff --git a/docs/architecture/diagrams/models_diagram.md b/docs/architecture/diagrams/models_diagram.md index 455f8fb09..1e9d3089e 100644 --- a/docs/architecture/diagrams/models_diagram.md +++ b/docs/architecture/diagrams/models_diagram.md @@ -179,7 +179,6 @@ class "registrar.DomainRequest " as registrar.DomainRequest #d6f4e9 { ~ senior_official (ForeignKey) ~ approved_domain (OneToOneField) ~ requested_domain (OneToOneField) - ~ submitter (ForeignKey) + purpose (TextField) + no_other_contacts_rationale (TextField) + anything_else (TextField) @@ -236,7 +235,6 @@ class "registrar.DomainInformation " as registrar.DomainInformation # + about_your_organization (TextField) ~ senior_official (ForeignKey) ~ domain (OneToOneField) - ~ submitter (ForeignKey) + purpose (TextField) + no_other_contacts_rationale (TextField) + anything_else (TextField) diff --git a/docs/developer/generating-emails-guide.md b/docs/developer/generating-emails-guide.md index dd0a55e64..cc5f9d41b 100644 --- a/docs/developer/generating-emails-guide.md +++ b/docs/developer/generating-emails-guide.md @@ -14,7 +14,7 @@ - Starting Location: Home page - Workflow: (Domain requests Table) Manage domain - Workflow Step: Click "Manage" -> Click "Withdraw request" -> (confirmation prompt) -> Click "Withdraw request" (inside prompt) -- Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the submitter (email listed on Your Contact Information). +- Notes: You can also do this through Django Admin by switching a domain of status "submitted" to "withdrawn", but you need to be the creator. - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/domain_request_withdrawn.txt) ### Domain Request Withdrawn Subject @@ -25,7 +25,7 @@ - Starting Location: Django Admin - Workflow: Analyst Admin - Workflow Step: Click "domain requests" -> Click a domain request in a status of "submitted", "In review", "rejected", or "ineligible" -> Click status dropdown -> (select "approved") -> click "Save" -- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create a domain request, then set the status to "approved". This will send you an email. +- Notes: Note that this will send an email to the creator. To test this with your own email, you need to create a domain request, then set the status to "approved". This will send you an email. - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_approved.txt) ### Status Change Approved Subject @@ -36,7 +36,7 @@ - Starting Location: Django Admin - Workflow: Analyst Admin - Workflow Step: Click "domain requests" -> Click a domain request in a status of "In review", or "approved" -> Click status dropdown -> (select "rejected") -> click "Save" -- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information). To test this with your own email, you need to create a domain request, then set the status to "in review" (and click save). Then, go back to the same application and set the status to "rejected". This will send you an email. +- Notes: Note that this will send an email to the creator. To test this with your own email, you need to create a domain request, then set the status to "in review" (and click save). Then, go back to the same application and set the status to "rejected". This will send you an email. - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/status_change_rejected.txt) ### Status Change Rejected Subject @@ -47,7 +47,7 @@ - Starting Location: Home Page - Workflow: Start domain request - Workflow Step: Click "Start a new domain request" -> (fill out the form) -> On the last step ("Review and submit your domain request "), click "Submit your domain request" -- Notes: Note that this will send an email to the submitter (email listed on Your Contact Information) +- Notes: Note that this will send an email to the creator. - [Email Content](https://github.com/cisagov/manage.get.gov/blob/main/src/registrar/templates/emails/submission_confirmation.txt) ### Submission Confirmation Subject diff --git a/src/registrar/tests/test_models.py b/src/registrar/tests/test_models.py index e0794dab4..cdc7d2a00 100644 --- a/src/registrar/tests/test_models.py +++ b/src/registrar/tests/test_models.py @@ -221,7 +221,7 @@ class TestDomainRequest(TestCase): site = DraftDomain.objects.create(name="igorville.gov") domain_request = DomainRequest.objects.create(creator=user, requested_domain=site) - # no submitter email so this emits a log warning + # no email sent to creator so this emits a log warning with boto3_mocking.clients.handler_for("sesv2", self.mock_client): with less_console_noise(): diff --git a/src/registrar/tests/test_views_request.py b/src/registrar/tests/test_views_request.py index 56c7b838f..8718abda7 100644 --- a/src/registrar/tests/test_views_request.py +++ b/src/registrar/tests/test_views_request.py @@ -2206,15 +2206,13 @@ class DomainRequestTests(TestWithUser, WebTest): @override_flag("profile_feature", active=True) @less_console_noise_decorator - def test_edit_submitter_in_place(self): + def test_edit_creator_in_place(self): """When you: - 1. edit a submitter (your contact) which is not joined to another model, + 1. edit a your user profile information, 2. then submit, - the domain request is linked to the existing submitter, and the submitter updated.""" + the domain request also updates its creator data to reflect user profile changes.""" - # Populate the database with a domain request that - # has a submitter - # We'll do it from scratch + # Populate the database with a domain request domain_request, _ = DomainRequest.objects.get_or_create( generic_org_type="federal", federal_type="executive", @@ -2229,8 +2227,6 @@ class DomainRequestTests(TestWithUser, WebTest): status="started", ) - # submitter_pk is the initial pk of the submitter. set it before update - # to be able to verify after update that the same contact object is in place creator_pk = self.user.id # prime the form by visiting /edit @@ -2946,7 +2942,7 @@ class TestWizardUnlockingSteps(TestWithUser, WebTest): # Now 'detail_page' contains the response after following the redirect self.assertEqual(detail_page.status_code, 200) - # 5 unlocked steps (so, domain, submitter, other contacts, and current sites + # 5 unlocked steps (so, domain, other contacts, and current sites # which unlocks if domain exists), one active step, the review step is locked self.assertContains(detail_page, "#check_circle", count=4) # Type of organization