SVG is finally updated woohoo

docs/architecture/diagrams/models_diagram.md

@@ -20,7 +20,7 @@ docker compose exec app ./manage.py generate_puml --include registrar
 ## How To regenerate the database svg image
 
 1. Copy your puml file contents into the bottom of this file and replace the current code marked by `plantuml`
-2. Run the following command
+2. Navigate to the `diagram` folder and then run the following command
 
 ```bash
 docker run -v $(pwd):$(pwd) -w $(pwd) -it plantuml/plantuml -tsvg models_diagram.md
@@ -103,6 +103,21 @@ class "registrar.PublicContact <Registrar>" as registrar.PublicContact #d6f4e9 {
 registrar.PublicContact -- registrar.Domain
 
 
+class "registrar.UserDomainRole <Registrar>" as registrar.UserDomainRole #d6f4e9 {
+    user domain role
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    ~ user (ForeignKey)
+    ~ domain (ForeignKey)
+    + role (TextField)
+    --
+}
+registrar.UserDomainRole -- registrar.User
+registrar.UserDomainRole -- registrar.Domain
+
+
 class "registrar.Domain <Registrar>" as registrar.Domain #d6f4e9 {
     domain
     --
@@ -115,6 +130,7 @@ class "registrar.Domain <Registrar>" as registrar.Domain #d6f4e9 {
     + security_contact_registry_id (TextField)
     + deleted (DateField)
     + first_ready (DateField)
+    + dsdata_last_change (TextField)
     --
 }
 
@@ -126,6 +142,7 @@ class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
     + created_at (DateTimeField)
     + updated_at (DateTimeField)
     + agency (CharField)
+    + federal_type (CharField)
     --
 }
 
@@ -138,7 +155,10 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
     + updated_at (DateTimeField)
     + status (FSMField)
     + rejection_reason (TextField)
+    + action_needed_reason (TextField)
+    + action_needed_reason_email (TextField)
     ~ federal_agency (ForeignKey)
+    ~ portfolio (ForeignKey)
     ~ creator (ForeignKey)
     ~ investigator (ForeignKey)
     + generic_org_type (CharField)
@@ -165,6 +185,8 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
     + anything_else (TextField)
     + has_anything_else_text (BooleanField)
     + cisa_representative_email (EmailField)
+    + cisa_representative_first_name (CharField)
+    + cisa_representative_last_name (CharField)
     + has_cisa_representative (BooleanField)
     + is_policy_acknowledged (BooleanField)
     + submission_date (DateField)
@@ -175,6 +197,7 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
     --
 }
 registrar.DomainRequest -- registrar.FederalAgency
+registrar.DomainRequest -- registrar.Portfolio
 registrar.DomainRequest -- registrar.User
 registrar.DomainRequest -- registrar.User
 registrar.DomainRequest -- registrar.Contact
@@ -194,6 +217,7 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
     + updated_at (DateTimeField)
     ~ federal_agency (ForeignKey)
     ~ creator (ForeignKey)
+    ~ portfolio (ForeignKey)
     ~ domain_request (OneToOneField)
     + generic_org_type (CharField)
     + organization_type (CharField)
@@ -216,7 +240,11 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
     + purpose (TextField)
     + no_other_contacts_rationale (TextField)
     + anything_else (TextField)
+    + has_anything_else_text (BooleanField)
     + cisa_representative_email (EmailField)
+    + cisa_representative_first_name (CharField)
+    + cisa_representative_last_name (CharField)
+    + has_cisa_representative (BooleanField)
     + is_policy_acknowledged (BooleanField)
     + notes (TextField)
     # other_contacts (ManyToManyField)
@@ -224,6 +252,7 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
 }
 registrar.DomainInformation -- registrar.FederalAgency
 registrar.DomainInformation -- registrar.User
+registrar.DomainInformation -- registrar.Portfolio
 registrar.DomainInformation -- registrar.DomainRequest
 registrar.DomainInformation -- registrar.Contact
 registrar.DomainInformation -- registrar.Domain
@@ -242,21 +271,6 @@ class "registrar.DraftDomain <Registrar>" as registrar.DraftDomain #d6f4e9 {
 }
 
 
-class "registrar.UserDomainRole <Registrar>" as registrar.UserDomainRole #d6f4e9 {
-    user domain role
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ user (ForeignKey)
-    ~ domain (ForeignKey)
-    + role (TextField)
-    --
-}
-registrar.UserDomainRole -- registrar.User
-registrar.UserDomainRole -- registrar.Domain
-
-
 class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6f4e9 {
     domain invitation
     --
@@ -388,6 +402,58 @@ class "registrar.WaffleFlag <Registrar>" as registrar.WaffleFlag #d6f4e9 {
 registrar.WaffleFlag *--* registrar.User
 
 
+class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
+    portfolio
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    ~ creator (ForeignKey)
+    + notes (TextField)
+    ~ federal_agency (ForeignKey)
+    + organization_type (CharField)
+    + organization_name (CharField)
+    + address_line1 (CharField)
+    + address_line2 (CharField)
+    + city (CharField)
+    + state_territory (CharField)
+    + zipcode (CharField)
+    + urbanization (CharField)
+    + security_contact_email (EmailField)
+    --
+}
+registrar.Portfolio -- registrar.User
+registrar.Portfolio -- registrar.FederalAgency
+
+
+class "registrar.DomainGroup <Registrar>" as registrar.DomainGroup #d6f4e9 {
+    domain group
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (CharField)
+    ~ portfolio (ForeignKey)
+    # domains (ManyToManyField)
+    --
+}
+registrar.DomainGroup -- registrar.Portfolio
+registrar.DomainGroup *--* registrar.DomainInformation
+
+
+class "registrar.Suborganization <Registrar>" as registrar.Suborganization #d6f4e9 {
+    suborganization
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + name (CharField)
+    ~ portfolio (ForeignKey)
+    --
+}
+registrar.Suborganization -- registrar.Portfolio
+
+
 @enduml
 ```
 

