mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-07-25 20:18:38 +02:00
linted
This commit is contained in:
parent
bf34df52dd
commit
e7c22ce51f
6 changed files with 13 additions and 27 deletions
|
@ -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
|
||||||
|
|
||||||
|
@ -115,7 +120,7 @@ class UserPortfolioPermission(TimeStampedModel):
|
||||||
UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
|
UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
|
||||||
UserPortfolioPermissionChoices.EDIT_REQUESTS,
|
UserPortfolioPermissionChoices.EDIT_REQUESTS,
|
||||||
]
|
]
|
||||||
|
|
||||||
if all(perm in all_permissions for perm in all_domain_perms):
|
if all(perm in all_permissions for perm in all_domain_perms):
|
||||||
return DomainRequestPermissionDisplay.VIEWER_REQUESTER
|
return DomainRequestPermissionDisplay.VIEWER_REQUESTER
|
||||||
elif UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS in all_permissions:
|
elif UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS in all_permissions:
|
||||||
|
|
|
@ -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"
|
||||||
|
|
|
@ -30,7 +30,7 @@ from .common import (
|
||||||
from unittest.mock import ANY, call, patch
|
from unittest.mock import ANY, call, patch
|
||||||
|
|
||||||
import boto3_mocking # type: ignore
|
import boto3_mocking # type: ignore
|
||||||
import logging
|
|
||||||
|
|
||||||
class TestDomainAdminAsStaff(MockEppLib):
|
class TestDomainAdminAsStaff(MockEppLib):
|
||||||
"""Test DomainAdmin class as staff user.
|
"""Test DomainAdmin class as staff user.
|
||||||
|
|
|
@ -198,8 +198,8 @@ class BaseExport(ABC):
|
||||||
|
|
||||||
# We can infer that if we're passing in annotations,
|
# We can infer that if we're passing in annotations,
|
||||||
# we want to grab the result of said annotation.
|
# we want to grab the result of said annotation.
|
||||||
if computed_fields :
|
if computed_fields:
|
||||||
related_table_fields.extend(computed_fields .keys())
|
related_table_fields.extend(computed_fields.keys())
|
||||||
|
|
||||||
# Get prexisting fields on the model
|
# Get prexisting fields on the model
|
||||||
model_fields = set()
|
model_fields = set()
|
||||||
|
@ -213,26 +213,6 @@ class BaseExport(ABC):
|
||||||
|
|
||||||
return cls.update_queryset(queryset, **kwargs)
|
return cls.update_queryset(queryset, **kwargs)
|
||||||
|
|
||||||
@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 get_annotated_queryset(cls, **kwargs):
|
def get_annotated_queryset(cls, **kwargs):
|
||||||
"""Returns an annotated queryset based off of all query conditions."""
|
"""Returns an annotated queryset based off of all query conditions."""
|
||||||
|
|
|
@ -49,6 +49,7 @@ class DefaultUserValues(StrEnum):
|
||||||
- SYSTEM: "System" <= Default username
|
- SYSTEM: "System" <= Default username
|
||||||
- UNRETRIEVED: "Unretrieved" <= Default email state
|
- UNRETRIEVED: "Unretrieved" <= Default email state
|
||||||
"""
|
"""
|
||||||
|
|
||||||
HELP_EMAIL = "help@get.gov"
|
HELP_EMAIL = "help@get.gov"
|
||||||
SYSTEM = "System"
|
SYSTEM = "System"
|
||||||
UNRETRIEVED = "Unretrieved"
|
UNRETRIEVED = "Unretrieved"
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue