zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-16 06:24:12 +02:00
Code Issues Projects Releases Packages Wiki Activity

Update domain.py

Browse source
This commit is contained in:
zandercymatics 2024-05-06 08:31:46 -06:00
parent c3db67bf1d
commit 86717945de
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
1 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1962,16 +1962,16 @@ class Domain(TimeStampedModel, DomainHelper):
domain=self, domain=self,
) )
# If we find duplicates, log it and delete the newest one. # If we find duplicates, log it and delete the newest ones.
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.")
# Q: Should we be deleting the newest or the oldest? Does it even matter? # Q: Should we be deleting the newest or the oldest? Does it even matter?
oldest_duplicate = db_contact.order_by("created_at").first() oldest_duplicate = db_contact.order_by("created_at").first()
# The linter wants this check on the id, though in practice # The linter wants this check on the id / oldest_duplicate, though in practice
# this should be otherwise impossible. # this should be otherwise impossible.
if hasattr(oldest_duplicate, "id"): if oldest_duplicate is not None and hasattr(oldest_duplicate, "id"):
# Exclude the oldest # Exclude the oldest
duplicates_to_delete = db_contact.exclude(id=oldest_duplicate.id) duplicates_to_delete = db_contact.exclude(id=oldest_duplicate.id)
else: else:
@ -1980,6 +1980,13 @@ class Domain(TimeStampedModel, DomainHelper):
# Delete all duplicates # Delete all duplicates
duplicates_to_delete.delete() duplicates_to_delete.delete()
# Do a second filter to grab the latest content
db_contact = PublicContact.objects.filter(
registry_id=public_contact.registry_id,
contact_type=public_contact.contact_type,
domain=self,
)
# 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:
# Doesn't run custom save logic, just saves to DB # Doesn't run custom save logic, just saves to DB