zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-14 13:34:10 +02:00
Code Issues Projects Releases Packages Wiki Activity

PR suggestions

Browse source
This commit is contained in:
zandercymatics 2024-01-23 08:26:47 -07:00
parent 8a75c8fcd6
commit 7c4a0a6de5
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 18 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/registrar/models/utility/domain_helper.py
View file

@ -57,9 +57,6 @@ class DomainHelper:
# If blank ok is true, just return the domain # If blank ok is true, just return the domain
return domain return domain
if domain.startswith("www."):
domain = domain[4:]
if domain.endswith(".gov"): if domain.endswith(".gov"):
domain = domain[:-4] domain = domain[:-4]

21
src/registrar/views/application.py
View file

@ -658,13 +658,28 @@ class DomainApplicationDeleteView(DomainApplicationPermissionDeleteView):
# This determines if any of these three fields share a contact, which is used for # This determines if any of these three fields share a contact, which is used for
# the edge case where the same user may be an AO, and a submitter, for example. # the edge case where the same user may be an AO, and a submitter, for example.
if len(duplicates) > 0: if len(duplicates) > 0:
duplicates_to_delete, _ = self._get_orphaned_contacts(application) duplicates_to_delete, _ = self._get_orphaned_contacts(application, check_db=True)
Contact.objects.filter(id__in=duplicates_to_delete, user=None).delete() Contact.objects.filter(id__in=duplicates_to_delete, user=None).delete()
return response return response
def _get_orphaned_contacts(self, application: DomainApplication, check_db=True): def _get_orphaned_contacts(self, application: DomainApplication, check_db=False):
"""Collects all orphaned contacts""" """
Collects all orphaned contacts associated with a given DomainApplication object.
An orphaned contact is defined as a contact that is associated with the application,
but not with any other application. This includes the authorizing official, the submitter,
and any other contacts linked to the application.
Parameters:
application (DomainApplication): The DomainApplication object for which to find orphaned contacts.
check_db (bool, optional): A flag indicating whether to check the database for the existence of the contacts.
Defaults to False.
Returns:
tuple: A tuple containing two lists. The first list contains the IDs of the orphaned contacts.
The second list contains any duplicate contacts found. ([Contacts], [Contacts])
"""
contacts_to_delete = [] contacts_to_delete = []
# Get each contact object on the DomainApplication object # Get each contact object on the DomainApplication object