Remove converted values from exports + fixes

src/registrar/admin.py

@@ -3,7 +3,14 @@ import logging
 import copy
 from typing import Optional
 from django import forms
-from django.db.models import Value, CharField, Q
+from django.db.models import (
+    Case,
+    CharField,
+    F,
+    Q,
+    Value,
+    When,
+)
 from django.db.models.functions import Concat, Coalesce
 from django.http import HttpResponseRedirect
 from registrar.models.federal_agency import FederalAgency
@@ -1463,55 +1470,6 @@ class DomainInformationResource(resources.ModelResource):
     class Meta:
         model = models.DomainInformation
 
-    # Override exports for these columns in DomainInformation to use converted values.  These values
-    # come from @Property functions, which are not automatically included in the export and which we
-    # want to use in place of the native fields.
-    organization_name = fields.Field(attribute="converted_organization_name", column_name="organization_name")
-    generic_org_type = fields.Field(attribute="converted_generic_org_type", column_name="generic_org_type")
-    federal_type = fields.Field(attribute="converted_federal_type", column_name="federal_type")
-    federal_agency = fields.Field(attribute="converted_federal_agency", column_name="federal_agency")
-    senior_official = fields.Field(attribute="converted_senior_official", column_name="senior_official")
-    address_line1 = fields.Field(attribute="converted_address_line1", column_name="address_line1")
-    address_line2 = fields.Field(attribute="converted_address_line2", column_name="address_line2")
-    city = fields.Field(attribute="converted_city", column_name="city")
-    state_territory = fields.Field(attribute="converted_state_territory", column_name="state_territory")
-    zipcode = fields.Field(attribute="converted_zipcode", column_name="zipcode")
-    urbanization = fields.Field(attribute="converted_urbanization", column_name="urbanization")
-
-    # Custom getters for the above columns that map to @property functions instead of fields
-    def dehydrate_organization_name(self, obj):
-        return obj.converted_organization_name
-
-    def dehydrate_generic_org_type(self, obj):
-        return obj.converted_generic_org_type
-
-    def dehydrate_federal_type(self, obj):
-        return obj.converted_federal_type
-
-    def dehydrate_federal_agency(self, obj):
-        return obj.converted_federal_agency
-
-    def dehydrate_senior_official(self, obj):
-        return obj.converted_senior_official
-
-    def dehydrate_address_line1(self, obj):
-        return obj.converted_address_line1
-
-    def dehydrate_address_line2(self, obj):
-        return obj.converted_address_line2
-
-    def dehydrate_city(self, obj):
-        return obj.converted_city
-
-    def dehydrate_state_territory(self, obj):
-        return obj.converted_state_territory
-
-    def dehydrate_zipcode(self, obj):
-        return obj.converted_zipcode
-
-    def dehydrate_urbanization(self, obj):
-        return obj.converted_urbanization
-
 
 class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     """Customize domain information admin class."""
@@ -1527,24 +1485,25 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         def lookups(self, request, model_admin):
             converted_generic_orgs = set()
 
-            for domainInfo in DomainInformation.objects.all():
+            # Populate the set with tuples of (value, display value)
-                converted_generic_org = domainInfo.converted_generic_org_type
+            for domain_info in DomainInformation.objects.all():
-                if converted_generic_org:
+                converted_generic_org = domain_info.converted_generic_org_type  # Actual value
-                    converted_generic_orgs.add(converted_generic_org)
+                converted_generic_org_display = domain_info.converted_generic_org_type_display  # Display value
                 
-            return sorted((org, org) for org in converted_generic_orgs)
+                if converted_generic_org:
+                    converted_generic_orgs.add(
+                        (converted_generic_org, converted_generic_org_display)  # Value, Display
+                    )
+
+            # Sort the set by display value
+            return sorted(converted_generic_orgs, key=lambda x: x[1])  # x[1] is the display value
 
         # Filter queryset
         def queryset(self, request, queryset):
             if self.value():  # Check if a generic org is selected in the filter
                 return queryset.filter(
-                    # Filter based on the generic org value returned by converted_generic_org_type
+                            Q(portfolio__organization_type=self.value()) |
-                    id__in=[
+                            Q(generic_org_type=self.value())
-                        domainInfo.id
-                        for domainInfo in queryset
-                        if domainInfo.converted_generic_org_type
-                        and domainInfo.converted_generic_org_type == self.value()
-                    ]
                         )
             return queryset
 
@@ -1709,6 +1668,8 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         return super().formfield_for_foreignkey(db_field, request, use_admin_sort_fields=use_sort, **kwargs)
     
     
+
+
 class DomainRequestResource(FsmModelResource):
     """defines how each field in the referenced model should be mapped to the corresponding fields in the
     import/export file"""
