rest api

server/src/routes.js

@@ -1,104 +1,100 @@
 import { Router } from 'express';
 import db from './db.js';
 
-const r = Router();
+const router = Router();
 
-const MEMBER_SELECT = `
-  SELECT m.*, g.name AS group_name, g.color AS group_color
+const MEMBER_SQL = `SELECT m.*, g.name AS group_name, g.color AS group_color
   FROM members m LEFT JOIN talkgroups g ON g.id = m.group_id`;
-const SOS_SELECT = `
-  SELECT a.*, mm.name AS member_name
-  FROM sos_alerts a JOIN members mm ON mm.id = a.member_id`;
+const SOS_SQL = `SELECT a.*, m.name AS member_name FROM sos_alerts a
+  JOIN members m ON m.id = a.member_id`;
 
-r.get('/me', (req, res) => res.json({ id: req.user.sub, username: req.user.username, role: req.user.role }));
+const hub = (req) => req.app.get('hub');
 
-// ---- talkgroups ----
-r.get('/groups', (req, res) => {
+router.get('/groups', (req, res) => {
   res.json(db.prepare('SELECT * FROM talkgroups ORDER BY id').all());
 });
 
-r.post('/groups', (req, res) => {
+router.post('/groups', (req, res) => {
   const { name, color = '#3b82f6' } = req.body || {};
-  if (!name || typeof name !== 'string') return res.status(400).json({ error: 'name is required' });
-  const info = db.prepare('INSERT INTO talkgroups (name, color) VALUES (?, ?)').run(name.trim(), color);
-  req.app.get('hub')?.broadcastGroups();
-  res.json(db.prepare('SELECT * FROM talkgroups WHERE id = ?').get(info.lastInsertRowid));
+  if (!name) return res.status(400).json({ error: 'name required' });
+  try {
+    const info = db.prepare('INSERT INTO talkgroups (name, color) VALUES (?, ?)').run(name, color);
+    hub(req)?.broadcastGroups();
+    res.json(db.prepare('SELECT * FROM talkgroups WHERE id = ?').get(info.lastInsertRowid));
+  } catch {
+    res.status(409).json({ error: 'group name already exists' });
+  }
 });
 
-// ---- members ----
-r.get('/members', (req, res) => {
-  res.json(db.prepare(`${MEMBER_SELECT} ORDER BY m.id`).all());
+router.get('/members', (req, res) => {
+  res.json(db.prepare(`${MEMBER_SQL} ORDER BY m.id`).all());
 });
 
-r.post('/members', (req, res) => {
-  const { name, callsign = null, device_id, group_id = null } = req.body || {};
-  if (!name || !device_id) return res.status(400).json({ error: 'name and device_id are required' });
+router.post('/members', (req, res) => {
+  const { name, callsign, device_id, group_id } = req.body || {};
+  if (!name) return res.status(400).json({ error: 'name required' });
+  if (!device_id) return res.status(400).json({ error: 'device_id required' });
   try {
     const info = db.prepare('INSERT INTO members (name, callsign, device_id, group_id) VALUES (?, ?, ?, ?)')
-      .run(name.trim(), callsign, device_id.trim(), group_id);
-    req.app.get('hub')?.broadcastMembers();
-    res.json(db.prepare(`${MEMBER_SELECT} WHERE m.id = ?`).get(info.lastInsertRowid));
+      .run(name, callsign || null, device_id, group_id ?? null);
+    hub(req)?.broadcastMembers();
+    res.json(db.prepare(`${MEMBER_SQL} WHERE m.id = ?`).get(info.lastInsertRowid));
   } catch {
-    res.status(400).json({ error: 'device_id already exists or group_id is invalid' });
+    res.status(409).json({ error: 'device_id already exists' });
   }
 });
 
-r.put('/members/:id', (req, res) => {
-  const { name, callsign = null, device_id, group_id = null } = req.body || {};
-  if (!name || !device_id) return res.status(400).json({ error: 'name and device_id are required' });
-  const info = db.prepare('UPDATE members SET name = ?, callsign = ?, device_id = ?, group_id = ? WHERE id = ?')
-    .run(name.trim(), callsign, device_id.trim(), group_id, req.params.id);
-  if (!info.changes) return res.status(404).json({ error: 'member not found' });
-  req.app.get('hub')?.broadcastMembers();
-  res.json(db.prepare(`${MEMBER_SELECT} WHERE m.id = ?`).get(req.params.id));
+router.put('/members/:id', (req, res) => {
+  const m = db.prepare('SELECT * FROM members WHERE id = ?').get(req.params.id);
+  if (!m) return res.status(404).json({ error: 'member not found' });
+  const { name = m.name, callsign = m.callsign, group_id = m.group_id } = req.body || {};
+  db.prepare('UPDATE members SET name = ?, callsign = ?, group_id = ? WHERE id = ?')
+    .run(name, callsign, group_id, m.id);
+  hub(req)?.broadcastMembers();
+  res.json(db.prepare(`${MEMBER_SQL} WHERE m.id = ?`).get(m.id));
 });
 
-r.delete('/members/:id', (req, res) => {
+router.delete('/members/:id', (req, res) => {
   const info = db.prepare('DELETE FROM members WHERE id = ?').run(req.params.id);
   if (!info.changes) return res.status(404).json({ error: 'member not found' });
-  req.app.get('hub')?.broadcastMembers();
+  hub(req)?.broadcastMembers();
   res.json({ ok: true });
 });
 
-// ---- SOS ----
-r.get('/sos', (req, res) => {
-  const { state } = req.query;
-  const rows = state
-    ? db.prepare(`${SOS_SELECT} WHERE a.state = ? ORDER BY a.created_at DESC`).all(state)
-    : db.prepare(`${SOS_SELECT} ORDER BY a.created_at DESC LIMIT 100`).all();
+router.get('/sos', (req, res) => {
+  const rows = req.query.state
+    ? db.prepare(`${SOS_SQL} WHERE a.state = ? ORDER BY a.created_at DESC LIMIT 200`).all(req.query.state)
+    : db.prepare(`${SOS_SQL} ORDER BY a.created_at DESC LIMIT 200`).all();
   res.json(rows);
 });
 
-r.post('/sos/:id/ack', (req, res) => {
-  db.prepare("UPDATE sos_alerts SET state = 'ack', ack_by = ?, updated_at = ? WHERE id = ?")
+router.post('/sos/:id/ack', (req, res) => {
+  const info = db.prepare(`UPDATE sos_alerts SET state = 'ack', ack_by = ?, updated_at = ? WHERE id = ? AND state = 'open'`)
     .run(req.user.username, Date.now(), req.params.id);
-  const alert = db.prepare(`${SOS_SELECT} WHERE a.id = ?`).get(req.params.id);
-  if (alert) req.app.get('hub')?.broadcast({ type: 'sos_update', alert });
-  res.json(alert || { ok: true });
+  if (!info.changes) return res.status(409).json({ error: 'alert not open' });
+  const row = db.prepare(`${SOS_SQL} WHERE a.id = ?`).get(req.params.id);
+  hub(req)?.broadcast({ type: 'sos_update', alert: row });
+  res.json(row);
 });
 
-r.post('/sos/:id/resolve', (req, res) => {
-  db.prepare("UPDATE sos_alerts SET state = 'resolved', ack_by = COALESCE(ack_by, ?), updated_at = ? WHERE id = ?")
+router.post('/sos/:id/resolve', (req, res) => {
+  const info = db.prepare(`UPDATE sos_alerts SET state = 'resolved', ack_by = COALESCE(ack_by, ?), updated_at = ? WHERE id = ? AND state != 'resolved'`)
     .run(req.user.username, Date.now(), req.params.id);
-  const alert = db.prepare(`${SOS_SELECT} WHERE a.id = ?`).get(req.params.id);
-  if (alert) req.app.get('hub')?.broadcast({ type: 'sos_update', alert });
-  res.json(alert || { ok: true });
+  if (!info.changes) return res.status(409).json({ error: 'alert already resolved' });
+  const row = db.prepare(`${SOS_SQL} WHERE a.id = ?`).get(req.params.id);
+  hub(req)?.broadcast({ type: 'sos_update', alert: row });
+  res.json(row);
 });
 
-// ---- history ----
-r.get('/members/:id/trail', (req, res) => {
+router.get('/members/:id/trail', (req, res) => {
   const since = Number(req.query.since) || 0;
-  res.json(db.prepare(`SELECT lat, lng, speed, ts FROM gps_pings
-                       WHERE member_id = ? AND ts > ? ORDER BY ts LIMIT 5000`).all(req.params.id, since));
+  res.json(db.prepare('SELECT lat, lng, speed, ts FROM gps_pings WHERE member_id = ? AND ts > ? ORDER BY ts LIMIT 5000')
+    .all(req.params.id, since));
 });
 
-r.get('/calls', (req, res) => {
-  res.json(db.prepare(`
-    SELECT c.*, g.name AS group_name, COALESCE(mm.name, 'dispatcher') AS who
-    FROM call_log c
-    LEFT JOIN members mm ON mm.id = c.member_id
-    LEFT JOIN talkgroups g ON g.id = c.group_id
-    ORDER BY c.ts DESC LIMIT 100`).all());
+router.get('/calls', (req, res) => {
+  res.json(db.prepare(`SELECT c.*, m.name AS member_name FROM call_log c
+    LEFT JOIN members m ON m.id = c.member_id ORDER BY c.ts DESC LIMIT 100`).all());
 });
 
-export default r;
+export default router;