Update backend/app/data/store.py

backend/app/data/store.py

@@ -1,13 +1,22 @@
-# same content as your current store.py, just moved here
+# backend/app/data/store.py
 from __future__ import annotations
 import json, sqlite3
 from datetime import datetime, timezone, timedelta
 from typing import Dict, Any, List, Optional
 from pathlib import Path
-from ..data.geo import haversine_km
 
-Path("data").mkdir(exist_ok=True)
-_CONN = sqlite3.connect("data/pulsemaps_reports.db", check_same_thread=False)
+from ..config.settings import settings
+from .geo import haversine_km
+
+DB_PATH: Path = settings.REPORTS_DB
+# Ensure parent exists & fail early if unwritable
+DB_PATH.parent.mkdir(parents=True, exist_ok=True)
+try:
+    DB_PATH.touch(exist_ok=True)
+except Exception as e:
+    raise RuntimeError(f"Cannot create DB file at {DB_PATH}: {e}")
+
+_CONN = sqlite3.connect(str(DB_PATH), check_same_thread=False)
 _CONN.execute("""
 CREATE TABLE IF NOT EXISTS reports (
   id INTEGER PRIMARY KEY AUTOINCREMENT,
@@ -24,9 +33,17 @@ def _row_to_feature(row: tuple) -> Dict[str, Any]:
     _id, lat, lon, text, props_json, created_at = row
     props = {"type": "user_report", "text": text, "reported_at": created_at}
     if props_json:
-        try: props.update(json.loads(props_json))
-        except Exception: props["raw_props"] = props_json
-    return {"type": "Feature", "geometry": {"type": "Point", "coordinates": [lon, lat]}, "properties": props}
+        try:
+            props.update(json.loads(props_json))
+        except Exception:
+            props["raw_props"] = props_json
+    props.setdefault("rid", str(_id))
+    props.setdefault("id", str(_id))
+    return {
+        "type": "Feature",
+        "geometry": {"type": "Point", "coordinates": [lon, lat]},
+        "properties": props,
+    }
 
 def add_report(lat: float, lon: float, text: str = "User report", props: dict | None = None):
     created_at = datetime.now(timezone.utc).isoformat()
@@ -37,9 +54,8 @@ def add_report(lat: float, lon: float, text: str = "User report", props: dict |
         (float(lat), float(lon), text, props_json, created_at)
     )
     _CONN.commit()
-    rid = str(cur.lastrowid)  # ✅ new id
+    rid = str(cur.lastrowid)
 
-    # include rid in the immediate response so the UI can show counts instantly
     out_props = {"type": "user_report", "text": text, "reported_at": created_at, **props}
     out_props.setdefault("rid", rid)
     out_props.setdefault("id", rid)
@@ -55,7 +71,13 @@ def get_feature_collection() -> Dict[str, Any]:
     feats = [_row_to_feature(r) for r in cur.fetchall()]
     return {"type": "FeatureCollection", "features": feats}
 
-def find_reports_near(lat: float, lon: float, radius_km: float = 10.0, limit: int = 20, max_age_hours: Optional[int] = None) -> List[Dict[str, Any]]:
+def find_reports_near(
+    lat: float,
+    lon: float,
+    radius_km: float = 10.0,
+    limit: int = 20,
+    max_age_hours: Optional[int] = None,
+) -> List[Dict[str, Any]]:
     params: list[Any] = []
     sql = "SELECT id, lat, lon, text, props_json, created_at FROM reports"
     if max_age_hours is not None:
@@ -76,25 +98,7 @@ def find_reports_near(lat: float, lon: float, radius_km: float = 10.0, limit: in
     out = [_row_to_feature(r) for _, r in cand[:max(1, limit)]]
     return out
 
-def clear_reports() -> dict[str, any]:
+def clear_reports() -> dict[str, Any]:
     _CONN.execute("DELETE FROM reports")
     _CONN.commit()
     return {"ok": True, "message": "All reports cleared."}
-
-def _row_to_feature(row: tuple) -> Dict[str, Any]:
-    _id, lat, lon, text, props_json, created_at = row
-    props = {"type": "user_report", "text": text, "reported_at": created_at}
-    if props_json:
-        try:
-            props.update(json.loads(props_json))
-        except Exception:
-            props["raw_props"] = props_json
-    # ✅ ensure a stable id is present on every returned feature
-    props.setdefault("rid", str(_id))
-    props.setdefault("id", str(_id))      # optional mirror
-    return {
-        "type": "Feature",
-        "geometry": {"type": "Point", "coordinates": [lon, lat]},
-        "properties": props,
-    }
-