@@ -1716,56 +1677,6 @@ class DomainRequestResource(FsmModelResource):
     class Meta:
         model = models.DomainRequest
 
-    # Override exports for these columns in DomainInformation to use converted values.  These values
-    # come from @Property functions, which are not automatically included in the export and which we
-    # want to use in place of the native fields.
-    organization_name = fields.Field(attribute="converted_organization_name", column_name="organization_name")
-    generic_org_type = fields.Field(attribute="converted_generic_org_type", column_name="generic_org_type")
-    federal_type = fields.Field(attribute="converted_federal_type", column_name="federal_type")
-    federal_agency = fields.Field(attribute="converted_federal_agency", column_name="federal_agency")
-    senior_official = fields.Field(attribute="converted_senior_official", column_name="senior_official")
-    address_line1 = fields.Field(attribute="converted_address_line1", column_name="address_line1")
-    address_line2 = fields.Field(attribute="converted_address_line2", column_name="address_line2")
-    city = fields.Field(attribute="converted_city", column_name="city")
-    state_territory = fields.Field(attribute="converted_state_territory", column_name="state_territory")
-    zipcode = fields.Field(attribute="converted_zipcode", column_name="zipcode")
-    urbanization = fields.Field(attribute="converted_urbanization", column_name="urbanization")
-    senior_official = fields.Field(attribute="converted_urbanization", column_name="senior official")
-
-    # Custom getters for the above columns that map to @property functions instead of fields
-    def dehydrate_organization_name(self, obj):
-        return obj.converted_organization_name
-
-    def dehydrate_generic_org_type(self, obj):
-        return obj.converted_generic_org_type
-
-    def dehydrate_federal_type(self, obj):
-        return obj.converted_federal_type
-
-    def dehydrate_federal_agency(self, obj):
-        return obj.converted_federal_agency
-
-    def dehydrate_senior_official(self, obj):
-        return obj.converted_senior_official
-
-    def dehydrate_address_line1(self, obj):
-        return obj.converted_address_line1
-
-    def dehydrate_address_line2(self, obj):
-        return obj.converted_address_line2
-
-    def dehydrate_city(self, obj):
-        return obj.converted_city
-
-    def dehydrate_state_territory(self, obj):
-        return obj.converted_state_territory
-
-    def dehydrate_zipcode(self, obj):
-        return obj.converted_zipcode
-
-    def dehydrate_urbanization(self, obj):
-        return obj.converted_urbanization
-
 
 class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     """Custom domain requests admin class."""
@@ -1797,24 +1708,25 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         def lookups(self, request, model_admin):
             converted_generic_orgs = set()
 
-            for domain_request in DomainRequest.objects.all():
+            # Populate the set with tuples of (value, display value)
-                converted_generic_org = domain_request.converted_generic_org_type
+            for domain_info in DomainInformation.objects.all():
-                if converted_generic_org:
+                converted_generic_org = domain_info.converted_generic_org_type  # Actual value
-                    converted_generic_orgs.add(converted_generic_org)
+                converted_generic_org_display = domain_info.converted_generic_org_type_display  # Display value
                 
-            return sorted((org, org) for org in converted_generic_orgs)
+                if converted_generic_org:
+                    converted_generic_orgs.add(
+                        (converted_generic_org, converted_generic_org_display)  # Value, Display
+                    )
+
+            # Sort the set by display value
+            return sorted(converted_generic_orgs, key=lambda x: x[1])  # x[1] is the display value
 
         # Filter queryset
         def queryset(self, request, queryset):
             if self.value():  # Check if a generic org is selected in the filter
                 return queryset.filter(
-                    # Filter based on the generic org value returned by converted_generic_org_type
+                            Q(portfolio__organization_type=self.value()) |
-                    id__in=[
+                            Q(generic_org_type=self.value())
-                        domain_request.id
-                        for domain_request in queryset
-                        if domain_request.converted_generic_org_type
-                        and domain_request.converted_generic_org_type == self.value()
-                    ]
                         )
             return queryset
 
@@ -1838,15 +1750,10 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
         # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if federal Type is selected in the filter
+            if self.value():  # Check if a federal type is selected in the filter
                 return queryset.filter(
-                    # Filter based on the federal type returned by converted_federal_type
+                            Q(portfolio__federal_type=self.value()) |
-                    id__in=[
+                            Q(federal_type=self.value())
-                        domain_request.id
-                        for domain_request in queryset
-                        if domain_request.converted_federal_type
-                        and domain_request.converted_federal_type == self.value()
-                    ]
                         )
             return queryset
 
@@ -2808,45 +2715,6 @@ class DomainResource(FsmModelResource):
 
     class Meta:
         model = models.Domain
