zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-27 19:43:43 +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

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

@ -6,11 +6,10 @@ from registrar.models import (
DomainInvitation,
DomainRequest,
DomainInformation,
User,
PublicContact,
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.core.paginator import Paginator
from django.db.models.functions import Concat, Coalesce
@ -751,7 +750,7 @@ class DomainRequestExport:
@staticmethod
def parse_row_for_requests(columns, request: DomainRequest, extra_fields: QuerySet):
"""
Given a set of columns and a request dictionary,
Given a set of columns and a request dictionary,
generate a new row from cleaned column data
"""
@ -779,7 +778,7 @@ class DomainRequestExport:
human_readable_election_board = "N/A"
if request.is_election_board is not None:
human_readable_election_board = "Yes" if request.is_election_board else "No"
requested_domain = request.requested_domain
if extra_fields.get("requested_domain_name") is None:
extra_fields["requested_domain_name"] = getattr(requested_domain, "name", "No requested domain")
@ -909,13 +908,14 @@ class DomainRequestExport:
"status",
"requested_domain__name",
]
requests = DomainRequest.objects.select_related(
"creator", "authorizing_official", "federal_agency", "investigator", "requested_domain"
).exclude(
status__in=excluded_statuses
).order_by(
*order_by
).distinct()
requests = (
DomainRequest.objects.select_related(
"creator", "authorizing_official", "federal_agency", "investigator", "requested_domain"
)
.exclude(status__in=excluded_statuses)
.order_by(*order_by)
.distinct()
)
extra_fields = DomainRequestExport.annotate_and_prepare_domain_request_data(requests)
DomainRequestExport.write_csv_for_requests(writer, columns, requests, extra_fields, should_write_header=True)