fix(soil): normalize parcel URN to prevent double-prefix (#16)

Co-authored-by: g <gilleniko@gmail.com>

Author: basabot

backend/src/nkz_soil/api/routes/internal.py

@@ -16,6 +16,14 @@
 
 logger = logging.getLogger(__name__)
 
+_PARCEL_URN_PREFIX = "urn:ngsi-ld:AgriParcel:"
+
+
+def _parcel_urn(parcel_id: str) -> str:
+    if parcel_id.startswith(_PARCEL_URN_PREFIX):
+        return parcel_id
+    return f"{_PARCEL_URN_PREFIX}{parcel_id}"
+
 router = APIRouter()
 
 
@@ -52,7 +60,7 @@ async def setup_parcel(request: Request):
     # If no geometry provided, resolve from Orion
     if not geometry:
         async with OrionClient(tenant_id) as orion:
-            q = f'id=="urn:ngsi-ld:AgriParcel:{parcel_id}"'
+            q = f'id=="{_parcel_urn(parcel_id)}"'
             parcels = await orion.query_entities(type="AgriParcel", q=q, limit=1)
             if parcels:
                 geometry = parcels[0].get("location", {}).get("value", {})

backend/src/nkz_soil/api/routes/writing.py

@@ -13,6 +13,16 @@
 router = APIRouter()
 
 
+_PARCEL_URN_PREFIX = "urn:ngsi-ld:AgriParcel:"
+
+
+def _parcel_urn(parcel_id: str) -> str:
+    """Return canonical parcel URN, normalizing short id or full URN."""
+    if parcel_id.startswith(_PARCEL_URN_PREFIX):
+        return parcel_id
+    return f"{_PARCEL_URN_PREFIX}{parcel_id}"
+
+
 class SamplingPointInput(BaseModel):
     lat: float
     lon: float
@@ -123,7 +133,7 @@ async def create_survey(body: SurveyInput, auth: AuthContext = require_auth()):
     if body.parcel_id:
         entity["hasAgriParcel"] = {
             "type": "Relationship",
-            "object": f"urn:ngsi-ld:AgriParcel:{body.parcel_id}",
+            "object": _parcel_urn(body.parcel_id),
         }
 
     async with OrionClient(tenant_id) as orion:

backend/src/nkz_soil/workers/ingest.py

@@ -10,6 +10,11 @@
 from nkz_soil.config import REDIS_URL
 from nkz_soil.workers.water_budget import compute_water_budgets
 from nkz_soil.models.domain import DepthInterval, SoilDataResult, SoilProperty
+
+_PARCEL_URN_PREFIX = "urn:ngsi-ld:AgriParcel:"
+
+def _short_id(parcel_id: str) -> str:
+    return parcel_id.split(":")[-1] if parcel_id.startswith(_PARCEL_URN_PREFIX) else parcel_id
 from nkz_soil.models.ngsi_ld import AgriSoilExtended, GeoProperty, Relationship, TaggedProperty
 from nkz_soil.pedotransfer.awc import awc_from_horizons
 from nkz_soil.pedotransfer.relative_compaction import relative_compaction
@@ -145,9 +150,9 @@ def build_agri_soil_extended(
     winners = _winner_source_per_attr({"horizons": True}, results)
     hw = winners.get("horizons", {})
     return AgriSoilExtended(
-        id=f"urn:ngsi-ld:AgriSoilExtended:{parcel_id}",
+        id=f"urn:ngsi-ld:AgriSoilExtended:{_short_id(parcel_id)}",
         location=GeoProperty(value=location),
-        hasAgriParcel=Relationship(object=f"urn:ngsi-ld:AgriParcel:{parcel_id}"),
+        hasAgriParcel=Relationship(object=f"urn:ngsi-ld:AgriParcel:{_short_id(parcel_id)}"),
         horizons=TaggedProperty(
             value=merged_horizons,
             provided_by=hw.get("source_tag"),