zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-16 15:55:58 +02:00
Code Issues Projects Releases Packages Wiki Activity

updated authorizing official to senior official

Browse source
This commit is contained in:
David Kennedy 2024-07-04 08:52:15 -04:00
parent e0053fa319
commit d6d178e4e1
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
2 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/registrar/tests/test_reports.py
View file

@ -207,7 +207,7 @@ class ExportDataTest(MockDb, MockEppLib):
@less_console_noise_decorator @less_console_noise_decorator
def test_domain_data_type(self): def test_domain_data_type(self):
"""Shows security contacts, domain managers, ao""" """Shows security contacts, domain managers, so"""
# Add security email information # Add security email information
self.domain_1.name = "defaultsecurity.gov" self.domain_1.name = "defaultsecurity.gov"
self.domain_1.save() self.domain_1.save()
@ -231,8 +231,8 @@ class ExportDataTest(MockDb, MockEppLib):
# We expect READY domains, # We expect READY domains,
# sorted alphabetially by domain name # sorted alphabetially by domain name
expected_content = ( expected_content = (
"Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name,City,State,AO," "Domain name,Status,First ready on,Expiration date,Domain type,Agency,Organization name,City,State,SO,"
"AO email,Security contact email,Domain managers,Invited domain managers\n" "SO email,Security contact email,Domain managers,Invited domain managers\n"
"cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,World War I Centennial Commission,,,, ,,," "cdomain11.gov,Ready,2024-04-02,(blank),Federal - Executive,World War I Centennial Commission,,,, ,,,"
"meoward@rocks.com,\n" "meoward@rocks.com,\n"
"defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,World War I Centennial Commission,,," "defaultsecurity.gov,Ready,2023-11-01,(blank),Federal - Executive,World War I Centennial Commission,,,"
@ -534,10 +534,10 @@ class ExportDataTest(MockDb, MockEppLib):
"Creator approved domains count", "Creator approved domains count",
"Creator active requests count", "Creator active requests count",
"Alternative domains", "Alternative domains",
"AO first name", "SO first name",
"AO last name", "SO last name",
"AO email", "SO email",
"AO title/role", "SO title/role",
"Request purpose", "Request purpose",
"Request additional details", "Request additional details",
"Other contacts", "Other contacts",
@ -560,8 +560,8 @@ class ExportDataTest(MockDb, MockEppLib):
"Domain request,Status,Domain type,Federal type," "Domain request,Status,Domain type,Federal type,"
"Federal agency,Organization name,Election office,City,State/territory," "Federal agency,Organization name,Election office,City,State/territory,"
"Region,Creator first name,Creator last name,Creator email,Creator approved domains count," "Region,Creator first name,Creator last name,Creator email,Creator approved domains count,"
"Creator active requests count,Alternative domains,AO first name,AO last name,AO email," "Creator active requests count,Alternative domains,SO first name,SO last name,SO email,"
"AO title/role,Request purpose,Request additional details,Other contacts," "SO title/role,Request purpose,Request additional details,Other contacts,"
"CISA regional representative,Current websites,Investigator\n" "CISA regional representative,Current websites,Investigator\n"
# Content # Content
"city5.gov,,Approved,Federal,Executive,,Testorg,N/A,,NY,2,,,,1,0,city1.gov,Testy,Tester,testy@town.com," "city5.gov,,Approved,Federal,Executive,,Testorg,N/A,,NY,2,,,,1,0,city1.gov,Testy,Tester,testy@town.com,"
@ -633,4 +633,4 @@ class HelperFunctions(MockDb):
} }
submitted_requests_sliced_at_end_date = DomainRequestExport.get_sliced_requests(filter_condition) submitted_requests_sliced_at_end_date = DomainRequestExport.get_sliced_requests(filter_condition)
expected_content = [3, 2, 0, 0, 0, 0, 1, 0, 0, 1] expected_content = [3, 2, 0, 0, 0, 0, 1, 0, 0, 1]
self.assertEqual(submitted_requests_sliced_at_end_date, expected_content) self.assertEqual(submitted_requests_sliced_at_end_date, expected_content)

58
src/registrar/utility/csv_export.py
View file

