PR feedback

src/registrar/admin.py

@@ -2091,12 +2091,12 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             )
 
             # Filter out empty values and return sorted unique entries
-            return sorted([(federal_type, federal_type) for federal_type in queryset if federal_type])
+            return sorted([(federal_type, DomainRequest.BranchChoices.get_branch_label(federal_type)) for federal_type in queryset if federal_type])
 
         def queryset(self, request, queryset):
             if self.value():
                 return queryset.filter(
-                    Q(portfolio__federal_type=self.value()) | Q(portfolio__isnull=True, federal_type=self.value())
+                    Q(portfolio__federal_agency__federal_type=self.value()) | Q(portfolio__isnull=True, federal_type=self.value())
                 )
             return queryset
 
@@ -3307,7 +3307,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             )
 
             # Filter out empty values and return sorted unique entries
-            return sorted([(federal_type, federal_type) for federal_type in queryset if federal_type])
+            return sorted([(federal_type, DomainRequest.BranchChoices.get_branch_label(federal_type)) for federal_type in queryset if federal_type])
 
         def queryset(self, request, queryset):
             if self.value():

src/registrar/fixtures/fixtures_requests.py

@@ -325,7 +325,7 @@ class DomainRequestFixture:
     @classmethod
     def _create_domain_requests(cls, users):  # noqa: C901
         """Creates DomainRequests given a list of users."""
-        total_domain_requests_to_make = users.count()  # 100000
+        total_domain_requests_to_make = len(users)  # 100000
 
         # Check if the database is already populated with the desired
         # number of entries.