refactor: faire qu'un seul query pour toutes les villes/EPCIs au lieu d'en faire un pour chacun

Author: dmc1985

back/dora/decoupage_administratif/models.py

@@ -38,6 +38,14 @@ def get_from_code(self, code):
         self._cache[code] = value
         return value
 
+    def warm_cache(self, codes):
+        codes_to_fetch = {c.upper() for c in codes if c} - self._cache.keys()
+        if not codes_to_fetch:
+            return
+        found = {obj.code.upper(): obj for obj in self.filter(code__in=codes_to_fetch)}
+        for code in codes_to_fetch:
+            self._cache[code] = found.get(code)
+
 
 # Cache instantané pour les tables comportant peu d'entités
 # on fait la requête une fois pour toute

back/dora/emplois/tests/test_emplois_views.py

@@ -3,6 +3,7 @@
 from model_bakery import baker
 
 from dora.core.test_utils import make_published_service
+from dora.decoupage_administratif.models import AdminDivisionType, City
 
 
 def test_services_api_requires_authentication(api_client):
@@ -66,14 +67,21 @@ def test_services_api_list_queries_are_bounded(
     api_client,
     django_assert_num_queries,
 ):
-    for _ in range(3):
-        make_published_service()
+    """
+    Il faut assurer qu'il n'y a qu'un seul query pour toutes les villes
+    """
+    for i in range(5):
+        city_code = f"7500{i}"
+        baker.make(City, code=city_code, name="Paris")
+        make_published_service(
+            diffusion_zone_details=city_code, diffusion_zone_type=AdminDivisionType.CITY
+        )
 
-    with django_assert_num_queries(11):
+    with django_assert_num_queries(12):
         response = api_client.get(reverse("emplois:service-list"))
 
     assert response.status_code == 200
-    assert len(response.data) == 3
+    assert len(response.data) == 5
 
 
 def test_services_api_detail_queries_are_bounded(

back/dora/emplois/views.py

@@ -2,9 +2,15 @@
 from django.db.models import Prefetch
 from rest_framework import permissions, viewsets
 from rest_framework.renderers import JSONRenderer
+from rest_framework.response import Response
 from rest_framework.versioning import NamespaceVersioning
 
 from dora.core.pagination import OptionalPageNumberPagination
+from dora.decoupage_administratif.models import (
+    EPCI,
+    AdminDivisionType,
+    City,
+)
 from dora.orientations.models import Orientation, OrientationStatus
 from dora.services.models import Service
 from dora.structures.models import DisabledDoraFormDIStructure
@@ -58,6 +64,31 @@ def get_queryset(self):
             .order_by("pk")
         )
 
+    def _warm_geo_caches(self, services):
+        city_codes = [
+            s.diffusion_zone_details
+            for s in services
+            if s.diffusion_zone_type == AdminDivisionType.CITY
+        ]
+        epci_codes = [
+            s.diffusion_zone_details
+            for s in services
+            if s.diffusion_zone_type == AdminDivisionType.EPCI
+        ]
+        City.objects.warm_cache(city_codes)
+        EPCI.objects.warm_cache(epci_codes)
+
+    def list(self, request, *args, **kwargs):
+        queryset = self.filter_queryset(self.get_queryset())
+        page = self.paginate_queryset(queryset)
+        if page is not None:
+            self._warm_geo_caches(page)
+            serializer = self.get_serializer(page, many=True)
+            return self.get_paginated_response(serializer.data)
+        self._warm_geo_caches(queryset)
+        serializer = self.get_serializer(queryset, many=True)
+        return Response(serializer.data)
+
 
 class DisabledDoraFormDIStructureViewSet(viewsets.ReadOnlyModelViewSet):
     versioning_class = NamespaceVersioning