Actualizar server.js
This commit is contained in:
259
server.js
259
server.js
@@ -3,7 +3,6 @@ import cors from "cors";
|
|||||||
import bcrypt from "bcryptjs";
|
import bcrypt from "bcryptjs";
|
||||||
import jwt from "jsonwebtoken";
|
import jwt from "jsonwebtoken";
|
||||||
import pg from "pg";
|
import pg from "pg";
|
||||||
// NOTA: No importamos node-fetch. Usamos el nativo de Node v18+.
|
|
||||||
|
|
||||||
const { Pool } = pg;
|
const { Pool } = pg;
|
||||||
const app = express();
|
const app = express();
|
||||||
@@ -104,33 +103,15 @@ async function autoUpdateDB() {
|
|||||||
);
|
);
|
||||||
`);
|
`);
|
||||||
|
|
||||||
// 2. TABLAS GEOGRÁFICAS
|
// 2. TABLAS ZONAS (Simplificadas, sin provincias ni pueblos externos)
|
||||||
await client.query(`
|
await client.query(`
|
||||||
CREATE TABLE IF NOT EXISTS provinces (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
name TEXT UNIQUE NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS towns (
|
|
||||||
id SERIAL PRIMARY KEY,
|
|
||||||
province_id INT REFERENCES provinces(id) ON DELETE CASCADE,
|
|
||||||
name TEXT NOT NULL
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS zones (
|
CREATE TABLE IF NOT EXISTS zones (
|
||||||
id SERIAL PRIMARY KEY,
|
id SERIAL PRIMARY KEY,
|
||||||
province_id INT REFERENCES provinces(id) ON DELETE CASCADE,
|
|
||||||
name TEXT NOT NULL,
|
name TEXT NOT NULL,
|
||||||
owner_id INT,
|
owner_id INT,
|
||||||
created_at TIMESTAMP DEFAULT NOW()
|
created_at TIMESTAMP DEFAULT NOW()
|
||||||
);
|
);
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS zone_towns (
|
|
||||||
zone_id INT REFERENCES zones(id) ON DELETE CASCADE,
|
|
||||||
town_id INT REFERENCES towns(id) ON DELETE CASCADE,
|
|
||||||
PRIMARY KEY (zone_id, town_id)
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE IF NOT EXISTS user_zones (
|
CREATE TABLE IF NOT EXISTS user_zones (
|
||||||
user_id INT REFERENCES users(id) ON DELETE CASCADE,
|
user_id INT REFERENCES users(id) ON DELETE CASCADE,
|
||||||
zone_id INT REFERENCES zones(id) ON DELETE CASCADE,
|
zone_id INT REFERENCES zones(id) ON DELETE CASCADE,
|
||||||
@@ -176,10 +157,7 @@ async function autoUpdateDB() {
|
|||||||
);
|
);
|
||||||
`);
|
`);
|
||||||
|
|
||||||
// 4. SEEDING (CARGA DE DATOS INE)
|
// 4. PARCHE DE REPARACIÓN
|
||||||
await seedSpainData(client);
|
|
||||||
|
|
||||||
// 5. PARCHE DE REPARACIÓN
|
|
||||||
await client.query(`
|
await client.query(`
|
||||||
DO $$ BEGIN
|
DO $$ BEGIN
|
||||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='services' AND column_name='client_id') THEN ALTER TABLE services ADD COLUMN client_id INT REFERENCES clients(id) ON DELETE SET NULL; END IF;
|
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='services' AND column_name='client_id') THEN ALTER TABLE services ADD COLUMN client_id INT REFERENCES clients(id) ON DELETE SET NULL; END IF;
|
||||||
@@ -211,59 +189,6 @@ async function autoUpdateDB() {
|
|||||||
} catch (e) { console.error("❌ Error DB:", e); } finally { client.release(); }
|
} catch (e) { console.error("❌ Error DB:", e); } finally { client.release(); }
|
||||||
}
|
}
|
||||||
|
|
||||||
// 🌍 CARGA MASIVA INE (SIN NODE-FETCH y CON CHEQUEO INTELIGENTE)
|
|
||||||
async function seedSpainData(client) {
|
|
||||||
try {
|
|
||||||
// Comprobamos si hay PUEBLOS (si hay menos de 500, asumimos que está incompleta y recargamos)
|
|
||||||
const count = await client.query("SELECT COUNT(*) FROM towns");
|
|
||||||
if (parseInt(count.rows[0].count) > 500) return;
|
|
||||||
|
|
||||||
console.log("📥 Base de datos de poblaciones incompleta. Iniciando descarga del INE...");
|
|
||||||
|
|
||||||
// Usamos fetch nativo (Node 18+)
|
|
||||||
const response = await fetch("https://raw.githubusercontent.com/frontid/comunidades-provincias-poblaciones/master/poblaciones.json");
|
|
||||||
if (!response.ok) throw new Error("Fallo al descargar JSON");
|
|
||||||
|
|
||||||
const listFull = await response.json();
|
|
||||||
|
|
||||||
console.log(`🇪🇸 Insertando ${listFull.length} poblaciones... Por favor, espera.`);
|
|
||||||
|
|
||||||
await client.query("BEGIN");
|
|
||||||
|
|
||||||
// 1. Extraer y crear Provincias (Evitando duplicados con ON CONFLICT)
|
|
||||||
const provincesSet = new Set();
|
|
||||||
listFull.forEach(item => provincesSet.add(item.parent_op));
|
|
||||||
|
|
||||||
const provinceMap = new Map();
|
|
||||||
|
|
||||||
for (const provName of provincesSet) {
|
|
||||||
// Insertar si no existe
|
|
||||||
await client.query("INSERT INTO provinces (name) VALUES ($1) ON CONFLICT (name) DO NOTHING", [provName]);
|
|
||||||
// Obtener ID (sea nuevo o viejo)
|
|
||||||
const res = await client.query("SELECT id FROM provinces WHERE name=$1", [provName]);
|
|
||||||
if (res.rows[0]) provinceMap.set(provName, res.rows[0].id);
|
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Insertar Pueblos (Solo si tenemos la provincia)
|
|
||||||
for (const item of listFull) {
|
|
||||||
const pid = provinceMap.get(item.parent_op);
|
|
||||||
if (pid) {
|
|
||||||
// Usamos INSERT simple, si hay duplicados no pasa nada grave en esta fase masiva
|
|
||||||
await client.query("INSERT INTO towns (province_id, name) VALUES ($1, $2)", [pid, item.label]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
await client.query("COMMIT");
|
|
||||||
console.log("✅ Datos de España (8.000+ municipios) cargados correctamente.");
|
|
||||||
|
|
||||||
} catch (e) {
|
|
||||||
await client.query("ROLLBACK");
|
|
||||||
console.error("❌ Error Seeding INE:", e);
|
|
||||||
// Fallback de emergencia para que la app no rompa
|
|
||||||
await client.query("INSERT INTO provinces (name) VALUES ('Cádiz') ON CONFLICT DO NOTHING");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// HELPERS
|
// HELPERS
|
||||||
function normalizePhone(phone) { let p = String(phone || "").trim().replace(/\s+/g, "").replace(/-/g, ""); if (!p) return ""; if (!p.startsWith("+") && /^[6789]\d{8}$/.test(p)) return "+34" + p; return p; }
|
function normalizePhone(phone) { let p = String(phone || "").trim().replace(/\s+/g, "").replace(/-/g, ""); if (!p) return ""; if (!p.startsWith("+") && /^[6789]\d{8}$/.test(p)) return "+34" + p; return p; }
|
||||||
function genCode6() { return String(Math.floor(100000 + Math.random() * 900000)); }
|
function genCode6() { return String(Math.floor(100000 + Math.random() * 900000)); }
|
||||||
@@ -278,111 +203,99 @@ app.post("/auth/login", async (req, res) => { try { const { email, password } =
|
|||||||
app.post("/auth/forgot-password", async (req, res) => { try { const { dni, phone } = req.body; const p = normalizePhone(phone); const q = await pool.query("SELECT id FROM users WHERE dni=$1 AND phone=$2", [dni, p]); if (q.rowCount === 0) return res.status(404).json({ ok: false }); const uid = q.rows[0].id; const code = genCode6(); const hash = await bcrypt.hash(code, 10); await pool.query("INSERT INTO login_codes (user_id, phone, code_hash, purpose, expires_at) VALUES ($1, $2, $3, 'password_reset', $4)", [uid, p, hash, new Date(Date.now()+600000)]); await sendWhatsAppCode(p, code); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
app.post("/auth/forgot-password", async (req, res) => { try { const { dni, phone } = req.body; const p = normalizePhone(phone); const q = await pool.query("SELECT id FROM users WHERE dni=$1 AND phone=$2", [dni, p]); if (q.rowCount === 0) return res.status(404).json({ ok: false }); const uid = q.rows[0].id; const code = genCode6(); const hash = await bcrypt.hash(code, 10); await pool.query("INSERT INTO login_codes (user_id, phone, code_hash, purpose, expires_at) VALUES ($1, $2, $3, 'password_reset', $4)", [uid, p, hash, new Date(Date.now()+600000)]); await sendWhatsAppCode(p, code); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
||||||
app.post("/auth/reset-password", async (req, res) => { const client = await pool.connect(); try { const { phone, code, newPassword } = req.body; const p = normalizePhone(phone); const q = await client.query(`SELECT lc.*, u.id as uid FROM login_codes lc JOIN users u ON lc.user_id=u.id WHERE lc.phone=$1 AND lc.purpose='password_reset' AND lc.consumed_at IS NULL AND lc.expires_at>NOW() ORDER BY lc.created_at DESC LIMIT 1`, [p]); if(q.rowCount===0) return res.status(400).json({ok:false}); const row=q.rows[0]; if(!(await bcrypt.compare(String(code), row.code_hash))) return res.status(400).json({ok:false}); const hash=await bcrypt.hash(newPassword, 10); await client.query('BEGIN'); await client.query("UPDATE users SET password_hash=$1 WHERE id=$2",[hash, row.uid]); await client.query("UPDATE login_codes SET consumed_at=NOW() WHERE id=$1",[row.id]); await client.query('COMMIT'); res.json({ok:true}); } catch(e){await client.query('ROLLBACK'); res.status(500).json({ok:false});} finally{client.release();} });
|
app.post("/auth/reset-password", async (req, res) => { const client = await pool.connect(); try { const { phone, code, newPassword } = req.body; const p = normalizePhone(phone); const q = await client.query(`SELECT lc.*, u.id as uid FROM login_codes lc JOIN users u ON lc.user_id=u.id WHERE lc.phone=$1 AND lc.purpose='password_reset' AND lc.consumed_at IS NULL AND lc.expires_at>NOW() ORDER BY lc.created_at DESC LIMIT 1`, [p]); if(q.rowCount===0) return res.status(400).json({ok:false}); const row=q.rows[0]; if(!(await bcrypt.compare(String(code), row.code_hash))) return res.status(400).json({ok:false}); const hash=await bcrypt.hash(newPassword, 10); await client.query('BEGIN'); await client.query("UPDATE users SET password_hash=$1 WHERE id=$2",[hash, row.uid]); await client.query("UPDATE login_codes SET consumed_at=NOW() WHERE id=$1",[row.id]); await client.query('COMMIT'); res.json({ok:true}); } catch(e){await client.query('ROLLBACK'); res.status(500).json({ok:false});} finally{client.release();} });
|
||||||
|
|
||||||
// =========================
|
// DATOS MAESTROS
|
||||||
// API GEOGRÁFICA (ZONAS Y PUEBLOS)
|
app.get("/statuses", authMiddleware, async (req, res) => {
|
||||||
// =========================
|
|
||||||
app.get("/provinces", authMiddleware, async (req, res) => {
|
|
||||||
try { const q = await pool.query("SELECT * FROM provinces ORDER BY name ASC"); res.json({ ok: true, provinces: q.rows }); } catch (e) { res.status(500).json({ ok: false }); }
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get("/provinces/:id/towns", authMiddleware, async (req, res) => {
|
|
||||||
try {
|
try {
|
||||||
const q = await pool.query("SELECT * FROM towns WHERE province_id=$1 ORDER BY name ASC", [req.params.id]);
|
let q = await pool.query("SELECT * FROM service_statuses WHERE owner_id=$1 ORDER BY id ASC", [req.user.accountId]);
|
||||||
res.json({ ok: true, towns: q.rows });
|
if (q.rowCount === 0) {
|
||||||
|
const defaults = [{name:'Pendiente',c:'gray',d:true,f:false},{name:'En Proceso',c:'blue',d:false,f:false},{name:'Terminado',c:'green',d:false,f:true},{name:'Cancelado',c:'red',d:false,f:true}];
|
||||||
|
for (const s of defaults) await pool.query("INSERT INTO service_statuses (owner_id,name,color,is_default,is_final) VALUES ($1,$2,$3,$4,$5)", [req.user.accountId,s.name,s.c,s.d,s.f]);
|
||||||
|
q = await pool.query("SELECT * FROM service_statuses WHERE owner_id=$1 ORDER BY id ASC", [req.user.accountId]);
|
||||||
|
}
|
||||||
|
res.json({ ok: true, statuses: q.rows });
|
||||||
} catch (e) { res.status(500).json({ ok: false }); }
|
} catch (e) { res.status(500).json({ ok: false }); }
|
||||||
});
|
});
|
||||||
|
app.get("/clients/search", authMiddleware, async (req, res) => {
|
||||||
|
try { const { phone } = req.query; const p = normalizePhone(phone); if(!p) return res.json({ok:true,client:null}); const q = await pool.query("SELECT * FROM clients WHERE phone=$1 AND owner_id=$2 LIMIT 1", [p, req.user.accountId]); res.json({ ok: true, client: q.rows[0] || null }); } catch (e) { res.status(500).json({ ok: false }); }
|
||||||
|
});
|
||||||
|
app.get("/companies", authMiddleware, async (req, res) => { try { const q = await pool.query("SELECT * FROM companies WHERE owner_id=$1 ORDER BY name ASC", [req.user.accountId]); res.json({ ok: true, companies: q.rows }); } catch (e) { res.status(500).json({ ok: false }); } });
|
||||||
|
app.post("/companies", authMiddleware, async (req, res) => { try { const { name } = req.body; await pool.query("INSERT INTO companies (name, owner_id) VALUES ($1, $2)", [name, req.user.accountId]); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
||||||
|
|
||||||
app.get("/zones", authMiddleware, async (req, res) => {
|
// OBTENER OPERARIOS POR GREMIO (Y ZONA EN EL FUTURO)
|
||||||
|
app.get("/operators", authMiddleware, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { province_id } = req.query;
|
const { guild_id } = req.query;
|
||||||
let query = `
|
let query = `SELECT u.id, u.full_name FROM users u JOIN user_guilds ug ON u.id = ug.user_id WHERE u.owner_id = $1 AND u.role = 'operario'`;
|
||||||
SELECT z.*,
|
|
||||||
(SELECT json_agg(t.name) FROM zone_towns zt JOIN towns t ON zt.town_id = t.id WHERE zt.zone_id = z.id) as towns_names
|
|
||||||
FROM zones z
|
|
||||||
WHERE (owner_id IS NULL OR owner_id=$1)`;
|
|
||||||
const params = [req.user.accountId];
|
const params = [req.user.accountId];
|
||||||
if(province_id) { query += " AND province_id=$2"; params.push(province_id); }
|
if (guild_id) { query += ` AND ug.guild_id = $2`; params.push(guild_id); }
|
||||||
query += " ORDER BY name ASC";
|
query += ` GROUP BY u.id ORDER BY u.full_name ASC`;
|
||||||
const q = await pool.query(query, params);
|
const q = await pool.query(query, params);
|
||||||
res.json({ ok: true, zones: q.rows });
|
res.json({ ok: true, operators: q.rows });
|
||||||
} catch (e) { res.status(500).json({ ok: false }); }
|
|
||||||
});
|
|
||||||
|
|
||||||
app.post("/zones", authMiddleware, async (req, res) => {
|
|
||||||
const client = await pool.connect();
|
|
||||||
try {
|
|
||||||
const { province_id, name, town_ids } = req.body;
|
|
||||||
if (!province_id || !name) return res.status(400).json({ ok: false });
|
|
||||||
await client.query('BEGIN');
|
|
||||||
const q = await client.query("INSERT INTO zones (province_id, name, owner_id) VALUES ($1, $2, $3) RETURNING id", [province_id, name, req.user.accountId]);
|
|
||||||
const zoneId = q.rows[0].id;
|
|
||||||
if (town_ids && Array.isArray(town_ids)) {
|
|
||||||
for (const tid of town_ids) await client.query("INSERT INTO zone_towns (zone_id, town_id) VALUES ($1, $2)", [zoneId, tid]);
|
|
||||||
}
|
|
||||||
await client.query('COMMIT'); res.json({ ok: true });
|
|
||||||
} catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); }
|
|
||||||
});
|
|
||||||
|
|
||||||
app.delete("/zones/:id", authMiddleware, async (req, res) => {
|
|
||||||
try { await pool.query("DELETE FROM zones WHERE id=$1 AND owner_id=$2", [req.params.id, req.user.accountId]); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); }
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get("/zones/:id/operators", authMiddleware, async (req, res) => { try { const q = await pool.query("SELECT user_id FROM user_zones WHERE zone_id=$1", [req.params.id]); const assignedIds = q.rows.map(r => r.user_id); res.json({ ok: true, assignedIds }); } catch (e) { res.status(500).json({ ok: false }); } });
|
|
||||||
app.post("/zones/:id/assign", authMiddleware, async (req, res) => {
|
|
||||||
const client = await pool.connect();
|
|
||||||
try {
|
|
||||||
const { operator_ids } = req.body; const zoneId = req.params.id;
|
|
||||||
await client.query('BEGIN');
|
|
||||||
await client.query("DELETE FROM user_zones WHERE zone_id=$1 AND user_id IN (SELECT id FROM users WHERE owner_id=$2)", [zoneId, req.user.accountId]);
|
|
||||||
if (operator_ids && Array.isArray(operator_ids)) {
|
|
||||||
for (const uid of operator_ids) {
|
|
||||||
const check = await client.query("SELECT id FROM users WHERE id=$1 AND owner_id=$2", [uid, req.user.accountId]);
|
|
||||||
if (check.rowCount > 0) await client.query("INSERT INTO user_zones (user_id, zone_id) VALUES ($1, $2)", [uid, zoneId]);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
await client.query('COMMIT'); res.json({ ok: true });
|
|
||||||
} catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); }
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get("/towns/:id/auto-assign", authMiddleware, async (req, res) => {
|
|
||||||
try {
|
|
||||||
const qZone = await pool.query(`
|
|
||||||
SELECT z.id, z.name FROM zone_towns zt
|
|
||||||
JOIN zones z ON zt.zone_id = z.id
|
|
||||||
WHERE zt.town_id = $1 AND (z.owner_id = $2 OR z.owner_id IS NULL)
|
|
||||||
LIMIT 1
|
|
||||||
`, [req.params.id, req.user.accountId]);
|
|
||||||
|
|
||||||
if (qZone.rowCount === 0) return res.json({ ok: true, found: false });
|
|
||||||
const zone = qZone.rows[0];
|
|
||||||
|
|
||||||
const qOps = await pool.query(`
|
|
||||||
SELECT u.id, u.full_name FROM user_zones uz
|
|
||||||
JOIN users u ON uz.user_id = u.id WHERE uz.zone_id = $1
|
|
||||||
`, [zone.id]);
|
|
||||||
|
|
||||||
res.json({ ok: true, found: true, zone_name: zone.name, operators: qOps.rows });
|
|
||||||
} catch (e) { res.status(500).json({ ok: false, error: e.message }); }
|
} catch (e) { res.status(500).json({ ok: false, error: e.message }); }
|
||||||
});
|
});
|
||||||
|
|
||||||
// OBTENER OPERARIOS
|
|
||||||
app.get("/operators", authMiddleware, async (req, res) => { try { const q = await pool.query("SELECT id, full_name FROM users WHERE owner_id=$1 AND role='operario' ORDER BY full_name ASC", [req.user.accountId]); res.json({ ok: true, operators: q.rows }); } catch (e) { res.status(500).json({ ok: false }); } });
|
|
||||||
|
|
||||||
// SERVICIOS CRUD
|
// SERVICIOS CRUD
|
||||||
app.get("/services", authMiddleware, async (req, res) => { try { const q = await pool.query(`SELECT s.*, st.name as status_name, st.color as status_color, c.name as company_name, g.name as guild_name, u.full_name as assigned_name FROM services s LEFT JOIN service_statuses st ON s.status_id = st.id LEFT JOIN companies c ON s.company_id = c.id LEFT JOIN guilds g ON s.guild_id = g.id LEFT JOIN users u ON s.assigned_to = u.id WHERE s.owner_id=$1 ORDER BY s.created_at DESC`, [req.user.accountId]); res.json({ ok: true, services: q.rows }); } catch (e) { res.status(500).json({ ok: false }); } });
|
app.get("/services", authMiddleware, async (req, res) => {
|
||||||
app.get("/services/:id", authMiddleware, async (req, res) => { try { const q = await pool.query(`SELECT * FROM services WHERE id=$1 AND owner_id=$2`, [req.params.id, req.user.accountId]); res.json({ ok: true, service: q.rows[0] }); } catch (e) { res.status(500).json({ ok: false }); } });
|
try {
|
||||||
app.get("/services/:id/logs", authMiddleware, async (req, res) => { try { const q = await pool.query(`SELECT l.*, u.full_name as user_name, s2.name as new_status, s2.color as new_color FROM service_logs l LEFT JOIN users u ON l.user_id=u.id LEFT JOIN service_statuses s2 ON l.new_status_id=s2.id WHERE l.service_id=$1 ORDER BY l.created_at DESC`, [req.params.id]); res.json({ ok: true, logs: q.rows }); } catch (e) { res.status(500).json({ ok: false }); } });
|
const q = await pool.query(`
|
||||||
app.put("/services/:id/status", authMiddleware, async (req, res) => { const client = await pool.connect(); try { const { status_id, comment } = req.body; await client.query('BEGIN'); const curr = await client.query("SELECT status_id FROM services WHERE id=$1", [req.params.id]); const old = curr.rows[0].status_id; await client.query("UPDATE services SET status_id=$1 WHERE id=$2", [status_id, req.params.id]); await client.query("INSERT INTO service_logs (service_id, user_id, old_status_id, new_status_id, comment) VALUES ($1, $2, $3, $4, $5)", [req.params.id, req.user.sub, old, status_id, comment]); await client.query('COMMIT'); res.json({ ok: true }); } catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); } });
|
SELECT s.*, st.name as status_name, st.color as status_color, c.name as company_name,
|
||||||
app.post("/services", authMiddleware, async (req, res) => { const client = await pool.connect(); try { const { phone, name, address, email, description, scheduled_date, scheduled_time, duration, is_urgent, is_company, company_id, company_ref, internal_notes, client_notes, status_id, guild_id, assigned_to } = req.body; const p = normalizePhone(phone); const safeDuration = (duration === "" || duration === null) ? 30 : duration; const safeCompanyId = (company_id === "" || company_id === null) ? null : company_id; const safeGuildId = (guild_id === "" || guild_id === null) ? null : guild_id; const safeAssignedTo = (assigned_to === "" || assigned_to === null) ? null : assigned_to; await client.query('BEGIN'); let finalStatus = status_id; if (!finalStatus) { const def = await client.query("SELECT id FROM service_statuses WHERE owner_id=$1 AND is_default=TRUE LIMIT 1", [req.user.accountId]); finalStatus = def.rows[0]?.id; } let clientId; const cCheck = await client.query("SELECT id, addresses FROM clients WHERE phone=$1 AND owner_id=$2", [p, req.user.accountId]); if (cCheck.rowCount > 0) { clientId = cCheck.rows[0].id; let addrs = cCheck.rows[0].addresses || []; if(!addrs.includes(address)) { addrs.push(address); await client.query("UPDATE clients SET addresses=$1 WHERE id=$2", [JSON.stringify(addrs), clientId]); } } else { const newC = await client.query("INSERT INTO clients (owner_id, full_name, phone, email, addresses) VALUES ($1, $2, $3, $4, $5) RETURNING id", [req.user.accountId, name, p, email, JSON.stringify([address])]); clientId = newC.rows[0].id; } const insert = await client.query(`INSERT INTO services (owner_id, client_id, status_id, contact_phone, contact_name, address, email, description, scheduled_date, scheduled_time, duration_minutes, is_urgent, is_company, company_id, company_ref, internal_notes, client_notes, title, guild_id, assigned_to) VALUES ($1, $2, $3, $4, $5, $6, $7, $8, $9, $10, $11, $12, $13, $14, $15, $16, $17, $18, $19, $20) RETURNING id`, [req.user.accountId, clientId, finalStatus, p, name, address, email, description, scheduled_date || 'NOW()', scheduled_time || 'NOW()', safeDuration, is_urgent || false, is_company || false, safeCompanyId, company_ref, internal_notes, client_notes, name + " - Svc", safeGuildId, safeAssignedTo]); await client.query("INSERT INTO service_logs (service_id, user_id, new_status_id, comment) VALUES ($1, $2, $3, 'Servicio Creado')", [insert.rows[0].id, req.user.sub, finalStatus]); await client.query('COMMIT'); res.json({ ok: true }); } catch (e) { await client.query('ROLLBACK'); console.error(e); res.status(500).json({ ok: false, error: e.message }); } finally { client.release(); } });
|
g.name as guild_name, u.full_name as assigned_name
|
||||||
app.put("/services/:id", authMiddleware, async (req, res) => { const client = await pool.connect(); try { const { name, address, email, description, scheduled_date, scheduled_time, duration, is_urgent, is_company, company_id, company_ref, internal_notes, client_notes, guild_id, assigned_to } = req.body; const safeDuration = (duration === "" || duration === null) ? 30 : duration; const safeCompanyId = (company_id === "" || company_id === null) ? null : company_id; const safeGuildId = (guild_id === "" || guild_id === null) ? null : guild_id; const safeAssignedTo = (assigned_to === "" || assigned_to === null) ? null : assigned_to; await client.query('BEGIN'); await client.query(`UPDATE services SET contact_name=$1, address=$2, email=$3, description=$4, scheduled_date=$5, scheduled_time=$6, duration_minutes=$7, is_urgent=$8, is_company=$9, company_id=$10, company_ref=$11, internal_notes=$12, client_notes=$13, guild_id=$14, assigned_to=$15 WHERE id=$16 AND owner_id=$17`, [name, address, email, description, scheduled_date, scheduled_time, safeDuration, is_urgent, is_company, safeCompanyId, company_ref, internal_notes, client_notes, safeGuildId, safeAssignedTo, req.params.id, req.user.accountId]); await client.query("INSERT INTO service_logs (service_id, user_id, new_status_id, comment) VALUES ($1, $2, (SELECT status_id FROM services WHERE id=$1), 'Datos editados')", [req.params.id, req.user.sub]); await client.query('COMMIT'); res.json({ ok: true }); } catch (e) { await client.query('ROLLBACK'); console.error(e); res.status(500).json({ ok: false }); } finally { client.release(); } });
|
FROM services s
|
||||||
app.delete("/services/:id", authMiddleware, async (req, res) => { try { await pool.query("DELETE FROM services WHERE id=$1 AND owner_id=$2", [req.params.id, req.user.accountId]); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
LEFT JOIN service_statuses st ON s.status_id = st.id
|
||||||
app.get("/guilds", authMiddleware, async (req, res) => { try { const q = await pool.query("SELECT * FROM guilds WHERE owner_id=$1 ORDER BY name ASC", [req.user.accountId]); res.json({ ok: true, guilds: q.rows }); } catch (e) { res.status(500).json({ ok: false }); } });
|
LEFT JOIN companies c ON s.company_id = c.id
|
||||||
app.post("/guilds", authMiddleware, async (req, res) => { try { const { name } = req.body; await pool.query("INSERT INTO guilds (name, owner_id) VALUES ($1, $2)", [name, req.user.accountId]); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
LEFT JOIN guilds g ON s.guild_id = g.id
|
||||||
app.delete("/guilds/:id", authMiddleware, async (req, res) => { try { await pool.query("DELETE FROM guilds WHERE id=$1 AND owner_id=$2", [req.params.id, req.user.accountId]); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
LEFT JOIN users u ON s.assigned_to = u.id
|
||||||
app.get("/admin/users", authMiddleware, async (req, res) => { try { const q = await pool.query(`SELECT u.id, u.full_name, u.email, u.phone, u.role, COALESCE(json_agg(g.id) FILTER (WHERE g.id IS NOT NULL), '[]') as guilds FROM users u LEFT JOIN user_guilds ug ON u.id=ug.user_id LEFT JOIN guilds g ON ug.guild_id=g.id WHERE u.owner_id=$1 GROUP BY u.id ORDER BY u.id DESC`, [req.user.accountId]); res.json({ ok: true, users: q.rows }); } catch (e) { res.status(500).json({ ok: false }); } });
|
WHERE s.owner_id=$1 ORDER BY s.created_at DESC`,
|
||||||
app.post("/admin/users", authMiddleware, async (req, res) => { const client = await pool.connect(); try { const { fullName, email, password, role, guilds, phone } = req.body; if (!email || !password || !fullName || !phone) return res.status(400).json({ ok: false }); const p = normalizePhone(phone); const hash = await bcrypt.hash(password, 10); const check = await client.query("SELECT id FROM users WHERE (phone=$1 OR email=$2) AND owner_id=$3", [p, email, req.user.accountId]); if (check.rowCount > 0) return res.status(400).json({ ok: false, error: "Duplicado" }); await client.query('BEGIN'); const insert = await client.query("INSERT INTO users (full_name, email, password_hash, role, phone, is_verified, owner_id) VALUES ($1, $2, $3, $4, $5, TRUE, $6) RETURNING id", [fullName, email, hash, role || 'operario', p, req.user.accountId]); const uid = insert.rows[0].id; if (guilds) for (const gid of guilds) await client.query("INSERT INTO user_guilds (user_id, guild_id) VALUES ($1, $2)", [uid, gid]); await client.query('COMMIT'); res.json({ ok: true }); } catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); } });
|
[req.user.accountId]
|
||||||
app.put("/admin/users/:id", authMiddleware, async (req, res) => { const client = await pool.connect(); try { const userId = req.params.id; const { fullName, email, phone, role, guilds, password } = req.body; const p = normalizePhone(phone); await client.query('BEGIN'); if(password) { const hash = await bcrypt.hash(password, 10); await client.query("UPDATE users SET full_name=$1, email=$2, phone=$3, role=$4, password_hash=$5 WHERE id=$6", [fullName, email, p, role, hash, userId]); } else { await client.query("UPDATE users SET full_name=$1, email=$2, phone=$3, role=$4 WHERE id=$5", [fullName, email, p, role, userId]); } if (guilds && Array.isArray(guilds)) { await client.query("DELETE FROM user_guilds WHERE user_id=$1", [userId]); for (const gid of guilds) await client.query("INSERT INTO user_guilds (user_id, guild_id) VALUES ($1, $2)", [userId, gid]); } await client.query('COMMIT'); res.json({ ok: true }); } catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); } });
|
);
|
||||||
app.delete("/admin/users/:id", authMiddleware, async (req, res) => { try { await pool.query("DELETE FROM users WHERE id=$1 AND owner_id=$2", [req.params.id, req.user.accountId]); res.json({ ok: true }); } catch (e) { res.status(500).json({ ok: false }); } });
|
res.json({ ok: true, services: q.rows });
|
||||||
|
} catch (e) { res.status(500).json({ ok: false }); }
|
||||||
|
});
|
||||||
|
|
||||||
const port = process.env.PORT || 3000;
|
app.get("/services/:id", authMiddleware, async (req, res) => {
|
||||||
autoUpdateDB().then(() => { app.listen(port, "0.0.0.0", () => console.log(`🚀 Server OK en puerto ${port}`)); });
|
try { const q = await pool.query(`SELECT * FROM services WHERE id=$1 AND owner_id=$2`, [req.params.id, req.user.accountId]); res.json({ ok: true, service: q.rows[0] }); } catch (e) { res.status(500).json({ ok: false }); }
|
||||||
|
});
|
||||||
|
|
||||||
|
app.get("/services/:id/logs", authMiddleware, async (req, res) => {
|
||||||
|
try { const q = await pool.query(`SELECT l.*, u.full_name as user_name, s2.name as new_status, s2.color as new_color FROM service_logs l LEFT JOIN users u ON l.user_id=u.id LEFT JOIN service_statuses s2 ON l.new_status_id=s2.id WHERE l.service_id=$1 ORDER BY l.created_at DESC`, [req.params.id]); res.json({ ok: true, logs: q.rows }); } catch (e) { res.status(500).json({ ok: false }); }
|
||||||
|
});
|
||||||
|
|
||||||
|
app.put("/services/:id/status", authMiddleware, async (req, res) => {
|
||||||
|
const client = await pool.connect();
|
||||||
|
try {
|
||||||
|
const { status_id, comment } = req.body;
|
||||||
|
await client.query('BEGIN');
|
||||||
|
const curr = await client.query("SELECT status_id FROM services WHERE id=$1", [req.params.id]);
|
||||||
|
const old = curr.rows[0].status_id;
|
||||||
|
await client.query("UPDATE services SET status_id=$1 WHERE id=$2", [status_id, req.params.id]);
|
||||||
|
await client.query("INSERT INTO service_logs (service_id, user_id, old_status_id, new_status_id, comment) VALUES ($1, $2, $3, $4, $5)", [req.params.id, req.user.sub, old, status_id, comment]);
|
||||||
|
await client.query('COMMIT'); res.json({ ok: true });
|
||||||
|
} catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); }
|
||||||
|
});
|
||||||
|
|
||||||
|
// CREAR SERVICIO (SANITIZADO)
|
||||||
|
app.post("/services", authMiddleware, async (req, res) => {
|
||||||
|
const client = await pool.connect();
|
||||||
|
try {
|
||||||
|
const { phone, name, address, email, description, scheduled_date, scheduled_time, duration, is_urgent, is_company, company_id, company_ref, internal_notes, client_notes, status_id, guild_id, assigned_to } = req.body;
|
||||||
|
const p = normalizePhone(phone);
|
||||||
|
|
||||||
|
// SANITIZAR ENTEROS (Evitar error invalid input syntax for type integer: "")
|
||||||
|
const safeDuration = (duration === "" || duration === null) ? 30 : duration;
|
||||||
|
const safeCompanyId = (company_id === "" || company_id === null) ? null : company_id;
|
||||||
|
const safeGuildId = (guild_id === "" || guild_id === null) ? null : guild_id;
|
||||||
|
const safeAssignedTo = (assigned_to === "" || assigned_to === null) ? null : assigned_to;
|
||||||
|
|
||||||
|
await client.query('BEGIN');
|
||||||
|
|
||||||
|
let finalStatus = status_id;
|
||||||
|
if (!finalStatus) {
|
||||||
|
const def = await client.query("SELECT id FROM service_statuses WHERE owner_id=$1 AND is_default=TRUE LIMIT 1", [req.user.accountId]);
|
||||||
|
finalStatus = def.rows[0]?.id;
|
||||||
|
}
|
||||||
|
|
||||||
|
let clientId;
|
||||||
|
const cCheck = await client.query("SELECT id, addresses FROM clients WHERE phone=$1 AND owner_id=$2", [p, req.user.accountId]);
|
||||||
|
if (cCheck.rowCount > 0) {
|
||||||
|
clientId = cCheck.rows[0].id;
|
||||||
|
let addrs = c
|
||||||
Reference in New Issue
Block a user