Test diagram update

docs/architecture/diagrams/models_diagram.md

@@ -38,7 +38,6 @@ class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
     + id (BigAutoField)
     + created_at (DateTimeField)
     + updated_at (DateTimeField)
-    ~ user (OneToOneField)
     + first_name (CharField)
     + middle_name (CharField)
     + last_name (CharField)
@@ -47,7 +46,6 @@ class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
     + phone (PhoneNumberField)
     --
 }
-registrar.Contact -- registrar.User
 
 
 class "registrar.Host <Registrar>" as registrar.Host #d6f4e9 {
@@ -143,6 +141,8 @@ class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
     + updated_at (DateTimeField)
     + agency (CharField)
     + federal_type (CharField)
+    + initials (CharField)
+    + is_fceb (BooleanField)
     --
 }
 
@@ -159,6 +159,7 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
     + action_needed_reason_email (TextField)
     ~ federal_agency (ForeignKey)
     ~ portfolio (ForeignKey)
+    ~ sub_organization (ForeignKey)
     ~ creator (ForeignKey)
     ~ investigator (ForeignKey)
     + generic_org_type (CharField)
@@ -197,12 +198,12 @@ class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
 }
 registrar.DomainRequest -- registrar.FederalAgency
 registrar.DomainRequest -- registrar.Portfolio
+registrar.DomainRequest -- registrar.Suborganization
 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
@@ -217,6 +218,7 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
     ~ federal_agency (ForeignKey)
     ~ creator (ForeignKey)
     ~ portfolio (ForeignKey)
+    ~ sub_organization (ForeignKey)
     ~ domain_request (OneToOneField)
     + generic_org_type (CharField)
     + organization_type (CharField)
@@ -251,10 +253,10 @@ class "registrar.DomainInformation <Registrar>" as registrar.DomainInformation #
 registrar.DomainInformation -- registrar.FederalAgency
 registrar.DomainInformation -- registrar.User
 registrar.DomainInformation -- registrar.Portfolio
+registrar.DomainInformation -- registrar.Suborganization
 registrar.DomainInformation -- registrar.DomainRequest
 registrar.DomainInformation -- registrar.Contact
 registrar.DomainInformation -- registrar.Domain
-registrar.DomainInformation -- registrar.Contact
 registrar.DomainInformation *--* registrar.Contact
 
 
@@ -283,6 +285,22 @@ class "registrar.DomainInvitation <Registrar>" as registrar.DomainInvitation #d6
 registrar.DomainInvitation -- registrar.Domain
 
 
+class "registrar.PortfolioInvitation <Registrar>" as registrar.PortfolioInvitation #d6f4e9 {
+    portfolio invitation
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + email (EmailField)
+    ~ portfolio (ForeignKey)
+    + portfolio_roles (ArrayField)
+    + portfolio_additional_permissions (ArrayField)
+    + status (FSMField)
+    --
+}
+registrar.PortfolioInvitation -- registrar.Portfolio
+
+
 class "registrar.TransitionDomain <Registrar>" as registrar.TransitionDomain #d6f4e9 {
     transition domain
     --
@@ -343,6 +361,9 @@ class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
     + is_active (BooleanField)
     + date_joined (DateTimeField)
     + status (CharField)
+    ~ portfolio (ForeignKey)
+    + portfolio_roles (ArrayField)
+    + portfolio_additional_permissions (ArrayField)
     + phone (PhoneNumberField)
     + middle_name (CharField)
     + title (CharField)
@@ -352,6 +373,7 @@ class "registrar.User <Registrar>" as registrar.User #d6f4e9 {
     # domains (ManyToManyField)
     --
 }
+registrar.User -- registrar.Portfolio
 registrar.User *--* registrar.Domain
 
 
@@ -407,10 +429,11 @@ class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
     + created_at (DateTimeField)
     + updated_at (DateTimeField)
     ~ creator (ForeignKey)
+    + organization_name (CharField)
+    + organization_type (CharField)
     + notes (TextField)
     ~ federal_agency (ForeignKey)
-    + organization_type (CharField)
+    ~ senior_official (ForeignKey)
-    + organization_name (CharField)
     + address_line1 (CharField)
     + address_line2 (CharField)
     + city (CharField)
@@ -422,6 +445,7 @@ class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
 }
 registrar.Portfolio -- registrar.User
 registrar.Portfolio -- registrar.FederalAgency
+registrar.Portfolio -- registrar.SeniorOfficial
 
 
 class "registrar.DomainGroup <Registrar>" as registrar.DomainGroup #d6f4e9 {
@@ -452,7 +476,21 @@ class "registrar.Suborganization <Registrar>" as registrar.Suborganization #d6f4
 registrar.Suborganization -- registrar.Portfolio
 
 