-        # Override the default export so that it matches what is displayed in the admin table for Domains
-        fields = (
-            "name",
-            "converted_generic_org_type",
-            "federal_type",
-            "converted_federal_type",
-            "converted_federal_agency",
-            "converted_organization_name",
-            "custom_election_board",
-            "converted_city",
-            "converted_state_territory",
-            "state",
-            "expiration_date",
-            "created_at",
-            "first_ready",
-            "deleted",
-        )
-
-    # Custom getters to retrieve the values from @Proprerty methods in DomainInfo
-    converted_generic_org_type = fields.Field(attribute="converted_generic_org_type", column_name="generic org type")
-    converted_federal_agency = fields.Field(attribute="converted_federal_agency", column_name="federal agency")
-    converted_organization_name = fields.Field(attribute="converted_organization_name", column_name="organization name")
-    converted_city = fields.Field(attribute="converted_city", column_name="city")
-    converted_state_territory = fields.Field(attribute="converted_state_territory", column_name="state territory")
-
-    def dehydrate_converted_generic_org_type(self, obj):
-        return obj.domain_info.converted_generic_org_type
-
-    def dehydrate_converted_federal_agency(self, obj):
-        return obj.domain_info.converted_federal_agency
-
-    def dehydrate_converted_organization_name(self, obj):
-        return obj.domain_info.converted_organization_name
-
-    def dehydrate_converted_city(self, obj):
-        return obj.domain_info.converted_city
-
-    def dehydrate_converted_state_territory(self, obj):
-        return obj.domain_info.converted_state_territory
 
 
 class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
@@ -2884,26 +2752,68 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         def lookups(self, request, model_admin):
             converted_generic_orgs = set()
 
-            for domainInfo in DomainInformation.objects.all():
+            # Populate the set with tuples of (value, display value)
-                converted_generic_org = domainInfo.converted_generic_org_type
+            for domain_info in DomainInformation.objects.all():
-                if converted_generic_org:
+                converted_generic_org = domain_info.converted_generic_org_type  # Actual value
-                    converted_generic_orgs.add(converted_generic_org)
+                converted_generic_org_display = domain_info.converted_generic_org_type_display  # Display value
+                
+                if converted_generic_org:
+                    converted_generic_orgs.add(
+                        (converted_generic_org, converted_generic_org_display)  # Value, Display
+                    )
+
+            # Sort the set by display value
+            return sorted(converted_generic_orgs, key=lambda x: x[1])  # x[1] is the display value
 
-            return sorted((org, org) for org in converted_generic_orgs)
 
         # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a generic org is selected in the filter
