zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-22 10:46:06 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup

Browse source
This commit is contained in:
zandercymatics 2024-11-26 10:20:25 -07:00
parent f05148f2c3
commit e91526e602
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -41,7 +41,7 @@ from registrar.models.utility.orm_helper import ArrayRemoveNull
from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices from registrar.models.utility.portfolio_helper import UserPortfolioRoleChoices
from registrar.templatetags.custom_filters import get_region from registrar.templatetags.custom_filters import get_region
from registrar.utility.constants import BranchChoices from registrar.utility.constants import BranchChoices
from registrar.utility.enums import DefaultEmail from registrar.utility.enums import DefaultEmail, DefaultUserValues
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@ -423,7 +423,7 @@ class MemberExport(BaseExport):
) )
), ),
type=Value("invitedmember", output_field=CharField()), type=Value("invitedmember", output_field=CharField()),
joined_date=Value("Unretrieved", output_field=CharField()), joined_date=Value(DefaultUserValues.UNRETRIEVED, output_field=CharField()),
invited_by=cls.get_invited_by_query(object_id_query=Cast(OuterRef("id"), output_field=CharField())), invited_by=cls.get_invited_by_query(object_id_query=Cast(OuterRef("id"), output_field=CharField())),
).values(*shared_columns) ).values(*shared_columns)
@ -450,7 +450,7 @@ class MemberExport(BaseExport):
user=OuterRef("user"), user=OuterRef("user"),
) )
), ),
then=Value("help@get.gov"), then=Value(DefaultEmail.HELP_EMAIL),
), ),
default=F("user__email"), default=F("user__email"),
output_field=CharField(), output_field=CharField(),
@ -459,7 +459,7 @@ class MemberExport(BaseExport):
.order_by("action_time") .order_by("action_time")
.values("display_email")[:1] .values("display_email")[:1]
), ),
Value("System"), Value(DefaultUserValues.SYSTEM),
output_field=CharField(), output_field=CharField(),
) )

7
src/registrar/utility/enums.py
View file

@ -43,14 +43,17 @@ class DefaultEmail(Enum):
HELP_EMAIL = "help@get.gov" HELP_EMAIL = "help@get.gov"
class DefaultUser(Enum): class DefaultUserValues(Enum):
"""Stores default values for a default user. """Stores default values for a default user.
Overview of defaults: Overview of defaults:
- SYSTEM: "System" - SYSTEM: "System" <= Default username
- UNRETRIEVED: "Unretrieved" <= Default email state
""" """
SYSTEM = "System" SYSTEM = "System"
UNRETRIEVED = "Unretrieved"
class Step(StrEnum): class Step(StrEnum):