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

Refactored storage of CISA rep info to NOT use Contacts model

Browse source
This commit is contained in:
CocoByte 2024-05-31 15:39:40 -06:00
parent 9fecf11558
commit 8af8a8c670
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
12 changed files with 164 additions and 132 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -457,13 +457,25 @@ class DomainRequest(TimeStampedModel):
help_text="Determines if the user has a anything_else or not",
)
cisa_representative = models.ForeignKey(
"registrar.Contact",
cisa_representative_email = models.EmailField(
null=True,
blank=True,
related_name="cisa_representative_domain_requests",
on_delete=models.PROTECT,
help_text='Cisa Representative listed under "additional information" in the request form',
verbose_name="CISA regional representative email",
max_length=320,
)
cisa_representative_first_name = models.CharField(
null=True,
blank=True,
verbose_name="CISA regional representative first name",
db_index=True,
)
cisa_representative_last_name = models.CharField(
null=True,
blank=True,
verbose_name="CISA regional representative last name",
db_index=True,
)
# This is a drop-in replacement for an has_cisa_representative() function.
@ -536,17 +548,18 @@ class DomainRequest(TimeStampedModel):
We handle that here for def save().
"""
cisa_rep_is_not_none = self.cisa_representative is not None
cisa_first_name = None
# This ensures that if we have prefilled data, the form is prepopulated
if cisa_rep_is_not_none:
cisa_first_name = self.cisa_representative.first_name
self.has_cisa_representative = cisa_first_name is not None and cisa_first_name != ""
# NOTE: this relies on the fact that the first and last names of a CISA representative
# are required fields. Because of this, we can simplify the check to only look at the
# first name to determine whether or not a CISA representative was provided.
if self.cisa_representative_first_name is not None:
self.has_cisa_representative = self.cisa_representative_first_name != ""
# This check is required to ensure that the form doesn't start out checked
if self.has_cisa_representative is not None:
self.has_cisa_representative = cisa_first_name is not None and cisa_first_name != ""
self.has_cisa_representative = (
self.cisa_representative_first_name != "" and self.cisa_representative_first_name is not None
)
# This ensures that if we have prefilled data, the form is prepopulated
if self.anything_else is not None: