Fix restricted area endpoint by type with specific cache key (#5150)

* fix(restricted_area): Fix cache with specifi restricted area endpoint by type

fix #5136

* fix(restricted_area): Update changelog for restricted area geojson cache fix

* fix(restricted_area): Update changelog for restricted area geojson cache fix

* test(restricted_area): Add tests for latest_updated method by type

* fix(restricted_area): Handle case when latest_updated returns None in geojson lookup

Author: submarcos

docs/changelog.rst

@@ -8,6 +8,7 @@ CHANGELOG
 **Bug fixes**
 
 * Fix ``label_en`` content on sensitivity module parser
+* Fix restricted area geojson that are not different by type in cache (#5136)
 
 2.121.1         (2025-11-17)
 ----------------------------

geotrek/zoning/models.py

@@ -35,6 +35,16 @@ class RestrictedArea(TimeStampedModelMixin, models.Model):
         help_text=_("Visible on Geotrek-rando"),
     )
 
+    @classmethod
+    def latest_updated(cls, type_id=None):
+        try:
+            qs = cls.objects.all()
+            if type_id:
+                qs = cls.objects.filter(area_type_id=type_id)
+            return qs.only("date_update").latest("date_update").date_update
+        except cls.DoesNotExist:
+            return None
+
     class Meta:
         ordering = ["area_type", "name"]
         verbose_name = _("Restricted area")

geotrek/zoning/tests/test_models.py

@@ -11,6 +11,7 @@
     CityFactory,
     DistrictFactory,
     RestrictedAreaFactory,
+    RestrictedAreaTypeFactory,
 )
 
 
@@ -347,3 +348,27 @@ def test_restricted_area_last_updated_with_data(self):
         restricted_area = RestrictedAreaFactory()
         self.assertIsNotNone(RestrictedArea.latest_updated())
         self.assertEqual(RestrictedArea.latest_updated(), restricted_area.date_update)
+
+    def test_latest_updated_when_no_data_at_all(self):
+        self.assertIsNone(RestrictedArea.latest_updated())
+
+    def test_latest_updated_is_different_by_type(self):
+        type_without_data = RestrictedAreaTypeFactory()
+        type_with_data = RestrictedAreaTypeFactory()
+        type_with_data_2 = RestrictedAreaTypeFactory()
+        RestrictedAreaFactory.create_batch(5, area_type=type_with_data)
+        RestrictedAreaFactory.create_batch(5, area_type=type_with_data_2)
+
+        self.assertIsNone(RestrictedArea.latest_updated(type_without_data.pk))
+        self.assertEqual(
+            RestrictedArea.latest_updated(type_with_data.pk),
+            type_with_data.restrictedarea_set.only("date_update")
+            .latest("date_update")
+            .date_update,
+        )
+        self.assertEqual(
+            RestrictedArea.latest_updated(type_with_data_2.pk),
+            type_with_data_2.restrictedarea_set.only("date_update")
+            .latest("date_update")
+            .date_update,
+        )

geotrek/zoning/views.py

@@ -1,6 +1,7 @@
 from django.conf import settings
 from django.contrib.gis.db.models.functions import Transform
 from django.shortcuts import get_object_or_404
+from django.utils.translation import get_language
 from mapentity.decorators import view_cache_latest, view_cache_response_content
 from mapentity.renderers import GeoJSONRenderer
 from rest_framework import permissions, viewsets
@@ -32,6 +33,19 @@ class RestrictedAreaViewSet(LandGeoJSONAPIViewMixin, viewsets.ReadOnlyModelViewS
     model = RestrictedArea
     serializer_class = RestrictedAreaSerializer
 
+    def view_cache_key(self):
+        """Used by the ``view_cache_response_content`` decorator."""
+        language = get_language()
+        geojson_lookup = None
+        latest_saved = self.model.latest_updated(type_id=self.kwargs.get("type_pk"))
+        geojson_lookup = "{}_restricted_area_{}_{}_{}_geojson_layer".format(
+            language,
+            self.kwargs.get("type_pk", "all"),
+            latest_saved.isoformat() if latest_saved else "no_data",
+            self.request.user.pk if settings.SURICATE_WORKFLOW_ENABLED else "",
+        )
+        return geojson_lookup
+
     def get_queryset(self):
         type_pk = self.kwargs.get("type_pk")
         qs = super().get_queryset()