+            
-                return queryset.filter(
+            annotated_queryset = queryset.annotate(
-                    # Filter based on the generic org value returned by converted_generic_org_type
+                converted_generic_org_type=Case(
-                    id__in=[
+                    # When portfolio is present, use its value instead
-                        domain.id
+                    When(domain_info__portfolio__isnull=False, then=F("domain_info__portfolio__organization_type")),
-                        for domain in queryset
+                    # Otherwise, return the natively assigned value
-                        if domain.domain_info.converted_generic_org_type
+                    default=F("domain_info__generic_org_type"),
-                        and domain.domain_info.converted_generic_org_type == self.value()
+                ),
-                    ]
+                converted_federal_agency=Case(
+                    # When portfolio is present, use its value instead
+                    When(
+                        Q(domain_info__portfolio__isnull=False) & Q(domain_info__portfolio__federal_agency__isnull=False),
+                        then=F("domain_info__portfolio__federal_agency__agency")
+                    ),
+                    # Otherwise, return the natively assigned value
+                    default=F("domain_info__federal_agency__agency"),
+                ),
+                converted_organization_name=Case(
+                    # When portfolio is present, use its value instead
+                    When(domain_info__portfolio__isnull=False, then=F("domain_info__portfolio__organization_name")),
+                    # Otherwise, return the natively assigned value
+                    default=F("domain_info__organization_name"),
+                ),
+                converted_city=Case(
+                    # When portfolio is present, use its value instead
+                    When(domain_info__portfolio__isnull=False, then=F("domain_info__portfolio__city")),
+                    # Otherwise, return the natively assigned value
+                    default=F("domain_info__city"),
+                ),
+                converted_state_territory=Case(
+                    # When portfolio is present, use its value instead
+                    When(domain_info__portfolio__isnull=False, then=F("domain_info__portfolio__state_territory")),
+                    # Otherwise, return the natively assigned value
+                    default=F("domain_info__state_territory"),
+                ),
             )
-            return queryset
+
+            if self.value():  # Check if a generic org is selected in the filter
+                return annotated_queryset.filter(
+                            Q(domain_info__portfolio__organization_type=self.value()) |
+                            Q(domain_info__portfolio__isnull=True, domain_info__generic_org_type=self.value())
+                        )
+            
+            return annotated_queryset
+        
+        
 
     class FederalTypeFilter(admin.SimpleListFilter):
         """Custom Federal Type filter that accomodates portfolio feature.
@@ -2926,15 +2836,10 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
         # Filter queryset
         def queryset(self, request, queryset):
-            if self.value():  # Check if a generic org is selected in the filter
+            if self.value():  # Check if a federal type is selected in the filter
                 return queryset.filter(
-                    # Filter based on the generic org value returned by converted_generic_org_type
+                            Q(portfolio__federal_type=self.value()) |
-                    id__in=[
+                            Q(federal_type=self.value())
-                        domain.id
-                        for domain in queryset
-                        if domain.domain_info.converted_federal_type
-                        and domain.domain_info.converted_federal_type == self.value()
-                    ]
                         )
             return queryset
 
@@ -2976,7 +2881,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     # Use converted value in the table
     @admin.display(description=_("Generic Org Type"))
     def converted_generic_org_type(self, obj):
-        return obj.domain_info.converted_generic_org_type
+        return obj.domain_info.converted_generic_org_type_display
 
     converted_generic_org_type.admin_order_field = "domain_info__converted_generic_org_type"  # type: ignore
 

src/registrar/models/domain_information.py

@@ -426,6 +426,7 @@ class DomainInformation(TimeStampedModel):
         else:
             return None
 
+   
     # ----- Portfolio Properties -----
 
     @property
@@ -450,25 +451,25 @@ class DomainInformation(TimeStampedModel):
     def converted_federal_type(self):
         if self.portfolio:
             return self.portfolio.federal_type
-        return self.federal_type
+        return self.get_federal_type_display()
 
     @property
     def converted_senior_official(self):
         if self.portfolio:
-            return self.portfolio.senior_official
+            return self.portfolio.display_senior_official
-        return self.senior_official
+        return self.display_senior_official
 
     @property
     def converted_address_line1(self):
         if self.portfolio:
-            return self.portfolio.address_line1
+            return self.portfolio.display_address_line1
-        return self.address_line1
+        return self.display_address_line1
 
     @property
     def converted_address_line2(self):
         if self.portfolio:
-            return self.portfolio.address_line2
+            return self.portfolio.display_address_line2
-        return self.address_line2
+        return self.display_address_line2
 
     @property
     def converted_city(self):
@@ -479,17 +480,25 @@ class DomainInformation(TimeStampedModel):
     @property
     def converted_state_territory(self):
         if self.portfolio:
-            return self.portfolio.state_territory
+            return self.portfolio.get_state_territory_display()
-        return self.state_territory
+        return self.get_state_territory_display()
 
     @property
     def converted_zipcode(self):
         if self.portfolio:
-            return self.portfolio.zipcode
+            return self.portfolio.display_zipcode
-        return self.zipcode
+        return self.display_zipcode
 
     @property
     def converted_urbanization(self):
         if self.portfolio:
-            return self.portfolio.urbanization
+            return self.portfolio.display_urbanization
-        return self.urbanization
+        return self.display_urbanization
+
+
+    # ----- Portfolio Properties (display values)-----
+    @property
+    def converted_generic_org_type_display(self):
+        if self.portfolio:
+            return self.portfolio.get_organization_type_display()
+        return self.get_generic_org_type_display()

src/registrar/utility/csv_export.py

@@ -539,12 +539,14 @@ class DomainExport(BaseExport):
                 # When portfolio is present, use its value instead
                 When(portfolio__isnull=False, then=F("portfolio__organization_type")),
                 # Otherwise, return the natively assigned value
-                default=F("organization_type"),
+                default=F("generic_org_type"),
                 output_field=CharField(),
             ),
             "converted_federal_agency": Case(
                 # When portfolio is present, use its value instead
-                When(portfolio__isnull=False, then=F("portfolio__federal_agency__agency")),
+                When(
+                    Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False),
+                    then=F("portfolio__federal_agency__agency")),
                 # Otherwise, return the natively assigned value
                 default=F("federal_agency__agency"),
                 output_field=CharField(),
@@ -1628,12 +1630,15 @@ class DomainRequestExport(BaseExport):
                 # When portfolio is present, use its value instead
                 When(portfolio__isnull=False, then=F("portfolio__organization_type")),
                 # Otherwise, return the natively assigned value
-                default=F("organization_type"),
+                default=F("generic_org_type"),
                 output_field=CharField(),
             ),
             "converted_federal_agency": Case(
                 # When portfolio is present, use its value instead
-                When(portfolio__isnull=False, then=F("portfolio__federal_agency__agency")),
+                When(
+                    Q(portfolio__isnull=False) & Q(portfolio__federal_agency__isnull=False),
+                    then=F("portfolio__federal_agency__agency")
+                    ),
                 # Otherwise, return the natively assigned value
                 default=F("federal_agency__agency"),
                 output_field=CharField(),