This commit is contained in:
zandercymatics 2024-11-26 12:15:03 -07:00
parent d0f0d56620
commit 82e254af97
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
4 changed files with 9 additions and 23 deletions

View file

@ -2,7 +2,12 @@ from django.db import models
from django.forms import ValidationError from django.forms import ValidationError
from registrar.models.user_domain_role import UserDomainRole from registrar.models.user_domain_role import UserDomainRole
from registrar.utility.waffle import flag_is_active_for_user from registrar.utility.waffle import flag_is_active_for_user
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices, DomainRequestPermissionDisplay, MemberPermissionDisplay from registrar.models.utility.portfolio_helper import (
UserPortfolioPermissionChoices,
UserPortfolioRoleChoices,
DomainRequestPermissionDisplay,
MemberPermissionDisplay,
)
from .utility.time_stamped_model import TimeStampedModel from .utility.time_stamped_model import TimeStampedModel
from django.contrib.postgres.fields import ArrayField from django.contrib.postgres.fields import ArrayField

View file

@ -51,6 +51,7 @@ class DomainRequestPermissionDisplay(StrEnum):
- VIEWER: "Viewer" - VIEWER: "Viewer"
- NONE: "None" - NONE: "None"
""" """
VIEWER_REQUESTER = "Viewer Requester" VIEWER_REQUESTER = "Viewer Requester"
VIEWER = "Viewer" VIEWER = "Viewer"
NONE = "None" NONE = "None"
@ -64,6 +65,7 @@ class MemberPermissionDisplay(StrEnum):
- VIEWER: "Viewer" - VIEWER: "Viewer"
- NONE: "None" - NONE: "None"
""" """
MANAGER = "Manager" MANAGER = "Manager"
VIEWER = "Viewer" VIEWER = "Viewer"
NONE = "None" NONE = "None"

View file

@ -263,25 +263,6 @@ class BaseExport(ABC):
def get_model_annotation_dict(cls, **kwargs): def get_model_annotation_dict(cls, **kwargs):
return convert_queryset_to_dict(cls.get_annotated_queryset(**kwargs), is_model=False) return convert_queryset_to_dict(cls.get_annotated_queryset(**kwargs), is_model=False)
@classmethod
def export_data_to_csv(cls, csv_file, **kwargs):
"""
All domain metadata:
Exports domains of all statuses plus domain managers.
"""
writer = csv.writer(csv_file)
columns = cls.get_columns()
models_dict = cls.get_model_annotation_dict(**kwargs)
# Write to csv file before the write_csv
cls.write_csv_before(writer, **kwargs)
# Write the csv file
rows = cls.write_csv(writer, columns, models_dict)
# Return rows that for easier parsing and testing
return rows
@classmethod @classmethod
def write_csv( def write_csv(
cls, cls,

View file

@ -1,7 +1,6 @@
from django.http import JsonResponse from django.http import JsonResponse
from django.core.paginator import Paginator from django.core.paginator import Paginator
from django.db.models import Value, F, CharField, TextField, Q, Case, When, OuterRef, Subquery from django.db.models import Value, F, CharField, TextField, Q, Case, When, OuterRef, Subquery
from django.db.models.expressions import Func
from django.db.models.functions import Cast, Coalesce, Concat from django.db.models.functions import Cast, Coalesce, Concat
from django.contrib.postgres.aggregates import ArrayAgg from django.contrib.postgres.aggregates import ArrayAgg
from django.urls import reverse from django.urls import reverse
@ -214,4 +213,3 @@ class PortfolioMembersJson(PortfolioMembersPermission, View):
"svg_icon": ("visibility" if view_only else "settings"), "svg_icon": ("visibility" if view_only else "settings"),
} }
return member_json return member_json