@ -382,8 +382,8 @@ class DomainExport(BaseExport):
"Organization name": model.get("organization_name"), "Organization name": model.get("organization_name"),
"City": model.get("city"), "City": model.get("city"),
"State": model.get("state_territory"), "State": model.get("state_territory"),
"AO": model.get("ao_name"), "SO": model.get("so_name"),
"AO email": model.get("authorizing_official__email"), "SO email": model.get("senior_official__email"),
"Security contact email": model.get("security_contact_email"), "Security contact email": model.get("security_contact_email"),
"Created at": model.get("domain__created_at"), "Created at": model.get("domain__created_at"),
"Deleted": model.get("domain__deleted"), "Deleted": model.get("domain__deleted"),
@ -435,7 +435,7 @@ class DomainExport(BaseExport):
class DomainDataType(DomainExport): class DomainDataType(DomainExport):
""" """
Shows security contacts, domain managers, ao Shows security contacts, domain managers, so
Inherits from BaseExport -> DomainExport Inherits from BaseExport -> DomainExport
""" """
@ -454,8 +454,8 @@ class DomainDataType(DomainExport):
"Organization name", "Organization name",
"City", "City",
"State", "State",
"AO", "SO",
"AO email", "SO email",
"Security contact email", "Security contact email",
"Domain managers", "Domain managers",
"Invited domain managers", "Invited domain managers",
@ -502,7 +502,7 @@ class DomainDataType(DomainExport):
""" """
Get a list of tables to pass to select_related when building queryset. Get a list of tables to pass to select_related when building queryset.
""" """
return ["domain", "authorizing_official"] return ["domain", "senior_official"]
@classmethod @classmethod
def get_prefetch_related(cls): def get_prefetch_related(cls):
@ -517,10 +517,10 @@ class DomainDataType(DomainExport):
Get a dict of computed fields. Get a dict of computed fields.
""" """
return { return {
"ao_name": Concat( "so_name": Concat(
Coalesce(F("authorizing_official__first_name"), Value("")), Coalesce(F("senior_official__first_name"), Value("")),
Value(" "), Value(" "),
Coalesce(F("authorizing_official__last_name"), Value("")), Coalesce(F("senior_official__last_name"), Value("")),
output_field=CharField(), output_field=CharField(),
), ),
} }
@ -538,7 +538,7 @@ class DomainDataType(DomainExport):
"domain__created_at", "domain__created_at",
"domain__deleted", "domain__deleted",
"domain__security_contact_registry_id", "domain__security_contact_registry_id",
"authorizing_official__email", "senior_official__email",
"federal_agency__agency", "federal_agency__agency",
] ]
@ -618,10 +618,10 @@ class DomainDataFull(DomainExport):
Get a dict of computed fields. Get a dict of computed fields.
""" """
return { return {
"ao_name": Concat( "so_name": Concat(
Coalesce(F("authorizing_official__first_name"), Value("")), Coalesce(F("senior_official__first_name"), Value("")),
Value(" "), Value(" "),
Coalesce(F("authorizing_official__last_name"), Value("")), Coalesce(F("senior_official__last_name"), Value("")),
output_field=CharField(), output_field=CharField(),
), ),
} }
@ -714,10 +714,10 @@ class DomainDataFederal(DomainExport):
Get a dict of computed fields. Get a dict of computed fields.
""" """
return { return {
"ao_name": Concat( "so_name": Concat(
Coalesce(F("authorizing_official__first_name"), Value("")), Coalesce(F("senior_official__first_name"), Value("")),
Value(" "), Value(" "),
Coalesce(F("authorizing_official__last_name"), Value("")), Coalesce(F("senior_official__last_name"), Value("")),
output_field=CharField(), output_field=CharField(),
), ),
} }
@ -1181,10 +1181,10 @@ class DomainRequestExport(BaseExport):
"Current websites": model.get("all_current_websites"), "Current websites": model.get("all_current_websites"),
# Untouched FK fields - passed into the request dict. # Untouched FK fields - passed into the request dict.
"Federal agency": model.get("federal_agency__agency"), "Federal agency": model.get("federal_agency__agency"),
"AO first name": model.get("authorizing_official__first_name"), "SO first name": model.get("senior_official__first_name"),
"AO last name": model.get("authorizing_official__last_name"), "SO last name": model.get("senior_official__last_name"),
"AO email": model.get("authorizing_official__email"), "SO email": model.get("senior_official__email"),
"AO title/role": model.get("authorizing_official__title"), "SO title/role": model.get("senior_official__title"),
"Creator first name": model.get("creator__first_name"), "Creator first name": model.get("creator__first_name"),
"Creator last name": model.get("creator__last_name"), "Creator last name": model.get("creator__last_name"),
"Creator email": model.get("creator__email"), "Creator email": model.get("creator__email"),
@ -1280,10 +1280,10 @@ class DomainRequestDataFull(DomainRequestExport):
"Creator approved domains count", "Creator approved domains count",
"Creator active requests count", "Creator active requests count",
"Alternative domains", "Alternative domains",
"AO first name", "SO first name",
"AO last name", "SO last name",
"AO email", "SO email",
"AO title/role", "SO title/role",
"Request purpose", "Request purpose",
"Request additional details", "Request additional details",
"Other contacts", "Other contacts",
@ -1297,7 +1297,7 @@ class DomainRequestDataFull(DomainRequestExport):
""" """
Get a list of tables to pass to select_related when building queryset. Get a list of tables to pass to select_related when building queryset.
""" """
return ["creator", "authorizing_official", "federal_agency", "investigator", "requested_domain"] return ["creator", "senior_official", "federal_agency", "investigator", "requested_domain"]
@classmethod @classmethod
def get_prefetch_related(cls): def get_prefetch_related(cls):
@ -1355,10 +1355,10 @@ class DomainRequestDataFull(DomainRequestExport):
return [ return [
"requested_domain__name", "requested_domain__name",
"federal_agency__agency", "federal_agency__agency",
"authorizing_official__first_name", "senior_official__first_name",
"authorizing_official__last_name", "senior_official__last_name",
"authorizing_official__email", "senior_official__email",
"authorizing_official__title", "senior_official__title",
"creator__first_name", "creator__first_name",
"creator__last_name", "creator__last_name",
"creator__email", "creator__email",