Merge pull request #271 from American-Institutes-for-Research/HEA-1031/Admin_page_wealth_group_lists_are_slow_to_open

Update metadata and baseline admins with select_realted and other perf improvments

Author: rhunwicks

apps/baseline/admin.py

@@ -90,6 +90,9 @@ class LivelihoodZoneAdmin(admin.ModelAdmin):
     ]
     list_filter = (("country", admin.RelatedOnlyFieldListFilter),)
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("country")
+
 
 class LivelihoodZoneBaselineCorrectionAdmin(admin.ModelAdmin):
     list_display = ("worksheet_name", "cell_range", "previous_value", "value", "correction_date", "author")
@@ -186,6 +189,17 @@ class LivelihoodZoneBaselineAdmin(GISModelAdminReadOnly):
         LivelihoodZoneBaselineCorrectionInlineAdmin,
     ]
 
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .select_related(
+                "livelihood_zone__country",
+                "main_livelihood_category",
+                "source_organization",
+            )
+        )
+
     @admin.display(description=_("Livelihood Zone Alternate Code"))
     def livelihood_zone_alternate_code(self, instance):
         """
@@ -269,6 +283,9 @@ def country(self, instance):
         """
         return instance.livelihood_zone_baseline.livelihood_zone.country
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("livelihood_zone_baseline__livelihood_zone__country")
+
     def get_fields(self, request, obj=None):
         fields = super().get_fields(request, obj=obj)
         if obj and obj.geography:
@@ -320,6 +337,18 @@ class LivelihoodStrategyAdmin(admin.ModelAdmin):
         ("livelihood_zone_baseline__livelihood_zone__country", admin.RelatedOnlyFieldListFilter),
     )
 
+    def get_queryset(self, request):
+        return (
+            super()
+            .get_queryset(request)
+            .select_related(
+                "livelihood_zone_baseline__livelihood_zone",
+                "season",
+                "product",
+                "unit_of_measure",
+            )
+        )
+
 
 class WealthGroupCharacteristicValueInlineAdmin(admin.TabularInline):
     fields = ["wealth_characteristic", "value", "min_value", "max_value"]
@@ -534,6 +563,9 @@ def get_fieldsets(self, request, obj=None):
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         return qs.select_related(
+            "wealth_group__community__livelihood_zone_baseline__livelihood_zone",
+            "wealth_group__wealth_group_category",
+            "wealth_group__livelihood_zone_baseline",
             "livelihood_strategy__product",
             "livelihood_strategy__season",
             "livelihood_zone_baseline__livelihood_zone__country",
@@ -655,7 +687,12 @@ def get_country_name(self, obj):
     def get_queryset(self, request):
         qs = super().get_queryset(request)
         return qs.select_related(
-            "wealth_group__livelihood_zone_baseline__livelihood_zone__country", "product", "unit_of_measure"
+            "wealth_group__livelihood_zone_baseline__livelihood_zone__country",
+            "wealth_group__community__livelihood_zone_baseline__livelihood_zone",
+            "wealth_group__wealth_group_category",
+            "wealth_characteristic",
+            "product",
+            "unit_of_measure",
         )
 
     def get_wealth_characteristic_common_name(self, obj):
@@ -934,6 +971,23 @@ def get_queryset(self, request):
         return super().get_queryset(request).filter(strategy_type=LivelihoodStrategyType.OTHER_PURCHASE)
 
 
+class CommunityRelatedOnlyFieldListFilter(admin.RelatedOnlyFieldListFilter):
+    """
+    RelatedOnlyFieldListFilter for Community that prefetches livelihood_zone_baseline__livelihood_zone.
+    To avoid the current excess repeated queries executed due to str(community)
+    """
+
+    def field_choices(self, field, request, model_admin):
+        pk_qs = model_admin.get_queryset(request).distinct().values_list("%s__pk" % self.field_path, flat=True)
+        ordering = self.field_admin_ordering(field, request, model_admin)
+        return [
+            (community.pk, str(community))
+            for community in Community.objects.filter(pk__in=pk_qs)
+            .select_related("livelihood_zone_baseline__livelihood_zone")
+            .order_by(*ordering)
+        ]
+
+
 class WealthGroupAdmin(admin.ModelAdmin):
     form = WealthGroupForm
     list_display = (
@@ -951,16 +1005,24 @@ class WealthGroupAdmin(admin.ModelAdmin):
         "livelihood_zone_baseline__source_organization",
         ("livelihood_zone_baseline__livelihood_zone__country", admin.RelatedOnlyFieldListFilter),
         *translation_fields("livelihood_zone_baseline__livelihood_zone__name"),
-        ("community", admin.RelatedOnlyFieldListFilter),
+        ("community", CommunityRelatedOnlyFieldListFilter),
         "wealth_group_category",
     )
     inlines = [
         WealthGroupCharacteristicValueInlineAdmin,
     ] + [child for child in LivelihoodActivityInlineAdmin.__subclasses__()]
 
     def get_queryset(self, request):
-        queryset = super().get_queryset(request).prefetch_related("livelihoodactivity_set")
-        return queryset
+        return (
+            super()
+            .get_queryset(request)
+            .select_related(
+                "community__livelihood_zone_baseline__livelihood_zone",
+                "wealth_group_category",
+                "livelihood_zone_baseline",
+            )
+            .prefetch_related("livelihoodactivity_set")
+        )
 
 
 class SeasonalActivityAdmin(admin.ModelAdmin):

apps/metadata/admin.py

@@ -154,6 +154,9 @@ class SeasonAdmin(admin.ModelAdmin):
     )
     ordering = ("country", "order")
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("country")
+
 
 class MarketAdmin(ReferenceDataAdmin):
     fields = (
@@ -206,6 +209,9 @@ class ActivityLabelAdmin(admin.ModelAdmin):
         "attribute",
     )
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("product", "unit_of_measure")
+
 
 class WealthCharacteristicLabelAdmin(admin.ModelAdmin):
     fields = (
@@ -235,6 +241,9 @@ class WealthCharacteristicLabelAdmin(admin.ModelAdmin):
         "wealth_characteristic",
     )
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("wealth_characteristic", "product", "unit_of_measure")
+
 
 admin.site.register(LivelihoodCategory, LivelihoodCategoryAdmin)
 admin.site.register(WealthGroupCategory, WealthGroupCategoryAdmin)