From 9f9147e66181795ded63c97f0523199800dff2bb Mon Sep 17 00:00:00 2001
From: CocoByte <nicolle.leclair@gmail.com>
Date: Fri, 1 Nov 2024 17:37:44 -0600
Subject: [PATCH] Initial draft

---
 src/registrar/admin.py                     | 15 +++++++++++++--
 src/registrar/models/domain.py             |  2 +-
 src/registrar/models/domain_information.py | 11 +++++++++--
 3 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 8a0a458f8..09c36d137 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1461,10 +1461,15 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
 
     form = DomainInformationAdminForm
 
+    # Customize column header text
+    @admin.display(description=_("Generic Org Type"))
+    def converted_generic_org_type(self, obj):
+        return obj.converted_generic_org_type
+
     # Columns
     list_display = [
         "domain",
-        "generic_org_type",
+        "converted_generic_org_type",
         "created_at",
     ]
 
@@ -1493,7 +1498,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             },
         ),
         (".gov domain", {"fields": ["domain"]}),
-        ("Contacts", {"fields": ["senior_official", "other_contacts", "no_other_contacts_rationale"]}),
+        ("Contacts", {"fields": ["generic_org_type", "other_contacts", "no_other_contacts_rationale"]}),
         ("Background info", {"fields": ["anything_else"]}),
         (
             "Type of organization",
@@ -1611,6 +1616,12 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         # objects rather than Contact objects.
         use_sort = db_field.name != "senior_official"
         return super().formfield_for_foreignkey(db_field, request, use_admin_sort_fields=use_sort, **kwargs)
+    
+    def get_queryset(self, request):
+        qs = super().get_queryset(request)
+        return qs.annotate(
+            converted_generic_org_type_display="hey"
+        )
 
 
 class DomainRequestResource(FsmModelResource):
diff --git a/src/registrar/models/domain.py b/src/registrar/models/domain.py
index 7fdc56971..339e4dd20 100644
--- a/src/registrar/models/domain.py
+++ b/src/registrar/models/domain.py
@@ -2078,4 +2078,4 @@ class Domain(TimeStampedModel, DomainHelper):
         if property in self._cache:
             return self._cache[property]
         else:
-            raise KeyError("Requested key %s was not found in registry cache." % str(property))
+            raise KeyError("Requested key %s was not found in registry cache." % str(property))
\ No newline at end of file
diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py
index 7dadf26ac..525d7998e 100644
--- a/src/registrar/models/domain_information.py
+++ b/src/registrar/models/domain_information.py
@@ -426,13 +426,14 @@ class DomainInformation(TimeStampedModel):
         else:
             return None
 
+    # ----- Portfolio Properties -----
+
     @property
     def converted_organization_name(self):
         if self.portfolio:
             return self.portfolio.organization_name
         return self.organization_name
 
-    # ----- Portfolio Properties -----
     @property
     def converted_generic_org_type(self):
         if self.portfolio:
@@ -474,7 +475,7 @@ class DomainInformation(TimeStampedModel):
         if self.portfolio:
             return self.portfolio.city
         return self.city
-
+    
     @property
     def converted_state_territory(self):
         if self.portfolio:
@@ -492,3 +493,9 @@ class DomainInformation(TimeStampedModel):
         if self.portfolio:
             return self.portfolio.urbanization
         return self.urbanization
+
+
+
+
+
+