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

Linting

Browse source
This commit is contained in:
zandercymatics 2024-06-06 15:17:10 -06:00
parent f48e1f8689
commit ba025f2c6a
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 18 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -681,13 +681,10 @@ class ExportDataTest(MockDb, MockEppLib):
} }
all_requests = DomainRequest.objects.filter(**filter_condition).order_by(*sort_fields).distinct() all_requests = DomainRequest.objects.filter(**filter_condition).order_by(*sort_fields).distinct()
all_requests_dict = all_requests.values( extra = all_requests.values("requested_domain_name", "generic_org_type", "federal_type", "submission_date")
"requested_domain_name", DomainRequestExport.write_csv_for_requests(
"generic_org_type", writer, columns, all_requests, extra_request_fields=extra, should_write_header=True
"federal_type",
"submission_date"
) )
DomainRequestExport.write_csv_for_requests(writer, columns, requests=all_requests_dict, should_write_header=True)
# Reset the CSV file's position to the beginning # Reset the CSV file's position to the beginning
csv_file.seek(0) csv_file.seek(0)
# Read the content into a variable # Read the content into a variable
@ -695,9 +692,7 @@ class ExportDataTest(MockDb, MockEppLib):
# We expect READY domains first, created between today-2 and today+2, sorted by created_at then name # We expect READY domains first, created between today-2 and today+2, sorted by created_at then name
# and DELETED domains deleted between today-2 and today+2, sorted by deleted then name # and DELETED domains deleted between today-2 and today+2, sorted by deleted then name
expected_content = ( expected_content = (
"Domain request,Domain type\n" "Domain request,Domain type\n" "city3.gov,Federal - Executive\n" "city4.gov,Federal - Executive\n"
"city3.gov,Federal - Executive\n"
"city4.gov,Federal - Executive\n"
) )
# Normalize line endings and remove commas, # Normalize line endings and remove commas,

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

@ -6,11 +6,10 @@ from registrar.models import (
DomainInvitation, DomainInvitation,
DomainRequest, DomainRequest,
DomainInformation, DomainInformation,
User,
PublicContact, PublicContact,
UserDomainRole, UserDomainRole,
) )
from django.db.models import QuerySet, Value, Case, When, CharField, Count, Q, F, Value, CharField from django.db.models import QuerySet, Value, Case, When, CharField, Count, Q, F
from django.utils import timezone from django.utils import timezone
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.db.models.functions import Concat, Coalesce from django.db.models.functions import Concat, Coalesce
@ -909,13 +908,14 @@ class DomainRequestExport:
"status", "status",
"requested_domain__name", "requested_domain__name",
] ]
requests = DomainRequest.objects.select_related( requests = (
DomainRequest.objects.select_related(
"creator", "authorizing_official", "federal_agency", "investigator", "requested_domain" "creator", "authorizing_official", "federal_agency", "investigator", "requested_domain"
).exclude( )
status__in=excluded_statuses .exclude(status__in=excluded_statuses)
).order_by( .order_by(*order_by)
*order_by .distinct()
).distinct() )
extra_fields = DomainRequestExport.annotate_and_prepare_domain_request_data(requests) extra_fields = DomainRequestExport.annotate_and_prepare_domain_request_data(requests)
DomainRequestExport.write_csv_for_requests(writer, columns, requests, extra_fields, should_write_header=True) DomainRequestExport.write_csv_for_requests(writer, columns, requests, extra_fields, should_write_header=True)

3
src/registrar/views/admin_views.py
View file

@ -165,8 +165,9 @@ class ExportDataFederal(View):
class ExportDomainRequestDataFull(View): class ExportDomainRequestDataFull(View):
"""Generates a downloaded report containing all Domain Requests (except started)"""
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):
# Smaller export based on 1 """Returns a content disposition response for current-full-domain-request.csv"""
response = HttpResponse(content_type="text/csv") response = HttpResponse(content_type="text/csv")
response["Content-Disposition"] = 'attachment; filename="current-full-domain-request.csv"' response["Content-Disposition"] = 'attachment; filename="current-full-domain-request.csv"'
csv_export.DomainRequestExport.export_full_domain_request_report(response) csv_export.DomainRequestExport.export_full_domain_request_report(response)