Actualizar server.js
This commit is contained in:
90
server.js
90
server.js
@@ -16,12 +16,12 @@ const {
|
||||
JWT_SECRET,
|
||||
EVOLUTION_BASE_URL,
|
||||
EVOLUTION_API_KEY,
|
||||
EVOLUTION_INSTANCE, // <--- Instancia Maestra para SMS/Registro
|
||||
EVOLUTION_INSTANCE,
|
||||
} = process.env;
|
||||
|
||||
// --- DIAGNÓSTICO DE INICIO ---
|
||||
console.log("------------------------------------------------");
|
||||
console.log("🚀 VERSIÓN NUEVA CARGADA - CON MAPEADOR");
|
||||
console.log("🚀 VERSIÓN NUEVA CARGADA - CON MAPEADOR REAL"); // <--- AHORA SÍ
|
||||
console.log("------------------------------------------------");
|
||||
if (!DATABASE_URL) console.error("❌ FALTA: DATABASE_URL");
|
||||
if (!JWT_SECRET) console.error("❌ FALTA: JWT_SECRET");
|
||||
@@ -29,7 +29,7 @@ if (!JWT_SECRET) console.error("❌ FALTA: JWT_SECRET");
|
||||
if (!EVOLUTION_BASE_URL) console.error("⚠️ AVISO: Falta EVOLUTION_BASE_URL");
|
||||
else console.log("✅ Evolution URL:", EVOLUTION_BASE_URL);
|
||||
|
||||
if (!EVOLUTION_INSTANCE) console.error("⚠️ AVISO: Falta EVOLUTION_INSTANCE (No saldrán códigos de registro)");
|
||||
if (!EVOLUTION_INSTANCE) console.error("⚠️ AVISO: Falta EVOLUTION_INSTANCE");
|
||||
else console.log("✅ Instancia Notificaciones:", EVOLUTION_INSTANCE);
|
||||
|
||||
console.log("------------------------------------------------");
|
||||
@@ -152,7 +152,7 @@ async function autoUpdateDB() {
|
||||
PRIMARY KEY (user_id, zone_id)
|
||||
);
|
||||
|
||||
-- 🤖 ROBOTS / PROVEEDORES (NUEVO)
|
||||
-- 🤖 ROBOTS / PROVEEDORES
|
||||
CREATE TABLE IF NOT EXISTS provider_credentials (
|
||||
id SERIAL PRIMARY KEY,
|
||||
owner_id INT REFERENCES users(id) ON DELETE CASCADE,
|
||||
@@ -168,12 +168,24 @@ async function autoUpdateDB() {
|
||||
owner_id INT REFERENCES users(id) ON DELETE CASCADE,
|
||||
provider TEXT NOT NULL,
|
||||
service_ref TEXT NOT NULL,
|
||||
raw_data JSONB, -- DATOS CRUDOS DEL ROBOT
|
||||
raw_data JSONB,
|
||||
status TEXT DEFAULT 'pending',
|
||||
created_at TIMESTAMP DEFAULT NOW(),
|
||||
UNIQUE(owner_id, provider, service_ref)
|
||||
);
|
||||
|
||||
-- 🗺️ TABLA DE MAPEO DE VARIABLES (NUEVO)
|
||||
CREATE TABLE IF NOT EXISTS variable_mappings (
|
||||
id SERIAL PRIMARY KEY,
|
||||
owner_id INT REFERENCES users(id) ON DELETE CASCADE,
|
||||
provider TEXT NOT NULL,
|
||||
original_key TEXT NOT NULL,
|
||||
target_key TEXT,
|
||||
is_ignored BOOLEAN DEFAULT FALSE,
|
||||
created_at TIMESTAMP DEFAULT NOW(),
|
||||
UNIQUE(owner_id, provider, original_key)
|
||||
);
|
||||
|
||||
-- SERVICIOS (PRINCIPAL)
|
||||
CREATE TABLE IF NOT EXISTS services (
|
||||
id SERIAL PRIMARY KEY,
|
||||
@@ -197,8 +209,8 @@ async function autoUpdateDB() {
|
||||
company_ref TEXT,
|
||||
internal_notes TEXT,
|
||||
client_notes TEXT,
|
||||
import_source TEXT, -- 'homeserve', 'multiasistencia', 'manual'
|
||||
provider_data JSONB DEFAULT '{}', -- 📥 AQUÍ SE GUARDAN TODOS LOS DATOS EXTRA
|
||||
import_source TEXT,
|
||||
provider_data JSONB DEFAULT '{}',
|
||||
closed_at TIMESTAMP,
|
||||
created_at TIMESTAMP DEFAULT NOW()
|
||||
);
|
||||
@@ -216,17 +228,14 @@ async function autoUpdateDB() {
|
||||
// PARCHE DE ACTUALIZACIÓN
|
||||
await client.query(`
|
||||
DO $$ BEGIN
|
||||
-- Asegurar columnas básicas
|
||||
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='status_id') THEN ALTER TABLE services ADD COLUMN status_id INT REFERENCES service_statuses(id) ON DELETE SET NULL; END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='services' AND column_name='contact_phone') THEN ALTER TABLE services ADD COLUMN contact_phone TEXT; END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='services' AND column_name='contact_name') THEN ALTER TABLE services ADD COLUMN contact_name TEXT; END IF;
|
||||
|
||||
-- Columnas SaaS
|
||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='users' AND column_name='plan_tier') THEN ALTER TABLE users ADD COLUMN plan_tier TEXT DEFAULT 'free'; END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='users' AND column_name='company_slug') THEN ALTER TABLE users ADD COLUMN company_slug TEXT UNIQUE; END IF;
|
||||
|
||||
-- Columnas DATA IMPORT (NUEVO)
|
||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='services' AND column_name='provider_data') THEN ALTER TABLE services ADD COLUMN provider_data JSONB DEFAULT '{}'; END IF;
|
||||
IF NOT EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='services' AND column_name='import_source') THEN ALTER TABLE services ADD COLUMN import_source TEXT; END IF;
|
||||
|
||||
@@ -283,7 +292,7 @@ async function ensureInstance(instanceName) {
|
||||
|
||||
// RUTAS AUTH
|
||||
app.post("/auth/register", async (req, res) => { const client = await pool.connect(); try { const { fullName, phone, address, dni, email, password } = req.body; const p = normalizePhone(phone); if (!fullName || !p || !email || !password) return res.status(400).json({ ok: false }); const passwordHash = await bcrypt.hash(password, 10); await client.query('BEGIN'); const insert = await client.query("INSERT INTO users (full_name, phone, address, dni, email, password_hash, role, owner_id, plan_tier) VALUES ($1, $2, $3, $4, $5, $6, 'admin', NULL, 'free') RETURNING id", [fullName, p, address, dni, email, passwordHash]); const userId = insert.rows[0].id; const code = genCode6(); const codeHash = await bcrypt.hash(code, 10); const expiresAt = new Date(Date.now() + 10 * 60 * 1000); await client.query("INSERT INTO login_codes (user_id, phone, code_hash, expires_at) VALUES ($1, $2, $3, $4)", [userId, p, codeHash, expiresAt]);
|
||||
await sendWhatsAppCode(p, code); // Enviar código
|
||||
await sendWhatsAppCode(p, code);
|
||||
await client.query('COMMIT'); res.json({ ok: true, phone: p }); } catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false }); } finally { client.release(); } });
|
||||
app.post("/auth/verify", async (req, res) => { try { const { phone, code } = req.body; const p = normalizePhone(phone); const q = await pool.query(`SELECT lc.*, u.id as uid, u.email, u.role, u.owner_id FROM login_codes lc JOIN users u ON lc.user_id = u.id WHERE lc.phone=$1 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 }); await pool.query("UPDATE login_codes SET consumed_at=NOW() WHERE id=$1", [row.id]); await pool.query("UPDATE users SET is_verified=TRUE WHERE id=$1", [row.uid]); res.json({ ok: true, token: signToken({ id: row.uid, email: row.email, phone: p, role: row.role, owner_id: row.owner_id }) }); } catch (e) { res.status(500).json({ ok: false }); } });
|
||||
app.post("/auth/login", async (req, res) => { try { const { email, password } = req.body; const q = await pool.query("SELECT * FROM users WHERE email=$1", [email]); if (q.rowCount === 0) return res.status(401).json({ ok: false }); let user = null; for (const u of q.rows) { if (await bcrypt.compare(password, u.password_hash)) { user = u; break; } } if (!user) return res.status(401).json({ ok: false }); res.json({ ok: true, token: signToken(user) }); } catch(e) { res.status(500).json({ ok: false }); } });
|
||||
@@ -309,7 +318,7 @@ app.get("/whatsapp/status", authMiddleware, (req, res, next) => requirePlan(req,
|
||||
});
|
||||
|
||||
// ==========================================
|
||||
// 🤖 GESTIÓN DE PROVEEDORES (ROBOTS)
|
||||
// 🤖 GESTIÓN DE PROVEEDORES Y ROBOTS
|
||||
// ==========================================
|
||||
app.get("/providers/credentials", authMiddleware, async (req, res) => {
|
||||
try {
|
||||
@@ -397,8 +406,61 @@ app.post("/providers/import/:id", authMiddleware, async (req, res) => {
|
||||
} catch (e) { await client.query('ROLLBACK'); console.error(e); res.status(500).json({ ok: false, error: e.message }); } finally { client.release(); }
|
||||
});
|
||||
|
||||
// ==========================================
|
||||
// 🗺️ MAPEADOR DE VARIABLES (DISCOVERY) - ¡ESTO ES LO QUE TE FALTA!
|
||||
// ==========================================
|
||||
app.get("/discovery/keys/:provider", authMiddleware, async (req, res) => {
|
||||
try {
|
||||
const { provider } = req.params;
|
||||
const rawServices = await pool.query("SELECT raw_data FROM scraped_services WHERE owner_id=$1 AND provider=$2", [req.user.accountId, provider]);
|
||||
const mappings = await pool.query("SELECT original_key, target_key, is_ignored FROM variable_mappings WHERE owner_id=$1 AND provider=$2", [req.user.accountId, provider]);
|
||||
const mapDict = {};
|
||||
mappings.rows.forEach(m => mapDict[m.original_key] = m);
|
||||
|
||||
const discoverySet = new Set();
|
||||
const samples = {};
|
||||
|
||||
rawServices.rows.forEach(row => {
|
||||
const data = row.raw_data;
|
||||
if (data && typeof data === 'object') {
|
||||
Object.keys(data).forEach(k => {
|
||||
discoverySet.add(k);
|
||||
if (!samples[k] && data[k]) samples[k] = data[k];
|
||||
});
|
||||
}
|
||||
});
|
||||
|
||||
const result = Array.from(discoverySet).map(key => ({
|
||||
original: key,
|
||||
sample: samples[key] || "(Vacío)",
|
||||
mappedTo: mapDict[key]?.target_key || "",
|
||||
ignored: mapDict[key]?.is_ignored || false
|
||||
})).sort((a, b) => a.original.localeCompare(b.original));
|
||||
|
||||
res.json({ ok: true, keys: result });
|
||||
} catch (e) { res.status(500).json({ ok: false, error: e.message }); }
|
||||
});
|
||||
|
||||
app.post("/discovery/save", authMiddleware, async (req, res) => {
|
||||
const client = await pool.connect();
|
||||
try {
|
||||
const { provider, mappings } = req.body;
|
||||
await client.query('BEGIN');
|
||||
for (const m of mappings) {
|
||||
await client.query(`
|
||||
INSERT INTO variable_mappings (owner_id, provider, original_key, target_key, is_ignored)
|
||||
VALUES ($1, $2, $3, $4, $5)
|
||||
ON CONFLICT (owner_id, provider, original_key)
|
||||
DO UPDATE SET target_key = EXCLUDED.target_key, is_ignored = EXCLUDED.is_ignored
|
||||
`, [req.user.accountId, provider, m.original, m.target, m.ignored]);
|
||||
}
|
||||
await client.query('COMMIT');
|
||||
res.json({ ok: true });
|
||||
} catch (e) { await client.query('ROLLBACK'); res.status(500).json({ ok: false, error: e.message }); } finally { client.release(); }
|
||||
});
|
||||
|
||||
// =========================
|
||||
// 👥 GESTIÓN DE CLIENTES (CRM)
|
||||
// 👥 GESTIÓN DE CLIENTES
|
||||
// =========================
|
||||
app.get("/clients", authMiddleware, async (req, res) => {
|
||||
try {
|
||||
@@ -444,7 +506,7 @@ app.get("/statuses", authMiddleware, async (req, res) => { try { let q = await p
|
||||
app.post("/statuses", authMiddleware, async (req, res) => { try { const { name, color } = req.body; await pool.query("INSERT INTO service_statuses (owner_id, name, color) VALUES ($1, $2, $3)", [req.user.accountId, name, color || 'gray']); res.json({ ok: true }); } catch(e) { res.status(500).json({ ok: false }); } });
|
||||
app.delete("/statuses/:id", authMiddleware, async (req, res) => { const client = await pool.connect(); try { const statusId = req.params.id; const check = await client.query("SELECT COUNT(*) FROM services WHERE status_id = $1 AND owner_id = $2", [statusId, req.user.accountId]); if (parseInt(check.rows[0].count) > 0) return res.status(400).json({ ok: false, error: "En uso" }); await client.query("DELETE FROM service_statuses WHERE id=$1 AND owner_id=$2", [statusId, req.user.accountId]); res.json({ ok: true }); } catch(e) { res.status(500).json({ ok: false }); } finally { client.release(); } });
|
||||
|
||||
// RESTO DE ENDPOINTS (CLIENTES, ZONAS, ETC.) MANTENIDOS
|
||||
// RESTO DE ENDPOINTS
|
||||
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 }); } });
|
||||
|
||||
Reference in New Issue
Block a user