From d0a5bddba3a74f1c4c52aee81d2c7c240a562050 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Wed, 17 Apr 2024 14:36:28 -0700 Subject: [PATCH] Add new model field to transition federal agency for domain information and domain request --- src/registrar/admin.py | 8 +++-- ...rmation_updated_federal_agency_and_more.py | 36 +++++++++++++++++++ src/registrar/models/domain_information.py | 5 +-- src/registrar/models/domain_request.py | 5 +-- 4 files changed, 48 insertions(+), 6 deletions(-) create mode 100644 src/registrar/migrations/0085_domaininformation_updated_federal_agency_and_more.py diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 1275fab79..ddca756ba 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -959,7 +959,9 @@ class DomainInformationAdmin(ListHeaderAdmin): "classes": ["collapse"], "fields": [ "federal_type", - "federal_agency", + "updated_federal_agency", + # The above field will be commented out after approval so we don't display to everyone + "federal_agency", # TODO: remove later "tribe_name", "federally_recognized_tribe", "state_recognized_tribe", @@ -1198,7 +1200,9 @@ class DomainRequestAdmin(ListHeaderAdmin): "classes": ["collapse"], "fields": [ "federal_type", - "federal_agency", + "updated_federal_agency", + # The above field will be commented out after approval so we don't display to everyone + "federal_agency", # TODO: remove later "tribe_name", "federally_recognized_tribe", "state_recognized_tribe", diff --git a/src/registrar/migrations/0085_domaininformation_updated_federal_agency_and_more.py b/src/registrar/migrations/0085_domaininformation_updated_federal_agency_and_more.py new file mode 100644 index 000000000..8f109abe0 --- /dev/null +++ b/src/registrar/migrations/0085_domaininformation_updated_federal_agency_and_more.py @@ -0,0 +1,36 @@ +# Generated by Django 4.2.10 on 2024-04-17 20:28 + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ("registrar", "0084_create_groups_v11"), + ] + + operations = [ + migrations.AddField( + model_name="domaininformation", + name="updated_federal_agency", + field=models.ForeignKey( + blank=True, + help_text="Associated federal agency", + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="registrar.federalagency", + ), + ), + migrations.AddField( + model_name="domainrequest", + name="updated_federal_agency", + field=models.ForeignKey( + blank=True, + help_text="Associated federal agency", + null=True, + on_delete=django.db.models.deletion.PROTECT, + to="registrar.federalagency", + ), + ), + ] diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index e8ba4f83f..9e56fad77 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -32,12 +32,13 @@ class DomainInformation(TimeStampedModel): # TODO for #1975: Delete this after we run the new migration AGENCY_CHOICES = DomainRequest.AGENCY_CHOICES - # TODO: Confirm if we want federal_agency or just agency - federal_agency = models.ForeignKey( + updated_federal_agency = models.ForeignKey( "registrar.FederalAgency", on_delete=models.PROTECT, help_text="Associated federal agency", unique=False, + blank=True, + null=True, ) # This is the domain request user who created this domain request. The contact diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 396c3006f..45efb8b8c 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -449,12 +449,13 @@ class DomainRequest(TimeStampedModel): blank=True, ) - # TODO: Confirm if we want federal_agency or just agency - federal_agency = models.ForeignKey( + updated_federal_agency = models.ForeignKey( "registrar.FederalAgency", on_delete=models.PROTECT, help_text="Associated federal agency", unique=False, + blank=True, + null=True, ) # This is the domain request user who created this domain request. The contact