Complete operational map result workflow

backend/tests/test_sprint107_map_selection_export.py

@@ -2,12 +2,13 @@ from __future__ import annotations
 
 import json
 from pathlib import Path
+from types import SimpleNamespace
 from uuid import uuid4
 
 from fastapi.testclient import TestClient
 
 from app.main import app
-from app.models import Dataset, Export
+from app.models import Area, Dataset, Export
 from app.schemas.export import ExportCreateResponse
 from app.services.export_service import ExportService
 from app.services.storage_service import StorageService
@@ -91,23 +92,31 @@ def test_vector_selection_geojson_export_persists_handoff_artifact(tmp_path, mon
 def test_vector_selection_geojson_export_endpoint_returns_canonical_envelope(monkeypatch) -> None:
     export_id = uuid4()
     dataset_id = uuid4()
+    area_id = uuid4()
     expected_bbox = {"min_x": 4.9, "min_y": 50.9, "max_x": 5.2, "max_y": 51.2, "crs": "EPSG:4326"}
+    captured: dict = {}
 
-    monkeypatch.setattr(
-        ExportService,
-        "export_vector_selection_geojson",
-        lambda *_args, **_kwargs: ExportCreateResponse(
+    def fake_export(*_args, **kwargs):
+        captured.update(kwargs)
+        return ExportCreateResponse(
             export_id=export_id,
             path="storage/exports/demo-selection.geojson",
             status="ready",
             export_type="vector_selection_geojson",
             metadata_json={"source": "vector_selection", "selection_bbox": expected_bbox},
-        ),
-    )
+        )
+
+    monkeypatch.setattr(ExportService, "export_vector_selection_geojson", fake_export)
 
     response = TestClient(app).post(
         "/api/v1/exports/geojson",
-        json={"dataset_id": str(dataset_id), "export_kind": "vector_selection", "bbox": expected_bbox, "limit": 250},
+        json={
+            "dataset_id": str(dataset_id),
+            "area_id": str(area_id),
+            "export_kind": "vector_selection",
+            "bbox": expected_bbox,
+            "limit": 250,
+        },
     )
 
     assert response.status_code == 200
@@ -116,6 +125,55 @@ def test_vector_selection_geojson_export_endpoint_returns_canonical_envelope(mon
     assert payload["data"]["export_id"] == str(export_id)
     assert payload["data"]["export_type"] == "vector_selection_geojson"
     assert payload["data"]["metadata_json"]["selection_bbox"] == expected_bbox
+    assert captured["area_id"] == area_id
+
+
+def test_vector_selection_export_uses_exact_area_scope_when_requested(tmp_path, monkeypatch) -> None:
+    project_id = uuid4()
+    dataset_id = uuid4()
+    area_id = uuid4()
+    dataset = Dataset(
+        id=dataset_id,
+        project_id=project_id,
+        name="regional-buildings.geojson",
+        dataset_type="vector",
+        source="fixture",
+        status="ready",
+    )
+    area_geometry = object()
+    area = SimpleNamespace(id=area_id, project_id=project_id, name="Gemeente Mol", geometry=area_geometry)
+    db = FakeSession({(Dataset, dataset_id): dataset, (Area, area_id): area})
+    selection_bbox = {"min_x": 5.0, "min_y": 51.1, "max_x": 5.2, "max_y": 51.3, "crs": "EPSG:4326"}
+    captured: dict = {}
+    selection_payload = {
+        "selection_bbox": selection_bbox,
+        "selection_area_id": str(area_id),
+        "feature_count": 0,
+        "limit": 250,
+        "truncated": False,
+        "geojson": {"type": "FeatureCollection", "features": []},
+    }
+
+    monkeypatch.setattr(StorageService, "dataset_export_path", lambda *_args: str(tmp_path / "selection.geojson"))
+    monkeypatch.setattr(VectorFeatureService, "can_use_full_area_fast_path", lambda *_args: True)
+
+    def fake_select(*_args, **kwargs):
+        captured.update(kwargs)
+        return selection_payload
+
+    monkeypatch.setattr(VectorFeatureService, "select_features_by_bbox", fake_select)
+
+    response = ExportService.export_vector_selection_geojson(
+        db,
+        dataset_id,
+        selection_bbox,
+        area_id=area_id,
+    )
+
+    assert captured["selection_geometry"] is area_geometry
+    assert captured["selection_area_id"] == area_id
+    assert captured["full_dataset_area"] is True
+    assert response.metadata_json["selection_area_id"] == str(area_id)
 
 
 def test_frontend_exposes_map_selection_export_action() -> None:
@@ -127,6 +185,7 @@ def test_frontend_exposes_map_selection_export_action() -> None:
 
     assert "'vector_selection'" in types
     assert "bbox?: VectorSelectionBBox" in exports_api
+    assert "area_id?: string" in exports_api
     assert "exportMapSelectionGeoJson" in export_hook
     assert "vector_selection" in export_hook
     assert "Save area export" in map_workspace