Removal logic

src/registrar/forms/domain_request_wizard.py

@@ -17,6 +17,7 @@ from registrar.models import Contact, DomainRequest, DraftDomain, Domain, Federa
 from registrar.templatetags.url_helpers import public_site_url
 from registrar.utility.enums import ValidationReturnType
 from registrar.utility.constants import BranchChoices
+from django.core.exceptions import ValidationError
 
 logger = logging.getLogger(__name__)
 
@@ -78,6 +79,20 @@ class RequestingEntityForm(RegistrarForm):
         # Otherwise just return the suborg as normal
         return self.cleaned_data.get("sub_organization")
 
+    def clean_requested_suborganization(self):
+        name = self.cleaned_data.get('requested_suborganization')
+        if name and Suborganization.objects.filter(
+            name__iexact=name, 
+            portfolio=self.domain_request.portfolio,
+            name__isnull=False, 
+            portfolio__isnull=False
+        ).exists():
+            raise ValidationError(
+                "This suborganization already exists. "
+                "Choose a new name, or select it directly if you would like to use it."
+            )
+        return name
+
     def full_clean(self):
         """Validation logic to remove the custom suborganization value before clean is triggered.
         Without this override, the form will throw an 'invalid option' error."""
@@ -114,7 +129,7 @@ class RequestingEntityForm(RegistrarForm):
         if requesting_entity_is_suborganization == "True":
             if is_requesting_new_suborganization:
                 # Validate custom suborganization fields
-                if not cleaned_data.get("requested_suborganization"):
+                if not cleaned_data.get("requested_suborganization") and "requested_suborganization" not in self.errors:
                     self.add_error("requested_suborganization", "Enter the name of your suborganization.")
                 if not cleaned_data.get("suborganization_city"):
                     self.add_error("suborganization_city", "Enter the city where your suborganization is located.")

src/registrar/migrations/0140_alter_suborganization_unique_together.py

@@ -1,17 +0,0 @@
-# Generated by Django 4.2.10 on 2024-12-16 17:02
-
-from django.db import migrations
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ("registrar", "0139_alter_domainrequest_action_needed_reason"),
-    ]
-
-    operations = [
-        migrations.AlterUniqueTogether(
-            name="suborganization",
-            unique_together={("name", "portfolio")},
-        ),
-    ]

src/registrar/models/domain_request.py

@@ -12,6 +12,7 @@ from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTy
 from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
 from registrar.utility.constants import BranchChoices
 from auditlog.models import LogEntry
+from django.core.exceptions import ValidationError
 
 from registrar.utility.waffle import flag_is_active_for_user
 
@@ -796,6 +797,7 @@ class DomainRequest(TimeStampedModel):
         return True
 
     def delete_and_clean_up_domain(self, called_from):
+        # Delete the approved domain
         try:
             # Clean up the approved domain
             domain_state = self.approved_domain.state
@@ -809,18 +811,38 @@ class DomainRequest(TimeStampedModel):
             logger.error(err)
             logger.error(f"Can't query an approved domain while attempting {called_from}")
         
-        # Clean up any created suborgs, assuming its for this record only
-        if self.sub_organization is not None:
-            request_suborg_count = self.request_sub_organization.count()
-            domain_suborgs = self.DomainRequest_info.filter(
-                sub_organization=self.sub_organization
-            ).count()
-            if request_suborg_count == 1 and domain_suborgs.count() <= 1:
-                # if domain_suborgs.count() == 1:
-                #     domain_info = domain_suborgs.first()
-                #     domain_info.sub_organization = None
-                #     domain_info.save()
-                self.sub_organization.delete()
+        # Delete the suborg as long as this is the only place it is used
+        self._cleanup_dangling_suborg()
+
+    def _cleanup_dangling_suborg(self):
+        """Deletes the existing suborg if its only being used by the deleted record"""
+        # Nothing to delete, so we just smile and walk away
+        if self.sub_organization is None:
+            return
+
+        Suborganization = apps.get_model("registrar.Suborganization")
+
+        # Stored as so because we need to set the reference to none first,
+        # so we can't just use the self.sub_organization property
+        suborg = Suborganization.objects.get(id=self.sub_organization.id)
+        requests = suborg.request_sub_organization
+        domain_infos = suborg.information_sub_organization
+
+        # Check if this is the only reference to the suborganization
+        if requests.count() != 1 or domain_infos.count() > 1:
+            return
+
+        # Remove the suborganization reference from request.
+        self.sub_organization = None
+        self.save()
+
+        # Remove the suborganization reference from domain if it exists.
+        if domain_infos.count() == 1:
+            domain_infos.update(sub_organization=None)
+
+        # Delete the now-orphaned suborganization
+        logger.info(f"_cleanup_dangling_suborg() -> Deleting orphan suborganization: {suborg}")
+        suborg.delete()
 
     def _send_status_update_email(
         self,

src/registrar/models/suborganization.py

@@ -9,9 +9,6 @@ class Suborganization(TimeStampedModel):
     Suborganization under an organization (portfolio)
     """
 
-    class Meta:
-        unique_together = ["name", "portfolio"]
-
     name = models.CharField(
         unique=True,
         max_length=1000,