Update CSV columns

This commit is contained in:
Erin Song 2025-03-03 15:53:01 -08:00
parent 5df34246fc
commit 690e9d6117
No known key found for this signature in database
2 changed files with 4 additions and 8 deletions

View file

@ -889,7 +889,7 @@ class MemberExportTest(MockDbForIndividualTests, MockEppLib):
expected_content = ( expected_content = (
# Header # Header
"Email,Member access,Invited by,Joined date,Last active,Domain requests," "Email,Member access,Invited by,Joined date,Last active,Domain requests,"
"Member management,Domains,Number domains assigned,Domain assignments\n" "Members,Domains,Number domains assigned,Domain assignments\n"
# Content # Content
"big_lebowski@dude.co,False,help@get.gov,2022-04-01,Invalid date,None," "big_lebowski@dude.co,False,help@get.gov,2022-04-01,Invalid date,None,"
"Viewer,True,1,cdomain1.gov\n" "Viewer,True,1,cdomain1.gov\n"

View file

@ -491,7 +491,7 @@ class MemberExport(BaseExport):
"Joined date", "Joined date",
"Last active", "Last active",
"Domain requests", "Domain requests",
"Member management", "Member",
"Domains", "Domains",
"Number domains assigned", "Number domains assigned",
"Domain assignments", "Domain assignments",
@ -515,12 +515,8 @@ class MemberExport(BaseExport):
"Joined date": model.get("joined_date"), "Joined date": model.get("joined_date"),
"Last active": model.get("last_active"), "Last active": model.get("last_active"),
"Domain requests": f"{get_domain_requests_display(roles, permissions)}", "Domain requests": f"{get_domain_requests_display(roles, permissions)}",
"Member management": ( "Member": f"{get_members_display(roles, permissions)}",
f"{get_members_display(roles, permissions)}: {get_members_description_display(roles, permissions)}" "Domains": f"{get_domains_display(roles, permissions)}",
),
"Domains": (
f"{get_domains_display(roles, permissions)}: {get_domains_description_display(roles, permissions)}"
),
"Number domains assigned": length_user_managed_domains, "Number domains assigned": length_user_managed_domains,
"Domain assignments": ", ".join(user_managed_domains), "Domain assignments": ", ".join(user_managed_domains),
} }