zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-03 16:32:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Updated export CSV fields and data

Browse source
This commit is contained in:
Erin Song 2025-02-25 11:43:56 -08:00
parent 1ebeb4607e
commit 29f8fac01b
No known key found for this signature in database
2 changed files with 15 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -888,7 +888,7 @@ class MemberExportTest(MockDbForIndividualTests, MockEppLib):
csv_content = csv_file.read()
expected_content = (
# Header
"Email,Organization admin,Invited by,Joined date,Last active,Domain requests,"
"Email,Access level,Invited by,Joined date,Last active,Domain requests,"
"Member management,Domain management,Number of domains,Domains\n"
# Content
"big_lebowski@dude.co,False,help@get.gov,2022-04-01,Invalid date,None,"

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

@ -38,11 +38,18 @@ from django.contrib.admin.models import LogEntry, ADDITION
from django.contrib.contenttypes.models import ContentType
from registrar.models.utility.generic_helper import convert_queryset_to_dict
from registrar.models.utility.orm_helper import ArrayRemoveNull
from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
from registrar.templatetags.custom_filters import get_region
from registrar.utility.constants import BranchChoices
from registrar.utility.enums import DefaultEmail, DefaultUserValues
from registrar.models.utility.portfolio_helper import (
UserPortfolioRoleChoices,
get_domain_requests_description_display,
get_domain_requests_display,
get_domains_description_display,
get_domains_display,
get_members_description_display,
get_members_display,
)
logger = logging.getLogger(__name__)
@ -479,7 +486,7 @@ class MemberExport(BaseExport):
"""
return [
"Email",
"Organization admin",
"Access level",
"Invited by",
"Joined date",
"Last active",
@ -503,13 +510,13 @@ class MemberExport(BaseExport):
length_user_managed_domains = len(user_managed_domains)
FIELDS = {
"Email": model.get("email_display"),
"Organization admin": "Admin" if bool(UserPortfolioRoleChoices.ORGANIZATION_ADMIN in roles) else "Member",
"Access level": "Admin" if bool(UserPortfolioRoleChoices.ORGANIZATION_ADMIN in roles) else "Member",
"Invited by": model.get("invited_by"),
"Joined date": model.get("joined_date"),
"Last active": model.get("last_active"),
"Domain requests": UserPortfolioPermission.get_domain_request_permission_display(roles, permissions),
"Member management": UserPortfolioPermission.get_member_permission_display(roles, permissions),
"Domain management": bool(length_user_managed_domains > 0),
"Domain requests": f'{get_domain_requests_display(roles, permissions)}: {get_domain_requests_description_display(roles, permissions)}',
"Member management": f'{get_members_display(roles, permissions)}: {get_members_description_display(roles, permissions)}',
"Domain management": f'{get_domains_display(roles, permissions)}: {get_domains_description_display(roles, permissions)}',
"Number of domains": length_user_managed_domains,
"Domains": ",".join(user_managed_domains),
}