src/models_diagram.puml

@@ -1,356 +0,0 @@
-@startuml 
-class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
-    contact
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ user (OneToOneField)
-    + first_name (CharField)
-    + middle_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + email (EmailField)
-    + phone (PhoneNumberField)
-    --
-}
-registrar.Contact -- registrar.User
-
-
-class "registrar.Host <Registrar>" as registrar.Host #d6f4e9 {
-    host
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (CharField)
-    ~ domain (ForeignKey)
-    --
-}
-registrar.Host -- registrar.Domain
-
-
-class "registrar.HostIP <Registrar>" as registrar.HostIP #d6f4e9 {
-    host ip
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + address (CharField)
-    ~ host (ForeignKey)
-    --
-}
-registrar.HostIP -- registrar.Host
-
-
-class "registrar.PublicContact <Registrar>" as registrar.PublicContact #d6f4e9 {
-    public contact
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + contact_type (CharField)
-    + registry_id (CharField)
-    ~ domain (ForeignKey)
-    + name (CharField)
-    + org (CharField)
-    + street1 (CharField)
-    + street2 (CharField)
-    + street3 (CharField)
-    + city (CharField)
-    + sp (CharField)
-    + pc (CharField)
-    + cc (CharField)
-    + email (EmailField)
-    + voice (CharField)
-    + fax (CharField)
-    + pw (CharField)
-    --
-}
-registrar.PublicContact -- registrar.Domain
-
-
-class "registrar.Domain <Registrar>" as registrar.Domain #d6f4e9 {
-    domain
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (DomainField)
-    + state (FSMField)
-    + expiration_date (DateField)
-    + security_contact_registry_id (TextField)
-    + deleted (DateField)
-    + first_ready (DateField)
-    --
-}
-
-
-class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
-    domain request
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + status (FSMField)
-    + rejection_reason (TextField)
-    ~ federal_agency (ForeignKey)
-    ~ creator (ForeignKey)
-    ~ investigator (ForeignKey)
-    + generic_org_type (CharField)
-    + is_election_board (BooleanField)
-    + organization_type (CharField)
-    + federally_recognized_tribe (BooleanField)
-    + state_recognized_tribe (BooleanField)
-    + tribe_name (CharField)
-    + federal_type (CharField)
-    + organization_name (CharField)
-    + address_line1 (CharField)
-    + address_line2 (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    + urbanization (CharField)
-    + about_your_organization (TextField)
-    ~ senior_official (ForeignKey)
-    ~ approved_domain (OneToOneField)
-    ~ requested_domain (OneToOneField)
-    ~ submitter (ForeignKey)
-    + purpose (TextField)
-    + no_other_contacts_rationale (TextField)
-    + anything_else (TextField)
-    + has_anything_else_text (BooleanField)
-    + cisa_representative_email (EmailField)
-    + has_cisa_representative (BooleanField)
-    + is_policy_acknowledged (BooleanField)
-    + submission_date (DateField)
-    + notes (TextField)
-    # current_websites (ManyToManyField)
-    # alternative_domains (ManyToManyField)
-    # other_contacts (ManyToManyField)
-    --
-}
-registrar.DomainRequest -- registrar.FederalAgency
-registrar.DomainRequest -- registrar.User
-registrar.DomainRequest -- registrar.User
-registrar.DomainRequest -- registrar.Contact
-registrar.DomainRequest -- registrar.Domain
-registrar.DomainRequest -- registrar.DraftDomain
-registrar.DomainRequest -- registrar.Contact
-registrar.DomainRequest *--* registrar.Website
-registrar.DomainRequest *--* registrar.Website
-registrar.DomainRequest *--* registrar.Contact
-
-
-class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #d6f4e9 {
-    domain information
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ federal_agency (ForeignKey)
-    ~ creator (ForeignKey)
-    ~ domain_request (OneToOneField)
-    + generic_org_type (CharField)
-    + organization_type (CharField)
-    + federally_recognized_tribe (BooleanField)
-    + state_recognized_tribe (BooleanField)
-    + tribe_name (CharField)
-    + federal_type (CharField)
-    + is_election_board (BooleanField)
-    + organization_name (CharField)
-    + address_line1 (CharField)
-    + address_line2 (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    + urbanization (CharField)
-    + about_your_organization (TextField)
-    ~ senior_official (ForeignKey)
-    ~ domain (OneToOneField)
-    ~ submitter (ForeignKey)
-    + purpose (TextField)
-    + no_other_contacts_rationale (TextField)
-    + anything_else (TextField)
-    + cisa_representative_email (EmailField)
-    + is_policy_acknowledged (BooleanField)
-    + notes (TextField)
-    # other_contacts (ManyToManyField)
-    --
-}
-registrar.DomainInformation -- registrar.FederalAgency
-registrar.DomainInformation -- registrar.User
-registrar.DomainInformation -- registrar.DomainRequest
-registrar.DomainInformation -- registrar.Contact
-registrar.DomainInformation -- registrar.Domain
-registrar.DomainInformation -- registrar.Contact
-registrar.DomainInformation *--* registrar.Contact
-
-
-class "registrar.DraftDomain <Registrar>" as registrar.DraftDomain #d6f4e9 {
-    draft domain
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + name (CharField)
-    --
-}
-
-
-class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
-    Federal agency
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + agency (CharField)
-    --
-}
-
-
-class "registrar.UserDomainRole <Registrar>" as registrar.UserDomainRole #d6f4e9 {
-    user domain role
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ user (ForeignKey)
-    ~ domain (ForeignKey)
-    + role (TextField)
-    --
-}
-registrar.UserDomainRole -- registrar.User
-registrar.UserDomainRole -- registrar.Domain
-
-
-class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6f4e9 {
-    domain invitation
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + email (EmailField)
-    ~ domain (ForeignKey)
-    + status (FSMField)
-    --
-}
-registrar.DomainInvitation -- registrar.Domain
-
-
-class "registrar.TransitionDomain <Registrar>" as registrar.TransitionDomain #d6f4e9 {
-    transition domain
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + username (CharField)
-    + domain_name (CharField)
-    + status (CharField)
-    + email_sent (BooleanField)
-    + processed (BooleanField)
-    + generic_org_type (CharField)
-    + organization_name (CharField)
-    + federal_type (CharField)
-    + federal_agency (CharField)
-    + epp_creation_date (DateField)
-    + epp_expiration_date (DateField)
-    + first_name (CharField)
-    + middle_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + email (EmailField)
-    + phone (CharField)
-    + address_line (CharField)
-    + city (CharField)
-    + state_territory (CharField)
-    + zipcode (CharField)
-    --
-}
-
-
-class "registrar.VerifiedByStaff <Registrar>" as registrar.VerifiedByStaff #d6f4e9 {
-    verified by staff
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + email (EmailField)
-    ~ requestor (ForeignKey)
-    + notes (TextField)
-    --
-}
-registrar.VerifiedByStaff -- registrar.User
-
-
-class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
-    user
-    --
-    + id (BigAutoField)
-    + password (CharField)
-    + last_login (DateTimeField)
-    + is_superuser (BooleanField)
-    + username (CharField)
-    + first_name (CharField)
-    + last_name (CharField)
-    + email (EmailField)
-    + is_staff (BooleanField)
-    + is_active (BooleanField)
-    + date_joined (DateTimeField)
-    + status (CharField)
-    + phone (PhoneNumberField)
-    + verification_type (CharField)
-    # groups (ManyToManyField)
-    # user_permissions (ManyToManyField)
-    # domains (ManyToManyField)
-    --
-}
-registrar.User *--* registrar.Domain
-
-
-class "registrar.UserGroup <Registrar>" as registrar.UserGroup #d6f4e9 {
-    User group
-    --
-    - id (AutoField)
-    + name (CharField)
-    ~ group_ptr (OneToOneField)
-    # permissions (ManyToManyField)
-    --
-}
-
-
-class "registrar.Website <Registrar>" as registrar.Website #d6f4e9 {
-    website
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + website (CharField)
-    --
-}
-
-
-class "registrar.WaffleFlag <Registrar>" as registrar.WaffleFlag #d6f4e9 {
-    waffle flag
-    --
-    + id (BigAutoField)
-    + name (CharField)
-    + everyone (BooleanField)
-    + percent (DecimalField)
-    + testing (BooleanField)
-    + superusers (BooleanField)
-    + staff (BooleanField)
-    + authenticated (BooleanField)
-    + languages (TextField)
-    + rollout (BooleanField)
-    + note (TextField)
-    + created (DateTimeField)
-    + modified (DateTimeField)
-    # groups (ManyToManyField)
-    # users (ManyToManyField)
-    --
-}
-registrar.WaffleFlag *--* registrar.User
-
-
-@enduml

src/registrar/templates/emails/status_change_rejected.txt

@@ -45,7 +45,7 @@ government organizations.
 
 DEMONSTRATE ELIGIBILITY
 If you can provide documentation that demonstrates your eligibility, reply to this email. 
-This can include links to (or copies of) your senior legislation, your founding 
+This can include links to (or copies of) your authorizing legislation, your founding 
 charter or bylaws, or other similar documentation. Without this, we can’t approve a 
 .gov domain for your organization. Learn more about eligibility for .gov domains 
 <https://get.gov/domains/eligibility/>.{% elif domain_request.rejection_reason == 'naming_not_met' %}