fix: address review findings in geofence model

- Batch _compute_area_sqkm into single SQL query (was N+1)
- Use psycopg2.sql.Identifier for safe table name interpolation
- Narrow exception catch in to_geojson to specific types
- Prefetch tag_ids and create_uid in to_geojson_collection
- Add spp_gis. prefix to geofence ACL model_id references
- Remove redundant field guard in spp_api_v2_gis properties override

Author: jeremi

spp_api_v2_gis/models/geofence.py

@@ -19,11 +19,8 @@ class GisGeofence(models.Model):
     )
 
     def _get_geojson_properties(self):
-        """Extend properties with incident info when spp_hazard is installed."""
+        """Extend properties with incident info from spp_hazard."""
         props = super()._get_geojson_properties()
-        if "incident_id" in self._fields:
-            props["incident_id"] = (
-                self.incident_id.uuid if self.incident_id and hasattr(self.incident_id, "uuid") else None
-            )
-            props["incident_name"] = self.incident_id.name if self.incident_id else None
+        props["incident_id"] = self.incident_id.uuid if self.incident_id and hasattr(self.incident_id, "uuid") else None
+        props["incident_name"] = self.incident_id.name if self.incident_id else None
         return props

spp_gis/models/geofence.py

@@ -6,6 +6,7 @@
 import uuid
 
 import psycopg2
+from psycopg2 import sql
 from shapely.geometry import mapping
 
 from odoo import _, api, fields, models
@@ -103,25 +104,28 @@ def _compute_area_sqkm(self):
         Uses ST_Area with geography type for accurate area calculation
         in square meters, then converts to square kilometers.
         """
-        for rec in self:
-            if not rec.geometry or not rec.id:
-                rec.area_sqkm = 0.0
-                continue
-
-            try:
-                # Use PostGIS ST_Area with geography cast for accurate measurement
-                # Geography type automatically uses spheroid calculations
-                query = """
-                    SELECT ST_Area(ST_Transform(geometry::geometry, 4326)::geography) / 1000000.0 as area_sqkm
-                    FROM %s
-                    WHERE id = %%s
-                """
-                # Use self._table for the table name instead of hardcoding
-                self.env.cr.execute(query % self._table, (rec.id,))
-                result = self.env.cr.fetchone()
-                rec.area_sqkm = result[0] if result else 0.0
-            except psycopg2.Error as e:
-                _logger.warning("Failed to compute area for geofence %s: %s", rec.id, str(e))
+        records_with_geom = self.filtered(lambda r: r.geometry and r.id)
+        records_without = self - records_with_geom
+
+        for rec in records_without:
+            rec.area_sqkm = 0.0
+
+        if not records_with_geom:
+            return
+
+        try:
+            # Batch query: compute area for all records with geometry in one roundtrip
+            query = sql.SQL(
+                "SELECT id, ST_Area(ST_Transform(geometry::geometry, 4326)::geography) / 1000000.0 "
+                "FROM {} WHERE id IN %s"
+            ).format(sql.Identifier(self._table))
+            self.env.cr.execute(query, (tuple(records_with_geom.ids),))
+            results = dict(self.env.cr.fetchall())
+            for rec in records_with_geom:
+                rec.area_sqkm = results.get(rec.id, 0.0)
+        except psycopg2.Error as e:
+            _logger.warning("Failed to compute area for geofences %s: %s", records_with_geom.ids, str(e))
+            for rec in records_with_geom:
                 rec.area_sqkm = 0.0
 
     @api.constrains("name", "active")
@@ -170,7 +174,7 @@ def to_geojson(self):
         # Convert shapely geometry to GeoJSON
         try:
             geometry_dict = mapping(self.geometry)
-        except Exception as e:
+        except (ValueError, TypeError, AttributeError) as e:
             _logger.warning("Failed to convert geometry to GeoJSON for geofence %s: %s", self.id, str(e))
             geometry_dict = None
 
@@ -207,6 +211,9 @@ def to_geojson_collection(self):
         Returns:
             dict: GeoJSON FeatureCollection with all features
         """
+        # Prefetch related fields to avoid N+1 queries on singletons
+        self.mapped("tag_ids.name")
+        self.mapped("create_uid.name")
         features = [rec.to_geojson() for rec in self]
         return {
             "type": "FeatureCollection",

spp_gis/security/ir.model.access.csv

@@ -6,7 +6,7 @@ access_spp_raster_layer_admin,Raster Layer Admin,spp_gis.model_spp_gis_raster_la
 access_spp_raster_layer_type_admin,Raster Layer Type Admin,spp_gis.model_spp_gis_raster_layer_type,spp_security.group_spp_admin,1,1,1,1
 access_spp_data_layer_read,Data Layer Read,spp_gis.model_spp_gis_data_layer,spp_registry.group_registry_read,1,0,0,0
 access_spp_raster_layer_read,Raster Layer Read,spp_gis.model_spp_gis_raster_layer,spp_registry.group_registry_read,1,0,0,0
-access_spp_gis_geofence_admin,Geofence Admin,model_spp_gis_geofence,spp_security.group_spp_admin,1,1,1,1
-access_spp_gis_geofence_manager,Geofence Manager,model_spp_gis_geofence,spp_registry.group_registry_manager,1,1,1,1
-access_spp_gis_geofence_officer,Geofence Officer,model_spp_gis_geofence,spp_registry.group_registry_officer,1,1,1,0
-access_spp_gis_geofence_read,Geofence Read,model_spp_gis_geofence,spp_registry.group_registry_read,1,0,0,0
+access_spp_gis_geofence_admin,Geofence Admin,spp_gis.model_spp_gis_geofence,spp_security.group_spp_admin,1,1,1,1
+access_spp_gis_geofence_manager,Geofence Manager,spp_gis.model_spp_gis_geofence,spp_registry.group_registry_manager,1,1,1,1
+access_spp_gis_geofence_officer,Geofence Officer,spp_gis.model_spp_gis_geofence,spp_registry.group_registry_officer,1,1,1,0
+access_spp_gis_geofence_read,Geofence Read,spp_gis.model_spp_gis_geofence,spp_registry.group_registry_read,1,0,0,0