Merge branch 'develop' – N+1 fix for SituationReportViewset

Author: szabozoltan69

api/drf_views.py

@@ -50,7 +50,10 @@
     SituationReportFilter,
     UserFilterSet,
 )
-from api.visibility_class import ReadOnlyVisibilityViewsetMixin
+from api.visibility_class import (
+    ReadOnlyVisibilityViewset,
+    ReadOnlyVisibilityViewsetMixin,
+)
 from country_plan.models import CountryPlan
 from databank.serializers import CountryOverviewSerializer
 from deployments.models import Personnel
@@ -148,7 +151,6 @@
     UserSerializer,
 )
 from .utils import is_user_ifrc
-from .visibility_class import ReadOnlyVisibilityViewset
 
 
 class DeploymentsByEventViewset(viewsets.ReadOnlyModelViewSet):
@@ -720,7 +722,8 @@ class SituationReportTypeViewset(viewsets.ReadOnlyModelViewSet):
     search_fields = ("type",)  # for /docs
 
 
-class SituationReportViewset(ReadOnlyVisibilityViewset):
+class SituationReportViewset(ReadOnlyVisibilityViewsetMixin, viewsets.ReadOnlyModelViewSet):
+    queryset = SituationReport.objects.select_related("type")
     authentication_classes = (TokenAuthentication,)
     serializer_class = SituationReportSerializer
     ordering_fields = (