feat: only display geozones associated to parcels$

Author: stephenprn

core/permissions/geo_custom_zone.py

@@ -5,7 +5,7 @@
 from core.permissions.base import BasePermission
 from core.repository.geo_custom_zone import GeoCustomZoneRepository
 
-from django.db.models import QuerySet, Prefetch
+from django.db.models import Q, QuerySet, Prefetch
 
 
 class GeoCustomZonePermission(
@@ -57,3 +57,19 @@ def get_detection_prefetch(self):
 
     def get_parcel_prefetch(self):
         return self._get_prefetch()
+
+    def get_geo_custom_zones_q(self, lookup_root: str = "") -> Q:
+        q = Q(
+            **{
+                f"{lookup_root}geo_custom_zones__geo_custom_zone_status": GeoCustomZoneStatus.ACTIVE
+            }
+        )
+
+        if self.user.user_role != UserRole.SUPER_ADMIN:
+            q &= Q(
+                **{
+                    f"{lookup_root}geo_custom_zones__user_groups_custom_geo_zones__user_user_groups__user": self.user.id
+                }
+            )
+
+        return q

core/repository/parcel.py

@@ -83,6 +83,7 @@ def filter_(
         filter_detections_count_gt: Optional[int] = None,
         with_commune: bool = False,
         with_zone_names: bool = False,
+        filter_geo_custom_zones: Optional[Q] = None,
         with_detections_count: bool = False,
         with_detections_objects_types: bool = False,
         *args,
@@ -143,6 +144,7 @@ def filter_(
         queryset = self._annotate_zone_names(
             queryset=queryset,
             with_zone_names=with_zone_names,
+            filter_geo_custom_zones=filter_geo_custom_zones,
         )
         queryset = self._annotate_detections_count(
             queryset=queryset,
@@ -183,18 +185,24 @@ def _annotate_commune(
     def _annotate_zone_names(
         queryset: QuerySet[Parcel],
         with_zone_names: bool = False,
+        filter_geo_custom_zones: Optional[Q] = None,
     ) -> QuerySet[Parcel]:
         if not with_zone_names:
             return queryset
 
+        zone_names_filter = models.Q(geo_custom_zones__isnull=False)
+
+        if filter_geo_custom_zones is not None:
+            zone_names_filter &= filter_geo_custom_zones
+
         queryset = queryset.annotate(
             zone_names=ArrayAgg(
                 Coalesce(
                     "geo_custom_zones__geo_custom_zone_category__name",
                     "geo_custom_zones__name",
                 ),
                 distinct=True,
-                filter=models.Q(geo_custom_zones__isnull=False),
+                filter=zone_names_filter,
             ),
         )
 

core/services/parcel_filter.py

@@ -3,6 +3,7 @@
 
 from core.models.detection_data import DetectionControlStatus, DetectionValidationStatus
 from core.models.tile_set import TileSetType, TileSetStatus
+from core.permissions.geo_custom_zone import GeoCustomZonePermission
 from core.permissions.user import UserPermission
 from core.permissions.tile_set import TileSetPermission
 from core.repository.base import NumberRepoFilter, RepoFilterLookup
@@ -61,6 +62,9 @@ def apply_filters(
 
         if with_details:
             filter_args["with_zone_names"] = True
+            filter_args["filter_geo_custom_zones"] = GeoCustomZonePermission(
+                user=self.user
+            ).get_geo_custom_zones_q()
             filter_args["with_detections_count"] = True
             filter_args["with_detections_objects_types"] = True
 

core/views/parcel.py

@@ -19,6 +19,7 @@
     ParcelSerializer,
     ParcelOverviewSerializer,
 )
+from core.permissions.geo_custom_zone import GeoCustomZonePermission
 from core.services.parcel_filter import ParcelFilterService
 from core.utils.filters import ChoiceInFilter, UuidInFilter
 from rest_framework.response import Response
@@ -139,6 +140,15 @@ def list_items(self, request):
             with_details=True,
         )
 
+        geo_custom_zones_prefetch, geo_custom_zones_category_prefetch = (
+            GeoCustomZonePermission(user=self.request.user).get_parcel_prefetch()
+        )
+
+        queryset = queryset.prefetch_related(
+            geo_custom_zones_prefetch,
+            geo_custom_zones_category_prefetch,
+        )
+
         queryset = queryset.distinct()
         page = self.paginate_queryset(queryset)