Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(ignore) #3341

Closed
wants to merge 2 commits into from
Closed

(ignore) #3341

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
828c47d
Better table + simplify get_or_create function
zandercymatics Jan 13, 2025
c0c9817
Update admin.py
zandercymatics Jan 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/registrar/admin.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3835,6 +3835,9 @@ class PublicContactAdmin(ListHeaderAdmin, ImportExportModelAdmin):

change_form_template = "django/admin/email_clipboard_change_form.html"
autocomplete_fields = ["domain"]
list_display = ("name", "contact_type", "email", "domain", "registry_id")
search_fields = ["email", "name", "registry_id"]
search_help_text = "Search by email, name or registry id."

def changeform_view(self, request, object_id=None, form_url="", extra_context=None):
if extra_context is None:
Expand Down
68 changes: 27 additions & 41 deletions src/registrar/models/domain.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
import re
from datetime import date, timedelta
from typing import Optional
from django.db import transaction
from django_fsm import FSMField, transition, TransitionNotAllowed # type: ignore

from django.db import models
from django.db import models, IntegrityError
from django.utils import timezone
from typing import Any
from registrar.models.host import Host
Expand Down Expand Up @@ -2077,49 +2077,35 @@ def _get_hosts(self, hosts):
def _get_or_create_public_contact(self, public_contact: PublicContact):
"""Tries to find a PublicContact object in our DB.
If it can't, it'll create it. Returns PublicContact"""
db_contact = PublicContact.objects.filter(
registry_id=public_contact.registry_id,
contact_type=public_contact.contact_type,
domain=self,
)

# If we find duplicates, log it and delete the oldest ones.
if db_contact.count() > 1:
logger.warning("_get_or_create_public_contact() -> Duplicate contacts found. Deleting duplicate.")

newest_duplicate = db_contact.order_by("-created_at").first()

duplicates_to_delete = db_contact.exclude(id=newest_duplicate.id) # type: ignore

# Delete all duplicates
duplicates_to_delete.delete()

# Do a second filter to grab the latest content
db_contact = PublicContact.objects.filter(
try:
with transaction.atomic():
contact, _ = PublicContact.objects.get_or_create(
registry_id=public_contact.registry_id,
contact_type=public_contact.contact_type,
domain=self,
defaults={
"email": public_contact.email,
"voice": public_contact.voice,
"fax": public_contact.fax,
"name": public_contact.name,
"org": public_contact.org,
"pw": public_contact.pw,
"city": public_contact.city,
"pc": public_contact.pc,
"cc": public_contact.cc,
"sp": public_contact.sp,
"street1": public_contact.street1,
"street2": public_contact.street2,
"street3": public_contact.street3,
}
)
except IntegrityError:
contact = PublicContact.objects.get(
registry_id=public_contact.registry_id,
contact_type=public_contact.contact_type,
domain=self,
)

# Save to DB if it doesn't exist already.
if db_contact.count() == 0:
# Doesn't run custom save logic, just saves to DB
public_contact.save(skip_epp_save=True)
logger.info(f"Created a new PublicContact: {public_contact}")
# Append the item we just created
return public_contact

existing_contact = db_contact.get()

# Does the item we're grabbing match what we have in our DB?
if existing_contact.email != public_contact.email or existing_contact.registry_id != public_contact.registry_id:
existing_contact.delete()
public_contact.save()
logger.warning("Requested PublicContact is out of sync " "with DB.")
return public_contact

# If it already exists, we can assume that the DB instance was updated during set, so we should just use that.
return existing_contact
return contact

def _registrant_to_public_contact(self, registry_id: str):
"""EPPLib returns the registrant as a string,
Expand Down
Loading