Hot fix : améliorer la perf de la page "mes cantines"

api/serializers/__init__.py

@@ -12,6 +12,7 @@
     SatelliteTeledeclarationSerializer,
     ElectedCanteenSerializer,
     MinimalCanteenSerializer,
+    CanteenSummarySerializer,
 )
 from .diagnostic import (  # noqa: F401
     ManagerDiagnosticSerializer,

api/serializers/canteen.py

@@ -365,6 +365,62 @@ def get_central_kitchen_diagnostics(self, obj):
             return None
 
 
+class CanteenSummarySerializer(serializers.ModelSerializer):
+    images = MediaListSerializer(child=CanteenImageSerializer(), required=False)
+    diagnostics = FullDiagnosticSerializer(many=True, read_only=True, source="diagnostic_set")
+    central_kitchen_diagnostics = serializers.SerializerMethodField(read_only=True)
+
+    class Meta:
+        model = Canteen
+        my_fields = (
+            "id",
+            "name",
+            "city",
+            "city_insee_code",
+            "postal_code",
+            "sectors",
+            "daily_meal_count",
+            "yearly_meal_count",
+            "siret",
+            "management_type",
+            "production_type",
+            "department",
+            "region",
+            "publication_status",
+            "economic_model",
+            "is_central_cuisine",
+            "modification_date",
+            # the following can still be improved
+            "images",  # can return the first image only
+            "diagnostics",
+            "central_kitchen_diagnostics",  # can return a TD status instead of diagnostics
+        )
+        fields = my_fields
+        read_only_fields = my_fields
+
+    def get_central_kitchen_diagnostics(self, obj):
+        # Ideally we would also check the status of the satellite canteen and
+        # the central cuisine, for now we omit this check. For now it is the
+        # responsibility of the frontend to use this information.
+        if not obj.central_producer_siret or not obj.production_type == Canteen.ProductionType.ON_SITE_CENTRAL:
+            return None
+        try:
+            diagnostics = Diagnostic.objects.filter(
+                canteen__siret=obj.central_producer_siret,
+                central_kitchen_diagnostic_mode__in=[
+                    Diagnostic.CentralKitchenDiagnosticMode.ALL,
+                    Diagnostic.CentralKitchenDiagnosticMode.APPRO,
+                ],
+            )
+
+            return CentralKitchenDiagnosticSerializer(diagnostics, many=True).data
+        except Canteen.DoesNotExist:
+            return None
+        except Canteen.MultipleObjectsReturned as e:
+            logger.exception(f"Multiple canteens returned when obtaining the central_producer_siret field {e}")
+            return None
+
+
 class CanteenPreviewSerializer(serializers.ModelSerializer):
     class Meta:
         model = Canteen

api/urls.py

@@ -31,7 +31,7 @@
 from api.views import ImportSimpleDiagnosticsView, ImportCompleteDiagnosticsView
 from api.views import TeledeclarationCreateView, TeledeclarationCancelView, TeledeclarationPdfView
 from api.views import PublishCanteenView, UnpublishCanteenView, SendCanteenNotFoundEmail
-from api.views import UserCanteenPreviews, CanteenLocationsView
+from api.views import UserCanteenPreviews, UserCanteenSummaries, CanteenLocationsView
 from api.views import PartnerView, PartnersView, PartnerTypeListView
 from api.views import ReservationExpeView, PurchaseListExportView, PurchaseOptionsView, ImportPurchasesView
 from api.views import MessageCreateView, VegetarianExpeView, TeamJoinRequestView
@@ -58,6 +58,7 @@
     ),
     path("publish/", PublishManyCanteensView.as_view(), name="publish_canteens"),
     path("canteenPreviews/", UserCanteenPreviews.as_view(), name="user_canteen_previews"),
+    path("canteenSummaries/", UserCanteenSummaries.as_view(), name="user_canteens_summaries"),
     path("canteens/", UserCanteensView.as_view(), name="user_canteens"),
     path("canteens/<int:pk>", RetrieveUpdateUserCanteenView.as_view(), name="single_canteen"),
     path(

api/views/__init__.py

@@ -29,6 +29,7 @@
     ActionableCanteenRetrieveView,
     CanteenStatusView,
     TerritoryCanteensListView,
+    UserCanteenSummaries,
 )
 from .diagnostic import (  # noqa: F401
     DiagnosticCreateView,

api/views/canteen.py

@@ -36,6 +36,7 @@
     CanteenStatusSerializer,
     ElectedCanteenSerializer,
     MinimalCanteenSerializer,
+    CanteenSummarySerializer,
 )
 from data.models import Canteen, ManagerInvitation, Sector, Diagnostic, Teledeclaration, Purchase
 from data.region_choices import Region
@@ -377,6 +378,25 @@ def get_queryset(self):
         return self.request.user.canteens.all()
 
 
+class UserCanteenSummaries(ListAPIView):
+    model = Canteen
+    serializer_class = CanteenSummarySerializer
+    permission_classes = [IsAuthenticatedOrTokenHasResourceScope]
+    required_scopes = ["canteen"]
+    pagination_class = UserCanteensPagination
+    filter_backends = [
+        django_filters.DjangoFilterBackend,
+        UnaccentSearchFilter,
+        MaCantineOrderingFilter,
+    ]
+    filterset_class = UserCanteensFilterSet
+    search_fields = ["name", "siret"]
+    ordering_fields = ["name", "creation_date", "modification_date", "daily_meal_count"]
+
+    def get_queryset(self):
+        return self.request.user.canteens.all()
+
+
 @extend_schema_view(
     get=extend_schema(
         summary="Obtenir les détails d'une cantine.",

frontend/src/views/ManagementPage/CanteensPagination.vue

@@ -133,7 +133,7 @@ export default {
       if (this.filterProductionType !== "all") queryParam += `&production_type=${this.filterProductionType}`
       this.inProgress = true
 
-      return fetch(`/api/v1/canteens/?${queryParam}`)
+      return fetch(`/api/v1/canteenSummaries/?${queryParam}`)
         .then((response) => {
           if (response.status < 200 || response.status >= 400) throw new Error(`Error encountered : ${response}`)
           return response.json()