#2823: update delete domain process - [MS]

src/registrar/admin.py

@@ -2927,7 +2927,7 @@ def do_delete_domain(self, request, obj):
             message = "Cannot connect to the registry"
             if not err.is_connection_error():
                 # If nothing is found, will default to returned err
-                message = error_messages[err.code]
+                message = error_messages.get(err.code, err)
             self.message_user(request, f"Error deleting this Domain: {message}", messages.ERROR)
         except TransitionNotAllowed:
             if obj.state == Domain.State.DELETED:

src/registrar/models/domain.py

@@ -750,7 +750,12 @@ def nameservers(self, hosts: list[tuple[str, list]]):
 
         successTotalNameservers = len(oldNameservers) - deleteCount + addToDomainCount
 
-        self._delete_hosts_if_not_used(hostsToDelete=deleted_values)
+        try: 
+            self._delete_hosts_if_not_used(hostsToDelete=deleted_values)
+        except:
+            # the error will be logged in the erring function and we don't 
+            # need this part to succeed in order to continue.s
+            pass
 
         if successTotalNameservers < 2:
             try:
@@ -1065,6 +1070,8 @@ def _delete_domain(self):
         if responseCode != ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY:
             raise NameserverError(code=nsErrorCodes.BAD_DATA)
 
+        # addAndRemoveHostsFromDomain removes the hosts from the domain object, 
+        # but we still need to delete the object themselves
         self._delete_hosts_if_not_used(hostsToDelete=deleted_values)
 
         logger.debug("Deleting non-registrant contacts for %s", self.name)

src/registrar/tests/common.py

@@ -1676,7 +1676,6 @@ def mockUpdateHostCommands(self, _request, cleaned):
     def mockDeleteHostCommands(self, _request, cleaned):
         host = getattr(_request, "name", None)
         if "sharedhost.com" in host:
-            print("raising registry error")
             raise RegistryError(code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION, note="ns1.sharedhost.com")
         return MagicMock(
             res_data=[self.mockDataHostChange],