marsalva/api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Actualizar server.js

Browse Source
This commit is contained in:
marsalva
2026-02-25 22:43:24 +00:00
parent ed801ca3ae
commit fe8ab609f4
1 changed files with 24 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
server.js
View File

@@ -498,12 +498,9 @@ async function ensureInstance(instanceName) {
return { baseUrl, headers }; return { baseUrl, headers };
} }
// ==========================================
// 🚀 RUTAS PÚBLICAS (MÓVIL OPERARIO)
// ==========================================
// ========================================== // ==========================================
// 🔗 PORTAL PÚBLICO DEL CLIENTE (Mejorado con Historial) // 🔗 PORTAL PÚBLICO DEL CLIENTE (BLINDADO)
// ========================================== // ==========================================
app.get("/public/portal/:token", async (req, res) => { app.get("/public/portal/:token", async (req, res) => {
try { try {
@@ -514,52 +511,51 @@ app.get("/public/portal/:token", async (req, res) => {
if (qClient.rowCount === 0) return res.status(404).json({ ok: false, error: "Enlace inválido" }); if (qClient.rowCount === 0) return res.status(404).json({ ok: false, error: "Enlace inválido" });
const client = qClient.rows[0]; const client = qClient.rows[0];
// Asegurarnos de tener el ID correcto de la cuenta
const ownerId = client.owner_id || client.account_id;
// 2. Obtener la Configuración de la Empresa // 2. Obtener la Configuración de la Empresa
const qConfig = await pool.query("SELECT * FROM config WHERE account_id = $1", [client.owner_id]); const qConfig = await pool.query("SELECT * FROM config WHERE account_id::text = $1::text", [ownerId]);
let company = { name: "IntegraRepara", logo: "" }; let company = { name: "IntegraRepara", logo: "" };
if (qConfig.rowCount > 0 && qConfig.rows[0].portal_settings) { if (qConfig.rowCount > 0 && qConfig.rows[0].portal_settings) {
company = qConfig.rows[0].portal_settings; company = qConfig.rows[0].portal_settings;
} }
// 3. Buscar TODOS los servicios asociados al teléfono del cliente // 3. Buscar TODOS los servicios usando el client_id (Súper rápido y no da error 500)
// Usamos el teléfono para buscar en el JSONB (cuidando las minúsculas y mayúsculas de las llaves posibles)
const qServices = await pool.query(` const qServices = await pool.query(`
SELECT SELECT
s.id, s.service_ref, s.status, s.raw_data, s.is_urgent, s.*,
st.name as status_name, st.is_final as status_is_final, st.name as status_name,
st.is_final as status_is_final,
u.name as assigned_worker u.name as assigned_worker
FROM scraped_services s FROM scraped_services s
LEFT JOIN service_statuses st ON st.id::text = s.raw_data->>'status_operativo' LEFT JOIN service_statuses st ON st.id::text = (s.raw_data->>'status_operativo')::text
LEFT JOIN users u ON u.id = s.assigned_to LEFT JOIN users u ON u.id::text = s.assigned_to::text
WHERE s.owner_id = $1 WHERE s.client_id = $1
AND s.provider != 'SYSTEM_BLOCK' AND s.provider != 'SYSTEM_BLOCK'
AND (
s.raw_data->>'Teléfono' LIKE '%' || $2 || '%' OR
s.raw_data->>'TELEFONOS' LIKE '%' || $2 || '%' OR
s.raw_data->>'TELEFONO' LIKE '%' || $2 || '%'
)
ORDER BY ORDER BY
st.is_final ASC, -- Activos primero st.is_final ASC NULLS FIRST,
s.created_at DESC -- Luego ordenados por fecha de creación s.created_at DESC
`, [client.owner_id, client.phone]); `, [client.id]);
// Formatear servicios para enviarlos limpios al cliente // Formatear servicios para el frontal
const formattedServices = qServices.rows.map(s => ({ const formattedServices = qServices.rows.map(s => ({
id: s.id, id: s.id,
title: s.is_urgent ? `🚨 URGENTE: Expediente #${s.service_ref}` : `Expediente #${s.service_ref}`, title: s.is_urgent ? `🚨 URGENTE: Expediente #${s.service_ref}` : `Expediente #${s.service_ref}`,
description: s.raw_data["Descripción"] || s.raw_data["DESCRIPCION"] || "Revisión técnica solicitada.", description: s.raw_data?.["Descripción"] || s.raw_data?.["DESCRIPCION"] || "Revisión técnica solicitada.",
status_name: s.status_name || 'Pendiente', status_name: s.status_name || 'Pendiente',
is_final: s.status_is_final, is_final: s.status_is_final === true,
scheduled_date: s.raw_data.scheduled_date, scheduled_date: s.raw_data?.scheduled_date,
scheduled_time: s.raw_data.scheduled_time, scheduled_time: s.raw_data?.scheduled_time,
assigned_worker: s.assigned_worker || 'Pendiente' assigned_worker: s.assigned_worker || 'Pendiente',
raw_data: s.raw_data // MUY IMPORTANTE: Se necesita para calcular el ETA del camión
})); }));
res.json({ ok: true, client, company, services: formattedServices }); res.json({ ok: true, client, company, services: formattedServices });
} catch (e) { } catch (e) {
console.error("Error en Portal Cliente:", e); console.error("🔥 Error 500 en Portal Cliente:", e.message);
res.status(500).json({ ok: false, error: "Server error" }); res.status(500).json({ ok: false, error: "Error interno del servidor" });
} }
}); });