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

Cleanup

Browse source
This commit is contained in:
zandercymatics 2024-05-02 15:29:45 -06:00
parent 9058e0dc97
commit 5c78618ac0
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 11 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -829,18 +829,6 @@ class Domain(TimeStampedModel, DomainHelper):
logger.error("Error changing to new registrant error code is %s, error is %s" % (e.code, e)) logger.error("Error changing to new registrant error code is %s, error is %s" % (e.code, e))
# TODO-error handling better here? # TODO-error handling better here?
def _delete_duplicates(self, duplicates):
"""Given a list of duplicates, delete all but the oldest one."""
# Q: Should we be deleting the newest or the oldest? Does it even matter?
oldest_duplicate = duplicates.order_by('created_at').first()
# Exclude the oldest entry
duplicates_to_delete = duplicates.exclude(id=oldest_duplicate.id)
# Delete all duplicates
duplicates_to_delete.delete()
def _set_singleton_contact(self, contact: PublicContact, expectedType: str): # noqa def _set_singleton_contact(self, contact: PublicContact, expectedType: str): # noqa
"""Sets the contacts by adding them to the registry as new contacts, """Sets the contacts by adding them to the registry as new contacts,
updates the contact if it is already in epp, updates the contact if it is already in epp,
@ -859,13 +847,10 @@ class Domain(TimeStampedModel, DomainHelper):
# get publicContact objects that have the matching # get publicContact objects that have the matching
# domain and type but a different id # domain and type but a different id
# like in highlander we there can only be one # like in highlander we there can only be one
duplicate_contacts = ( duplicate_contacts = PublicContact.objects.exclude(registry_id=contact.registry_id).filter(
PublicContact.objects.exclude(registry_id=contact.registry_id) domain=self, contact_type=contact.contact_type
.filter(domain=self, contact_type=contact.contact_type)
) )
# if no record exists with this contact type # if no record exists with this contact type
# make contact in registry, duplicate and errors handled there # make contact in registry, duplicate and errors handled there
errorCode = self._make_contact_in_registry(contact) errorCode = self._make_contact_in_registry(contact)
@ -1971,7 +1956,15 @@ class Domain(TimeStampedModel, DomainHelper):
# If we find duplicates, log it and delete the newest one. # If we find duplicates, log it and delete the newest one.
if db_contact.count() > 1: if db_contact.count() > 1:
logger.warning("_get_or_create_public_contact() -> Duplicate contacts found. Deleting duplicate.") logger.warning("_get_or_create_public_contact() -> Duplicate contacts found. Deleting duplicate.")
self._delete_duplicates(db_contact)
# Q: Should we be deleting the newest or the oldest? Does it even matter?
oldest_duplicate = db_contact.order_by("created_at").first()
# Exclude the oldest entry
duplicates_to_delete = db_contact.exclude(id=oldest_duplicate.id)
# Delete all duplicates
duplicates_to_delete.delete()
# Save to DB if it doesn't exist already. # Save to DB if it doesn't exist already.
if db_contact.count() == 0: if db_contact.count() == 0: