solves review comments

Author: Josephrp

radioshaq/radioshaq/api/routes/emergency.py

@@ -179,13 +179,16 @@ async def approve_emergency_event(
     if not emergency_messaging_allowed(region, getattr(config, "emergency_contact", None)):
         raise HTTPException(status_code=403, detail="Emergency SMS/WhatsApp not allowed in this region")
     db = getattr(request.app.state, "db", None)
-    if db is None or not hasattr(db, "claim_emergency_event_pending") or not hasattr(db, "get_coordination_event_by_id") or not hasattr(db, "update_coordination_event"):
+    if db is None or not hasattr(db, "claim_emergency_event_pending") or not hasattr(db, "update_coordination_event"):
+        raise HTTPException(status_code=503, detail="Database not available")
+    if not (hasattr(db, "get_coordination_event_by_id_raw") or hasattr(db, "get_coordination_event_by_id")):
         raise HTTPException(status_code=503, detail="Database not available")
+    get_event = getattr(db, "get_coordination_event_by_id_raw", db.get_coordination_event_by_id)
     # Atomic claim: only one concurrent approval can transition pending -> approving
     claimed = await db.claim_emergency_event_pending(event_id)
     if claimed is None:
         raise HTTPException(status_code=400, detail="Event already processed")
-    event = await db.get_coordination_event_by_id(event_id)
+    event = await get_event(event_id)
     if not event or event.get("event_type") != "emergency":
         await db.update_coordination_event(event_id, status="pending")  # roll back claim
         raise HTTPException(status_code=400, detail="Not an emergency event")
@@ -253,7 +256,13 @@ async def reject_emergency_event(
         raise HTTPException(status_code=400, detail="Not an emergency event")
     rejector = getattr(_user, "sub", None) or getattr(_user, "callsign", "api")
     now = datetime.now(timezone.utc).isoformat()
-    extra = event.get("extra_data") or {}
-    extra.update({"rejected_at": now, "rejected_by": str(rejector), **({"notes": body.notes} if body.notes else {})})
-    await db.update_coordination_event(event_id, status="rejected", extra_data=extra)
+    await db.update_coordination_event(
+        event_id,
+        status="rejected",
+        extra_data={
+            "rejected_at": now,
+            "rejected_by": str(rejector),
+            **({"notes": body.notes} if body.notes else {}),
+        },
+    )
     return {"ok": True, "event_id": event_id, "status": "rejected"}

radioshaq/radioshaq/database/postgres_gis.py

@@ -513,12 +513,34 @@ async def store_coordination_event(
             return event.id
 
     async def get_coordination_event_by_id(self, event_id: int) -> dict[str, Any] | None:
-        """Get a single coordination event by id. Returns None if not found."""
+        """Get a single coordination event by id. Returns None if not found. Uses to_dict() (redacted for API)."""
         async with self.async_session() as session:
             result = await session.execute(select(CoordinationEvent).where(CoordinationEvent.id == event_id))
             row = result.scalar_one_or_none()
             return row.to_dict() if row else None
 
+    async def get_coordination_event_by_id_raw(self, event_id: int) -> dict[str, Any] | None:
+        """Get a coordination event with unredacted extra_data (for internal use e.g. approve handler)."""
+        async with self.async_session() as session:
+            result = await session.execute(select(CoordinationEvent).where(CoordinationEvent.id == event_id))
+            row = result.scalar_one_or_none()
+            if not row:
+                return None
+            return {
+                "id": row.id,
+                "event_type": row.event_type,
+                "initiator_callsign": row.initiator_callsign,
+                "target_callsign": row.target_callsign,
+                "scheduled_time": row.scheduled_time.isoformat() if row.scheduled_time else None,
+                "frequency_hz": row.frequency_hz,
+                "mode": row.mode,
+                "status": row.status,
+                "priority": row.priority,
+                "notes": row.notes,
+                "created_at": row.created_at.isoformat() if row.created_at else None,
+                "extra_data": dict(row.extra_data) if row.extra_data else {},
+            }
+
     async def update_coordination_event(
         self,
         event_id: int,