zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-27 11:33:46 +02:00
Code Issues Projects Releases Packages Wiki Activity

A few updates based on feedback

Browse source
This commit is contained in:
CocoByte 2024-12-02 13:00:47 -07:00
parent 6ca53560ea
commit a6308edffe
No known key found for this signature in database
GPG key ID: BBFAA2526384C97F
3 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@ class BaseExport(ABC):
return Q()
@classmethod
def get_computed_fields(cls, **kwargs):
def get_computed_fields(cls, delimiter=", ", **kwargs):
"""
Get a dict of computed fields. These are fields that do not exist on the model normally
and will be passed to .annotate() when building a queryset.
@ -526,7 +526,7 @@ class DomainExport(BaseExport):
return DomainInformation
@classmethod
def get_computed_fields(cls, delimiter=", "):
def get_computed_fields(cls, delimiter=", ", **kwargs):
"""
Get a dict of computed fields.
"""
@ -612,7 +612,7 @@ class DomainExport(BaseExport):
"converted_so_name": Case(
# When portfolio is present, use that senior official instead
When(
portfolio__isnull=False,
Q(portfolio__isnull=False) & Q(portfolio__senior_official__isnull=False),
then=Concat(
Coalesce(F("portfolio__senior_official__first_name"), Value("")),
Value(" "),
@ -1615,7 +1615,7 @@ class DomainRequestExport(BaseExport):
)
@classmethod
def get_computed_fields(cls, delimiter=", "):
def get_computed_fields(cls, delimiter=", ", **kwargs):
"""
Get a dict of computed fields.
"""
@ -1701,7 +1701,7 @@ class DomainRequestExport(BaseExport):
"converted_so_name": Case(
# When portfolio is present, use that senior official instead
When(
portfolio__isnull=False,
Q(portfolio__isnull=False) & Q(portfolio__senior_official__isnull=False),
then=Concat(
Coalesce(F("portfolio__senior_official__first_name"), Value("")),
Value(" "),