Merge pull request #2217 from IFRCGo/feature/fieldreport-csv-n+1

Field-report query fix n+1

Author: szabozoltan69

api/drf_views.py

@@ -917,7 +917,17 @@ class FieldReportViewset(ReadOnlyVisibilityViewsetMixin, viewsets.ModelViewSet):
     filterset_class = FieldReportFilter
     authentication_class = [IsAuthenticated]
     queryset = FieldReport.objects.select_related("dtype", "event").prefetch_related(
-        "actions_taken", "actions_taken__actions", "countries", "districts", "regions"
+        "actions_taken",
+        "actions_taken__actions",
+        "contacts",
+        "countries",
+        "districts",
+        # Unusable – in serializer: wired-in get_merged_items_by_fields():
+        # "event__countries",
+        "external_partners",
+        "regions",
+        "sources",
+        "supported_activities",
     )
 
     def get_serializer_class(self):

local_units/admin.py

@@ -55,6 +55,9 @@ class LocalUnitAdmin(CompareVersionAdmin, admin.OSMGeoAdmin):
         AutocompleteFilterFactory("Level", "level"),
     )
 
+    def get_queryset(self, request):
+        return super().get_queryset(request).select_related("country")
+
     def save_model(self, request, obj, form, change):
         if obj.type.code == 1 and obj.health:
             raise ValidationError({"Can't have health data for type %s" % obj.type.code})