-@enduml
+class "registrar.SeniorOfficial <Registrar>" as registrar.SeniorOfficial #d6f4e9 {
-```
+    senior official
+    --
+    + id (BigAutoField)
+    + created_at (DateTimeField)
+    + updated_at (DateTimeField)
+    + first_name (CharField)
+    + last_name (CharField)
+    + title (CharField)
+    + phone (PhoneNumberField)
+    + email (EmailField)
+    ~ federal_agency (ForeignKey)
+    --
+}
+registrar.SeniorOfficial -- registrar.FederalAgency
 
-</details>
+
+@enduml

src/models_diagram.puml

@@ -1,463 +0,0 @@
-@startuml 
-class "registrar.Contact <Registrar>" as registrar.Contact #d6f4e9 {
-    contact
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + first_name (CharField)
-    + middle_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + email (EmailField)
-    + phone (PhoneNumberField)
-    --
-}
-
-
-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.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
-    --
-    + 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)
-    + dsdata_last_change (TextField)
-    --
-}
-
-
-class "registrar.FederalAgency <Registrar>" as registrar.FederalAgency #d6f4e9 {
-    Federal agency
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + agency (CharField)
-    + federal_type (CharField)
-    + initials (CharField)
-    + is_fceb (BooleanField)
-    --
-}
-
-
-class "registrar.DomainRequest <Registrar>" as registrar.DomainRequest #d6f4e9 {
-    domain request
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + status (FSMField)
-    + rejection_reason (TextField)
-    + action_needed_reason (TextField)
-    + action_needed_reason_email (TextField)
-    ~ federal_agency (ForeignKey)
-    ~ portfolio (ForeignKey)
-    ~ sub_organization (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)
-    + 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)
-    + submission_date (DateField)
-    + notes (TextField)
-    # current_websites (ManyToManyField)
-    # alternative_domains (ManyToManyField)
-    # other_contacts (ManyToManyField)
-    --
-}
-registrar.DomainRequest -- registrar.FederalAgency
-registrar.DomainRequest -- registrar.Portfolio
-registrar.DomainRequest -- registrar.Suborganization
-registrar.DomainRequest -- registrar.User
-registrar.DomainRequest -- registrar.User
-registrar.DomainRequest -- registrar.Contact
-registrar.DomainRequest -- registrar.Domain
-registrar.DomainRequest -- registrar.DraftDomain
-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)
-    ~ portfolio (ForeignKey)
-    ~ sub_organization (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)
-    + 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)
-    --
-}
-registrar.DomainInformation -- registrar.FederalAgency
-registrar.DomainInformation -- registrar.User
-registrar.DomainInformation -- registrar.Portfolio
-registrar.DomainInformation -- registrar.Suborganization
-registrar.DomainInformation -- registrar.DomainRequest
-registrar.DomainInformation -- registrar.Contact
-registrar.DomainInformation -- registrar.Domain
-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.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.PortfolioInvitation <Registrar>" as registrar.PortfolioInvitation #d6f4e9 {
-    portfolio invitation
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + email (EmailField)
-    ~ portfolio (ForeignKey)
-    + portfolio_roles (ArrayField)
-    + portfolio_additional_permissions (ArrayField)
-    + status (FSMField)
-    --
-}
-registrar.PortfolioInvitation -- registrar.Portfolio
-
-
-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)
-    ~ portfolio (ForeignKey)
-    + portfolio_roles (ArrayField)
-    + portfolio_additional_permissions (ArrayField)
-    + phone (PhoneNumberField)
-    + middle_name (CharField)
-    + title (CharField)
-    + verification_type (CharField)
-    # groups (ManyToManyField)
-    # user_permissions (ManyToManyField)
-    # domains (ManyToManyField)
-    --
-}
-registrar.User -- registrar.Portfolio
-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
-
-
-class "registrar.Portfolio <Registrar>" as registrar.Portfolio #d6f4e9 {
-    portfolio
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    ~ creator (ForeignKey)
-    + organization_name (CharField)
-    + organization_type (CharField)
-    + notes (TextField)
-    ~ federal_agency (ForeignKey)
-    ~ senior_official (ForeignKey)
-    + 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
-registrar.Portfolio -- registrar.SeniorOfficial
-
-
-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
-
-
-class "registrar.SeniorOfficial <Registrar>" as registrar.SeniorOfficial #d6f4e9 {
-    senior official
-    --
-    + id (BigAutoField)
-    + created_at (DateTimeField)
-    + updated_at (DateTimeField)
-    + first_name (CharField)
-    + last_name (CharField)
-    + title (CharField)
-    + phone (PhoneNumberField)
-    + email (EmailField)
-    ~ federal_agency (ForeignKey)
-    --
-}
-registrar.SeniorOfficial -- registrar.FederalAgency
-
-
-@enduml