diff --git a/.github/workflows/clone-staging.yaml b/.github/workflows/clone-staging.yaml index 9ca590993..790246328 100644 --- a/.github/workflows/clone-staging.yaml +++ b/.github/workflows/clone-staging.yaml @@ -1,11 +1,9 @@ name: Clone Staging Database on: - # these will be uncommented after testing - # ---- - # schedule: - # # Run daily at 2:00 PM EST - # - cron: '0 * * * *' + schedule: + # Run daily at 2:00 PM EST + - cron: '0 * * * *' # Allow manual triggering workflow_dispatch: @@ -16,7 +14,7 @@ env: jobs: clone-database: - runs-on: ubuntu-latest + runs-on: ubuntu-24.04 env: CF_USERNAME: ${{ secrets.CF_MS_USERNAME }} CF_PASSWORD: ${{ secrets.CF_MS_PASSWORD }} @@ -26,9 +24,10 @@ jobs: # install cf cli and other tools wget -q -O - https://packages.cloudfoundry.org/debian/cli.cloudfoundry.org.key | sudo gpg --dearmor -o /usr/share/keyrings/cli.cloudfoundry.org.gpg echo "deb [signed-by=/usr/share/keyrings/cli.cloudfoundry.org.gpg] https://packages.cloudfoundry.org/debian stable main" | sudo tee /etc/apt/sources.list.d/cloudfoundry-cli.list - + sudo apt-get update - sudo apt-get install cf8-cli postgresql-client-common + sudo apt-get install cf8-cli + # install cg-manage-rds tool pip install git+https://github.com/cloud-gov/cg-manage-rds.git @@ -41,7 +40,8 @@ jobs: cf share-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT # clone from source to destination - cg-manage-rds clone getgov-$DESTINATION_ENVIRONMENT-database getgov-$SOURCE_ENVIRONMENT-database - - # unshare the service - cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT + cf target -s $SOURCE_ENVIRONMENT + cg-manage-rds clone getgov-$SOURCE_ENVIRONMENT-database getgov-$DESTINATION_ENVIRONMENT-database + - name: Cleanup + if: always() + run: cf unshare-service getgov-$DESTINATION_ENVIRONMENT-database -s $SOURCE_ENVIRONMENT -f diff --git a/docs/operations/runbooks/rotate_application_secrets.md b/docs/operations/runbooks/rotate_application_secrets.md index 1094b4ff7..1d36f6a74 100644 --- a/docs/operations/runbooks/rotate_application_secrets.md +++ b/docs/operations/runbooks/rotate_application_secrets.md @@ -3,7 +3,7 @@ Secrets are read from the running environment. -Secrets were originally created with: +Secrets are originally created with: ```sh cf cups getgov-credentials -p credentials-.json @@ -38,6 +38,49 @@ cf restage getgov-stable --strategy rolling Non-secret environment variables can be declared in `manifest-.json` directly. +## Rotating login.gov credentials +The DJANGO_SECRET_KEY and DJANGO_SECRET_LOGIN_KEY are reset once a year for each sandbox, see their sections below for more information on them and how to manually generate these keys. To save time, complete the following steps to rotate these credentials using a script in non-production environments: + +### Step 1 login + +To run the script make sure you are logged on the cf cli and make sure you have access to the [Login Partner Dashboard](https://dashboard.int.identitysandbox.gov/service_providers/2640). + +### Step 2 Run the script + +Run the following where "ENV" refers to whichever sandbox you want to reset credentials on. Note, the below assumes you are in the root directory of our app. + +```bash +ops/scripts/rotate_login_certs.sh ENV +``` + +### Step 3 Respond to the terminal prompts + +Respond to the prompts from the script and, when it asks for the cert information, the below is an example of what you should enter. Note for "Common Name" you should put the name of the sandbox and for "Email Address" it should be the address of who owns that sandbox (such as the developer's email, if it's a develop sandbox, or whoever ran this action otherwise) + +```bash +Country Name (2 letter code) [AU]:US +State or Province Name (full name) [Some-State]:DC +Locality Name (eg, city) []:DC +Organization Name (eg, company) [Internet Widgits Pty Ltd]:DHS +Organizational Unit Name (eg, section) []:CISA +Common Name (e.g. server FQDN or YOUR name) []:ENV +Email Address []: example@something.com +``` + +Note when this script is done it will have generated a .pem and a .crt file, as well as updated the cert info on the sandbox + +### Step 4 Delete the old cert + +Navigate to to the Login Partner Dashboard linked above and delete the old cert + +### Step 5 add the new cert + +In whichever directory you ran the script there should now be a .crt file named "public-ENV.crt", where ENV is the space name you used on Step 2. Upload this cert in the Login Partner Dashboard in the same section where you deleted the old one. + +### Production only + +This script should not be run in production. Instead, you will need to manually create the keys and then refrain from updating the sandbox. Once the cert is created you will upload it to the Login Partner Dashboard for our production system, and then open a ticket with them to update our existing Login.gov integration. Once they respond back saying it has been applied, you can then update the sandbox. + ## DJANGO_SECRET_KEY This is a standard Django secret key. See Django documentation for tips on generating a new one. @@ -46,6 +89,7 @@ This is a standard Django secret key. See Django documentation for tips on gener This is the base64 encoded private key used in the OpenID Connect authentication flow with Login.gov. It is used to sign a token during user login; the signature is examined by Login.gov before their API grants access to user data. +### Manually creating creating the Login Key Generate a new key using this command (or whatever is most recently [recommended by Login.gov](https://developers.login.gov/testing/#creating-a-public-certificate)): ```bash @@ -60,6 +104,8 @@ base64 private.pem You also need to upload the `public.crt` key if recently created to the login.gov identity sandbox: https://dashboard.int.identitysandbox.gov/ + + ## AWS_ACCESS_KEY_ID, AWS_SECRET_ACCESS_KEY To access the AWS Simple Email Service, we need credentials from the CISA AWS @@ -76,6 +122,8 @@ These are the client certificate and its private key used to identify the regist The private key is protected by a passphrase for safer transport and storage. +Note this must be reset once a year. + These were generated with the following steps: ### Step 1: Generate an unencrypted private key with a named curve @@ -90,7 +138,7 @@ openssl ecparam -name prime256v1 -genkey -out client_unencrypted.key openssl pkcs8 -topk8 -v2 aes-256-cbc -in client_unencrypted.key -out client.key ``` -### Generate the certificate +### Step 3: Generate the certificate ```bash openssl req -new -x509 -days 365 -key client.key -out client.crt -subj "/C=US/ST=DC/L=Washington/O=GSA/OU=18F/CN=GOV Prototype Registrar" @@ -112,7 +160,7 @@ base64 -i client.key base64 -i client.crt ``` -You'll need to give the new certificate to the registry vendor _before_ rotating it in production. Once it has been accepted by the vendor, make sure to update the kdbx file on Google Drive. +You'll need to give the new certificate to the registry vendor _before_ rotating it in production. Once it has been accepted by the vendor, make sure to update [the KBDX](https://docs.google.com/document/d/1_BbJmjYZNYLNh4jJPPnUEG9tFCzJrOc0nMrZrnSKKyw) file on Google Drive. ## REGISTRY_HOSTNAME diff --git a/ops/scripts/rotate_login_certs.sh b/ops/scripts/rotate_login_certs.sh new file mode 100755 index 000000000..31363fe36 --- /dev/null +++ b/ops/scripts/rotate_login_certs.sh @@ -0,0 +1,51 @@ +# This script rotates the login.gov credentials, DJANGO_SECRET_KEY and DJANGO_SECRET_LOGIN_KEY that allow for identity sandbox to work on sandboxes and local. +# The echo prints in this script should serve for documentation for running manually. +# Run this script once a year for each environment +# NOTE: This script was written for MacOS and to be run at the root directory. + + +if [ -z "$1" ]; then + echo 'Please specify a space to update (i.e. lmm)' >&2 + exit 1 +fi +echo "You need access to the Login partner dashboard, otherwise you will not be able to complete the steps in this script (https://dashboard.int.identitysandbox.gov/service_providers/2640)" +read -p " Do you have access to the partner dashboard mentioned above? (y/n) " -n 1 -r +echo +if [[ ! $REPLY =~ ^[Yy]$ ]]; then + exit 1 +fi + +if [ ! $(command -v jq) ] || [ ! $(command -v cf) ]; then + echo "jq, and cf packages must be installed. Please install via your preferred manager." + exit 1 +fi + +cf target -o cisa-dotgov + +read -p "Are you logged in to the cisa-dotgov CF org above? (y/n) " -n 1 -r +echo +if [[ ! $REPLY =~ ^[Yy]$ ]] +then + cf login -a https://api.fr.cloud.gov --sso +fi +echo "Targeting space" +cf target -o cisa-dotgov -s $1 + +echo "Creating new login.gov credentials for $1..." +django_key=$(python3 -c 'from django.core.management.utils import get_random_secret_key; print(get_random_secret_key())') +openssl req -noenc -x509 -days 365 -newkey rsa:2048 -keyout private-$1.pem -out public-$1.crt +login_key=$(base64 -i private-$1.pem) + +echo "Creating the final json" +cf env getgov-$1 | awk '/VCAP_SERVICES: /,/^$/' | sed s/VCAP_SERVICES:// | jq '."user-provided"[0].credentials' | jq --arg django_key "$django_key" --arg login_key "$login_key" '. + {"DJANGO_SECRET_KEY":$django_key, "DJANGO_SECRET_LOGIN_KEY":$login_key}' > credentials-$1.json + +echo "Updating creds on the sandbox" +cf uups getgov-credentials -p credentials-$1.json +cf restage getgov-$1 --strategy rolling + +echo "\n\n\nNow you will need to update some things for Login. Please sign-in to https://dashboard.int.identitysandbox.gov/." +echo "Navigate to our application config: https://dashboard.int.identitysandbox.gov/service_providers/2640/edit?" +echo "There are two things to update." +echo "1. Remove the old cert associated with the user's email (under Public Certificates)" +echo "2. You need to upload the public-$1.crt file generated as part of the previous command. See the "choose cert file" button under Public Certificates." +echo "Then, tell the developer to update their local .env file by retrieving their credentials from the sandbox" diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 8a0a458f8..0cab01d31 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -1640,6 +1640,70 @@ class StatusListFilter(MultipleChoiceListFilter): def lookups(self, request, model_admin): return DomainRequest.DomainRequestStatus.choices + class GenericOrgFilter(admin.SimpleListFilter): + """Custom Generic Organization filter that accomodates portfolio feature. + If we have a portfolio, use the portfolio's organization. If not, use the + organization in the Domain Request object.""" + + title = "generic organization" + parameter_name = "converted_generic_orgs" + + def lookups(self, request, model_admin): + converted_generic_orgs = set() + + for domain_request in DomainRequest.objects.all(): + converted_generic_org = domain_request.converted_generic_org_type + if converted_generic_org: + converted_generic_orgs.add(converted_generic_org) + + return sorted((org, org) for org in converted_generic_orgs) + + # Filter queryset + def queryset(self, request, queryset): + if self.value(): # Check if a generic org is selected in the filter + return queryset.filter( + # Filter based on the generic org value returned by converted_generic_org_type + id__in=[ + domain_request.id + for domain_request in queryset + if domain_request.converted_generic_org_type + and domain_request.converted_generic_org_type == self.value() + ] + ) + return queryset + + class FederalTypeFilter(admin.SimpleListFilter): + """Custom Federal Type filter that accomodates portfolio feature. + If we have a portfolio, use the portfolio's federal type. If not, use the + organization in the Domain Request object.""" + + title = "federal Type" + parameter_name = "converted_federal_types" + + def lookups(self, request, model_admin): + converted_federal_types = set() + + for domain_request in DomainRequest.objects.all(): + converted_federal_type = domain_request.converted_federal_type + if converted_federal_type: + converted_federal_types.add(converted_federal_type) + + return sorted((type, type) for type in converted_federal_types) + + # Filter queryset + def queryset(self, request, queryset): + if self.value(): # Check if federal Type is selected in the filter + return queryset.filter( + # Filter based on the federal type returned by converted_federal_type + id__in=[ + domain_request.id + for domain_request in queryset + if domain_request.converted_federal_type + and domain_request.converted_federal_type == self.value() + ] + ) + return queryset + class InvestigatorFilter(admin.SimpleListFilter): """Custom investigator filter that only displays users with the manager role""" @@ -1700,6 +1764,30 @@ def queryset(self, request, queryset): if self.value() == "0": return queryset.filter(Q(is_election_board=False) | Q(is_election_board=None)) + @admin.display(description=_("Generic Org Type")) + def converted_generic_org_type(self, obj): + return obj.converted_generic_org_type + + @admin.display(description=_("Organization Name")) + def converted_organization_name(self, obj): + return obj.converted_organization_name + + @admin.display(description=_("Federal Agency")) + def converted_federal_agency(self, obj): + return obj.converted_federal_agency + + @admin.display(description=_("Federal Type")) + def converted_federal_type(self, obj): + return obj.converted_federal_type + + @admin.display(description=_("City")) + def converted_city(self, obj): + return obj.converted_city + + @admin.display(description=_("State/Territory")) + def converted_state_territory(self, obj): + return obj.converted_state_territory + # Columns list_display = [ "requested_domain", @@ -1707,13 +1795,13 @@ def queryset(self, request, queryset): "last_submitted_date", "last_status_update", "status", - "generic_org_type", - "federal_type", - "federal_agency", - "organization_name", "custom_election_board", - "city", - "state_territory", + "converted_generic_org_type", + "converted_organization_name", + "converted_federal_agency", + "converted_federal_type", + "converted_city", + "converted_state_territory", "investigator", ] @@ -1738,8 +1826,8 @@ def status_history(self, obj): # Filters list_filter = ( StatusListFilter, - "generic_org_type", - "federal_type", + GenericOrgFilter, + FederalTypeFilter, ElectionOfficeFilter, "rejection_reason", InvestigatorFilter, @@ -1869,15 +1957,16 @@ def status_history(self, obj): "suborganization_city", "suborganization_state_territory", ] + autocomplete_fields = [ "approved_domain", "requested_domain", "creator", - "senior_official", "investigator", "portfolio", "sub_organization", ] + filter_horizontal = ("current_websites", "alternative_domains", "other_contacts") # Table ordering diff --git a/src/registrar/migrations/0137_suborganization_city_suborganization_state_territory.py b/src/registrar/migrations/0137_suborganization_city_suborganization_state_territory.py new file mode 100644 index 000000000..85e8cb60f --- /dev/null +++ b/src/registrar/migrations/0137_suborganization_city_suborganization_state_territory.py @@ -0,0 +1,90 @@ +# Generated by Django 4.2.10 on 2024-11-12 22:02 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("registrar", "0136_domainrequest_requested_suborganization_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="suborganization", + name="city", + field=models.CharField(blank=True, null=True), + ), + migrations.AddField( + model_name="suborganization", + name="state_territory", + field=models.CharField( + blank=True, + choices=[ + ("AL", "Alabama (AL)"), + ("AK", "Alaska (AK)"), + ("AS", "American Samoa (AS)"), + ("AZ", "Arizona (AZ)"), + ("AR", "Arkansas (AR)"), + ("CA", "California (CA)"), + ("CO", "Colorado (CO)"), + ("CT", "Connecticut (CT)"), + ("DE", "Delaware (DE)"), + ("DC", "District of Columbia (DC)"), + ("FL", "Florida (FL)"), + ("GA", "Georgia (GA)"), + ("GU", "Guam (GU)"), + ("HI", "Hawaii (HI)"), + ("ID", "Idaho (ID)"), + ("IL", "Illinois (IL)"), + ("IN", "Indiana (IN)"), + ("IA", "Iowa (IA)"), + ("KS", "Kansas (KS)"), + ("KY", "Kentucky (KY)"), + ("LA", "Louisiana (LA)"), + ("ME", "Maine (ME)"), + ("MD", "Maryland (MD)"), + ("MA", "Massachusetts (MA)"), + ("MI", "Michigan (MI)"), + ("MN", "Minnesota (MN)"), + ("MS", "Mississippi (MS)"), + ("MO", "Missouri (MO)"), + ("MT", "Montana (MT)"), + ("NE", "Nebraska (NE)"), + ("NV", "Nevada (NV)"), + ("NH", "New Hampshire (NH)"), + ("NJ", "New Jersey (NJ)"), + ("NM", "New Mexico (NM)"), + ("NY", "New York (NY)"), + ("NC", "North Carolina (NC)"), + ("ND", "North Dakota (ND)"), + ("MP", "Northern Mariana Islands (MP)"), + ("OH", "Ohio (OH)"), + ("OK", "Oklahoma (OK)"), + ("OR", "Oregon (OR)"), + ("PA", "Pennsylvania (PA)"), + ("PR", "Puerto Rico (PR)"), + ("RI", "Rhode Island (RI)"), + ("SC", "South Carolina (SC)"), + ("SD", "South Dakota (SD)"), + ("TN", "Tennessee (TN)"), + ("TX", "Texas (TX)"), + ("UM", "United States Minor Outlying Islands (UM)"), + ("UT", "Utah (UT)"), + ("VT", "Vermont (VT)"), + ("VI", "Virgin Islands (VI)"), + ("VA", "Virginia (VA)"), + ("WA", "Washington (WA)"), + ("WV", "West Virginia (WV)"), + ("WI", "Wisconsin (WI)"), + ("WY", "Wyoming (WY)"), + ("AA", "Armed Forces Americas (AA)"), + ("AE", "Armed Forces Africa, Canada, Europe, Middle East (AE)"), + ("AP", "Armed Forces Pacific (AP)"), + ], + max_length=2, + null=True, + verbose_name="state, territory, or military post", + ), + ), + ] diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index ca4b322be..0d8bbd5cf 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -1409,3 +1409,48 @@ def _form_complete(self, request): if not is_complete or not self._is_general_form_complete(request): return False return True + + """The following converted_ property methods get field data from this domain request's portfolio, + if there is an associated portfolio. If not, they return data from the domain request model.""" + + @property + def converted_organization_name(self): + if self.portfolio: + return self.portfolio.organization_name + return self.organization_name + + @property + def converted_generic_org_type(self): + if self.portfolio: + return self.portfolio.organization_type + return self.generic_org_type + + @property + def converted_federal_agency(self): + if self.portfolio: + return self.portfolio.federal_agency + return self.federal_agency + + @property + def converted_federal_type(self): + if self.portfolio: + return self.portfolio.federal_type + return self.federal_type + + @property + def converted_city(self): + if self.portfolio: + return self.portfolio.city + return self.city + + @property + def converted_state_territory(self): + if self.portfolio: + return self.portfolio.state_territory + return self.state_territory + + @property + def converted_senior_official(self): + if self.portfolio: + return self.portfolio.senior_official + return self.senior_official diff --git a/src/registrar/models/suborganization.py b/src/registrar/models/suborganization.py index 6ad80fdc0..087490244 100644 --- a/src/registrar/models/suborganization.py +++ b/src/registrar/models/suborganization.py @@ -1,4 +1,6 @@ from django.db import models + +from registrar.models.domain_request import DomainRequest from .utility.time_stamped_model import TimeStampedModel @@ -19,5 +21,18 @@ class Suborganization(TimeStampedModel): related_name="portfolio_suborganizations", ) + city = models.CharField( + null=True, + blank=True, + ) + + state_territory = models.CharField( + max_length=2, + choices=DomainRequest.StateTerritoryChoices.choices, + null=True, + blank=True, + verbose_name="state, territory, or military post", + ) + def __str__(self) -> str: return f"{self.name}" diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py index 57d7d9ac6..27dfcc7d1 100644 --- a/src/registrar/tests/test_admin_request.py +++ b/src/registrar/tests/test_admin_request.py @@ -576,9 +576,9 @@ def test_short_org_name_in_domain_requests_list(self): response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal") # There are 2 template references to Federal (4) and two in the results data # of the request - self.assertContains(response, "Federal", count=52) + self.assertContains(response, "Federal", count=51) # This may be a bit more robust - self.assertContains(response, 'Federal', count=1) + self.assertContains(response, 'federal', count=1) # Now let's make sure the long description does not exist self.assertNotContains(response, "Federal: an agency of the U.S. government") @@ -1935,8 +1935,8 @@ def test_has_correct_filters(self): readonly_fields = self.admin.get_list_filter(request) expected_fields = ( DomainRequestAdmin.StatusListFilter, - "generic_org_type", - "federal_type", + DomainRequestAdmin.GenericOrgFilter, + DomainRequestAdmin.FederalTypeFilter, DomainRequestAdmin.ElectionOfficeFilter, "rejection_reason", DomainRequestAdmin.InvestigatorFilter, diff --git a/src/registrar/tests/test_models_requests.py b/src/registrar/tests/test_models_requests.py index 339841be0..da474224c 100644 --- a/src/registrar/tests/test_models_requests.py +++ b/src/registrar/tests/test_models_requests.py @@ -14,6 +14,7 @@ DraftDomain, FederalAgency, AllowedEmail, + Portfolio, ) import boto3_mocking @@ -95,6 +96,7 @@ def tearDown(self): DomainRequest.objects.all().delete() DraftDomain.objects.all().delete() Domain.objects.all().delete() + Portfolio.objects.all().delete() User.objects.all().delete() self.mock_client.EMAILS_SENT.clear() @@ -1045,3 +1047,26 @@ def test_has_other_contacts_returns_false(self): status=DomainRequest.DomainRequestStatus.STARTED, name="no-others.gov", has_other_contacts=False ) self.assertEquals(domain_request.has_other_contacts(), False) + + @less_console_noise_decorator + def test_converted_type(self): + """test that new property fields works as expected to pull domain req info such as fed agency, + generic org type, and others from portfolio""" + fed_agency = FederalAgency.objects.filter(agency="Non-Federal Agency").first() + portfolio = Portfolio.objects.create( + organization_name="Test Portfolio", + creator=self.dummy_user_2, + federal_agency=fed_agency, + organization_type=DomainRequest.OrganizationChoices.FEDERAL, + ) + + domain_request = completed_domain_request(name="domainre1.gov", portfolio=portfolio) + + self.assertEqual(portfolio.organization_type, domain_request.converted_generic_org_type) + self.assertEqual(portfolio.federal_agency, domain_request.converted_federal_agency) + + domain_request2 = completed_domain_request( + name="domainreq2.gov", federal_agency=fed_agency, generic_org_type=DomainRequest.OrganizationChoices.TRIBAL + ) + self.assertEqual(domain_request2.generic_org_type, domain_request2.converted_generic_org_type) + self.assertEqual(domain_request2.federal_agency, domain_request2.converted_federal_agency) diff --git a/src/registrar/tests/test_reports.py b/src/registrar/tests/test_reports.py index b7f1653d3..ae1b3b1c1 100644 --- a/src/registrar/tests/test_reports.py +++ b/src/registrar/tests/test_reports.py @@ -701,6 +701,7 @@ def test_domain_request_growth(self): csv_file.seek(0) # Read the content into a variable csv_content = csv_file.read() + expected_content = ( "Domain request,Domain type,Federal type\n" "city3.gov,Federal,Executive\n" diff --git a/src/registrar/utility/csv_export.py b/src/registrar/utility/csv_export.py index 2e5ee4d91..64d960337 100644 --- a/src/registrar/utility/csv_export.py +++ b/src/registrar/utility/csv_export.py @@ -660,17 +660,17 @@ def exporting_dr_data_to_csv(cls, response, request=None): cls.safe_get(getattr(request, "all_alternative_domains", None)), cls.safe_get(getattr(request, "all_other_contacts", None)), cls.safe_get(getattr(request, "all_current_websites", None)), - cls.safe_get(getattr(request, "federal_agency", None)), - cls.safe_get(getattr(request.senior_official, "first_name", None)), - cls.safe_get(getattr(request.senior_official, "last_name", None)), - cls.safe_get(getattr(request.senior_official, "email", None)), - cls.safe_get(getattr(request.senior_official, "title", None)), + cls.safe_get(getattr(request, "converted_federal_agency", None)), + cls.safe_get(getattr(request.converted_senior_official, "first_name", None)), + cls.safe_get(getattr(request.converted_senior_official, "last_name", None)), + cls.safe_get(getattr(request.converted_senior_official, "email", None)), + cls.safe_get(getattr(request.converted_senior_official, "title", None)), cls.safe_get(getattr(request.creator, "first_name", None)), cls.safe_get(getattr(request.creator, "last_name", None)), cls.safe_get(getattr(request.creator, "email", None)), - cls.safe_get(getattr(request, "organization_name", None)), - cls.safe_get(getattr(request, "city", None)), - cls.safe_get(getattr(request, "state_territory", None)), + cls.safe_get(getattr(request, "converted_organization_name", None)), + cls.safe_get(getattr(request, "converted_city", None)), + cls.safe_get(getattr(request, "converted_state_territory", None)), cls.safe_get(getattr(request, "purpose", None)), cls.safe_get(getattr(request, "cisa_representative_email", None)), cls.safe_get(getattr(request, "last_submitted_date", None)),