zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-27 13:06:30 +02:00
Code Issues Projects Releases Packages Wiki Activity

Normalize name and clear fed agency in some cases

Browse source
This commit is contained in:
zandercymatics 2025-01-07 12:32:56 -07:00
parent e55535b19d
commit 3a356c6055
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
5 changed files with 127 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/registrar/models/domain_request.py
View file

@ -8,7 +8,7 @@ from django_fsm import FSMField, transition # type: ignore
from django.utils import timezone
from registrar.models.domain import Domain
from registrar.models.federal_agency import FederalAgency
from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper
from registrar.models.utility.generic_helper import CreateOrUpdateOrganizationTypeHelper, normalize_string
from registrar.utility.errors import FSMDomainRequestError, FSMErrorCodes
from registrar.utility.constants import BranchChoices
from auditlog.models import LogEntry
@ -729,6 +729,7 @@ class DomainRequest(TimeStampedModel):
"""Save override for custom properties"""
self.sync_organization_type()
self.sync_yes_no_form_fields()
self.sync_portfolio_and_federal_agency_for_started_requests()
if self._cached_status != self.status:
self.last_status_update = timezone.now().date()
@ -744,6 +745,22 @@ class DomainRequest(TimeStampedModel):
# Update the cached values after saving
self._cache_status_and_status_reasons()
def sync_portfolio_and_federal_agency_for_started_requests(self) -> bool:
"""
Prevents duplicate organization data by clearing the federal_agency field if it matches the portfolio.
Only runs on STARTED requests.
Returns a bool indicating if the federal agency was changed or not.
"""
agency_name = getattr(self.federal_agency, "agency", None)
portfolio_name = getattr(self.portfolio, "organization_name", None)
if portfolio_name and agency_name and self.status == DomainRequest.DomainRequestStatus.STARTED:
if normalize_string(agency_name) == normalize_string(portfolio_name):
self.federal_agency = None
return True
return False
def create_requested_suborganization(self):
"""Creates the requested suborganization.
Adds the name, portfolio, city, and state_territory fields.