zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-23 19:20:47 +02:00
Code Issues Projects Releases Packages Wiki Activity

refactor delete to use same logic as nameserver setter

Browse source
This commit is contained in:
matthewswspence 2024-12-11 14:30:58 -06:00
parent e0eb70abe2
commit 533e57722f
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
1 changed files with 14 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/registrar/models/domain.py
View file

@ -1038,27 +1038,18 @@ class Domain(TimeStampedModel, DomainHelper):
"""This domain should be deleted from the registry """This domain should be deleted from the registry
may raises RegistryError, should be caught or handled correctly by caller""" may raises RegistryError, should be caught or handled correctly by caller"""
# logger.info("Deleting subdomains for %s", self.name) logger.info("Deleting subdomains for %s", self.name)
# # check if any subdomains are in use by another domain # check if any subdomains are in use by another domain
# hosts = Host.objects.filter(name__regex=r".+{}".format(self.name)) hosts = Host.objects.filter(name__regex=r".+{}".format(self.name))
# logger.debug("Checking if any subdomains are in use by another domain") logger.debug("Checking if any subdomains are in use by another domain")
# for host in hosts: for host in hosts:
# if host.domain != self: if host.domain != self:
# logger.error("Unable to delete host: %s is in use by another domain: %s", host.name, host.domain) logger.error("Unable to delete host: %s is in use by another domain: %s", host.name, host.domain)
# raise RegistryError( raise RegistryError(
# code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION, code=ErrorCode.OBJECT_ASSOCIATION_PROHIBITS_OPERATION,
# note=f"Host {host.name} is in use by {host.domain}", note=f"Host {host.name} is in use by {host.domain}",
# ) )
# logger.debug("No subdomains are in use by another domain") logger.debug("No subdomains are in use by another domain")
# nameservers = [host.name for host in hosts]
# hosts = self.createDeleteHostList(hostsToDelete=nameservers)
# response_code = self.addAndRemoveHostsFromDomain(hostsToAdd=[], hostsToDelete=hosts)
# if response_code != ErrorCode.COMMAND_COMPLETED_SUCCESSFULLY:
# raise RegistryError(code=response_code)
# logger.debug("Deleting subordinate hosts for %s", self.name)
# self._delete_hosts_if_not_used(nameservers)
( (
deleted_values, deleted_values,
@ -1068,8 +1059,8 @@ class Domain(TimeStampedModel, DomainHelper):
) = self.getNameserverChanges(hosts=[]) ) = self.getNameserverChanges(hosts=[])
_ = self._update_host_values(updated_values, oldNameservers) # returns nothing, just need to be run and errors _ = self._update_host_values(updated_values, oldNameservers) # returns nothing, just need to be run and errors
addToDomainList, addToDomainCount = self.createNewHostList(new_values) addToDomainList, _ = self.createNewHostList(new_values)
deleteHostList, deleteCount = self.createDeleteHostList(deleted_values) deleteHostList, _ = self.createDeleteHostList(deleted_values)
responseCode = self.addAndRemoveHostsFromDomain(hostsToAdd=addToDomainList, hostsToDelete=deleteHostList) responseCode = self.addAndRemoveHostsFromDomain(hostsToAdd=addToDomainList, hostsToDelete=deleteHostList)
# if unable to update domain raise error and stop # if unable to update domain raise error and stop