Merge pull request #2990 from cisagov/ms/2936-filter-current-csvs

2936: Filter domains in DNS_NEEDED out of csv reports - MS
This commit is contained in:
Matt-Spence 2024-10-28 14:46:00 -05:00 committed by GitHub
commit c787d82700
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 6 deletions

View file

@ -89,7 +89,6 @@ class CsvReportsTest(MockDbForSharedTests):
call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"), call("cdomain1.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\r\n"),
call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), call("adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"),
call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"), call("ddomain3.gov,Federal,Armed Forces Retirement Home,,,,(blank)\r\n"),
call("adomain2.gov,Interstate,,,,,(blank)\r\n"),
call("zdomain12.gov,Interstate,,,,,(blank)\r\n"), call("zdomain12.gov,Interstate,,,,,(blank)\r\n"),
] ]
# We don't actually want to write anything for a test case, # We don't actually want to write anything for a test case,
@ -470,8 +469,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
# Invoke setter # Invoke setter
self.domain_1.security_contact self.domain_1.security_contact
# Invoke setter # Invoke setter
self.domain_2.security_contact
# Invoke setter
self.domain_3.security_contact self.domain_3.security_contact
# Add a first ready date on the first domain. Leaving the others blank. # Add a first ready date on the first domain. Leaving the others blank.
self.domain_1.first_ready = get_default_start_date() self.domain_1.first_ready = get_default_start_date()
@ -492,7 +489,6 @@ class ExportDataTest(MockDbForIndividualTests, MockEppLib):
"defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n" "defaultsecurity.gov,Federal - Executive,World War I Centennial Commission,,,,(blank)\n"
"adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n" "adomain10.gov,Federal,Armed Forces Retirement Home,,,,(blank)\n"
"ddomain3.gov,Federal,Armed Forces Retirement Home,,,,security@mail.gov\n" "ddomain3.gov,Federal,Armed Forces Retirement Home,,,,security@mail.gov\n"
"adomain2.gov,Interstate,,,,,(blank)\n"
"zdomain12.gov,Interstate,,,,,(blank)\n" "zdomain12.gov,Interstate,,,,,(blank)\n"
) )
# Normalize line endings and remove commas, # Normalize line endings and remove commas,

View file

@ -746,7 +746,6 @@ class DomainDataFull(DomainExport):
return Q( return Q(
domain__state__in=[ domain__state__in=[
Domain.State.READY, Domain.State.READY,
Domain.State.DNS_NEEDED,
Domain.State.ON_HOLD, Domain.State.ON_HOLD,
], ],
) )
@ -842,7 +841,6 @@ class DomainDataFederal(DomainExport):
organization_type__icontains="federal", organization_type__icontains="federal",
domain__state__in=[ domain__state__in=[
Domain.State.READY, Domain.State.READY,
Domain.State.DNS_NEEDED,
Domain.State.ON_HOLD, Domain.State.ON_HOLD,
], ],
) )