Fix merge conflict + enum

src/registrar/models/utility/portfolio_helper.py

@@ -1,4 +1,4 @@
-from enum import Enum
+from registrar.utility import StrEnum
 from django.db import models
 
 
@@ -43,20 +43,20 @@ class UserPortfolioPermissionChoices(models.TextChoices):
         return {key: value.value for key, value in cls.__members__.items()}
 
 
-class DomainRequestPermissionDisplay(Enum):
+class DomainRequestPermissionDisplay(StrEnum):
     """Stores display values for domain request permission combinations.
 
     Overview of values:
     - VIEWER_REQUESTER: "Viewer Requester"
-    - VIEWER: "VIEWER"
+    - VIEWER: "Viewer"
     - NONE: "None"
     """
     VIEWER_REQUESTER = "Viewer Requester"
-    VIEWER = "VIEWER"
+    VIEWER = "Viewer"
     NONE = "None"
 
 
-class MemberPermissionDisplay(Enum):
+class MemberPermissionDisplay(StrEnum):
     """Stores display values for member permission combinations.
 
     Overview of values:

src/registrar/tests/test_reports.py

@@ -862,7 +862,7 @@ class MemberExportTest(MockDbForIndividualTests, MockEppLib):
         # Create a request and add the user to the request
         request = self.factory.get("/")
         request.user = self.user
-
+        self.maxDiff = None
         # Add portfolio to session
         request = GenericTestHelper._mock_user_request_for_factory(request)
         request.session["portfolio"] = self.portfolio_1

src/registrar/utility/csv_export.py

@@ -361,14 +361,15 @@ class MemberExport(BaseExport):
         ]
 
         # Permissions
-        permissions = UserPortfolioPermission.objects.filter(portfolio=portfolio).select_related("user").annotate(
+        permissions = (
+            UserPortfolioPermission.objects.filter(portfolio=portfolio)
+            .select_related("user")
+            .annotate(
                 first_name=F("user__first_name"),
                 last_name=F("user__last_name"),
                 email_display=F("user__email"),
                 last_active=Coalesce(
-                Func(
+                    Func(F("user__last_login"), Value("YYYY-MM-DD"), function="to_char", output_field=TextField()),
-                    F("user__last_login"), Value("YYYY-MM-DD"), function="to_char", output_field=TextField()
-                ),
                     Value("Invalid date"),
                     output_field=CharField(),
                 ),
@@ -398,17 +399,20 @@ class MemberExport(BaseExport):
                 ),
                 type=Value("member", output_field=CharField()),
                 joined_date=Func(F("created_at"), Value("YYYY-MM-DD"), function="to_char", output_field=CharField()),
-            invited_by=cls.get_invited_by_query(
+                invited_by=cls.get_invited_by_query(object_id_query=cls.get_portfolio_invitation_id_query()),
-                object_id_query=cls.get_portfolio_invitation_id_query()
+            )
-            ),
+            .values(*shared_columns)
-        ).values(*shared_columns)
+        )
 
         # Invitations
         domain_invitations = DomainInvitation.objects.filter(
             email=OuterRef("email"),  # Check if email matches the OuterRef("email")
             domain__domain_info__portfolio=portfolio,  # Check if the domain's portfolio matches the given portfolio
-        ).annotate(domain_info=Concat(F("domain__id"), Value(":"), F("domain__name"), output_field=CharField()))
+        ).annotate(domain_info=F("domain__name"))
-        invitations = PortfolioInvitation.objects.filter(portfolio=portfolio).annotate(
+        invitations = (
+            PortfolioInvitation.objects.exclude(status=PortfolioInvitation.PortfolioInvitationStatus.RETRIEVED)
+            .filter(portfolio=portfolio)
+            .annotate(
                 first_name=Value(None, output_field=CharField()),
                 last_name=Value(None, output_field=CharField()),
                 email_display=F("email"),
@@ -423,9 +427,11 @@ class MemberExport(BaseExport):
                     )
                 ),
                 type=Value("invitedmember", output_field=CharField()),
-            joined_date=Value(DefaultUserValues.UNRETRIEVED, output_field=CharField()),
+                joined_date=Value("Unretrieved", 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)
+        )
 
         return convert_queryset_to_dict(permissions.union(invitations), is_model=False)
 
@@ -450,7 +456,7 @@ class MemberExport(BaseExport):
                                     user=OuterRef("user"),
                                 )
                             ),
-                            then=Value(DefaultEmail.HELP_EMAIL),
+                            then=Value(DefaultEmail.HELP_EMAIL.value),
                         ),
                         default=F("user__email"),
                         output_field=CharField(),
@@ -459,7 +465,7 @@ class MemberExport(BaseExport):
                 .order_by("action_time")
                 .values("display_email")[:1]
             ),
-            Value(DefaultUserValues.SYSTEM),
+            Value(DefaultUserValues.SYSTEM.value),
             output_field=CharField(),
         )
 

src/registrar/utility/enums.py

@@ -29,7 +29,7 @@ class LogCode(Enum):
     DEFAULT = 5
 
 
-class DefaultEmail(Enum):
+class DefaultEmail(StrEnum):
     """Stores the string values of default emails
 
     Overview of emails:
@@ -43,7 +43,7 @@ class DefaultEmail(Enum):
     HELP_EMAIL = "help@get.gov"
 
 
-class DefaultUserValues(Enum):
+class DefaultUserValues(StrEnum):
     """Stores default values for a default user.
 
     Overview of defaults:
@@ -55,7 +55,6 @@ class DefaultUserValues(Enum):
     UNRETRIEVED = "Unretrieved"
 
 
-
 class Step(StrEnum):
     """
     Names for each page of the domain request wizard.