Actualizar server.js
This commit is contained in:
81
server.js
81
server.js
@@ -506,64 +506,59 @@ app.get("/public/portal/:token", async (req, res) => {
|
|||||||
try {
|
try {
|
||||||
const { token } = req.params;
|
const { token } = req.params;
|
||||||
|
|
||||||
// 1. Validar Token y Obtener Cliente
|
// 1. Validar Token
|
||||||
const qClient = await pool.query("SELECT * FROM clients WHERE portal_token = $1", [token]);
|
const qClient = await pool.query("SELECT * FROM clients WHERE portal_token = $1", [token]);
|
||||||
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];
|
||||||
|
const ownerId = client.owner_id;
|
||||||
|
|
||||||
// Asegurar IDs y Teléfono para la búsqueda
|
// 2. Obtener Configuración Empresa
|
||||||
const ownerId = client.owner_id || client.account_id;
|
const qConfig = await pool.query("SELECT portal_settings FROM users WHERE id = $1", [ownerId]);
|
||||||
const clientPhone = client.phone ? `%${client.phone.replace('+34', '').trim()}%` : '%000000000%';
|
|
||||||
|
|
||||||
// 2. Obtener la Configuración de la Empresa
|
|
||||||
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 del cliente (SQL Protegido contra NULLs)
|
// 3. LA CONSULTA MÁS SIMPLE POSIBLE (Para evitar el Error 500)
|
||||||
|
// Buscamos servicios que pertenezcan al dueño y que coincidan con el teléfono del cliente
|
||||||
|
// He quitado los JOINs complejos y los filtros raros de JSON para que no explote
|
||||||
const qServices = await pool.query(`
|
const qServices = await pool.query(`
|
||||||
SELECT
|
SELECT id, service_ref, is_urgent, raw_data, created_at
|
||||||
s.id, s.service_ref, s.is_urgent, s.raw_data,
|
FROM scraped_services
|
||||||
st.name as status_name,
|
WHERE owner_id = $1
|
||||||
st.is_final as status_is_final,
|
AND provider != 'SYSTEM_BLOCK'
|
||||||
u.name as assigned_worker
|
AND raw_data::text LIKE '%' || $2 || '%'
|
||||||
FROM scraped_services s
|
ORDER BY created_at DESC
|
||||||
LEFT JOIN service_statuses st ON st.id::text = (s.raw_data->>'status_operativo')::text
|
`, [ownerId, client.phone.replace('+34', '').trim()]);
|
||||||
LEFT JOIN users u ON u.id::text = s.assigned_to::text
|
|
||||||
WHERE s.owner_id::text = $1::text
|
|
||||||
AND s.provider != 'SYSTEM_BLOCK'
|
|
||||||
AND s.raw_data IS NOT NULL
|
|
||||||
AND (
|
|
||||||
COALESCE(s.raw_data->>'Teléfono', '') LIKE $2 OR
|
|
||||||
COALESCE(s.raw_data->>'TELEFONOS', '') LIKE $2 OR
|
|
||||||
COALESCE(s.raw_data->>'TELEFONO', '') LIKE $2 OR
|
|
||||||
COALESCE(s.raw_data->>'Teléfono 1', '') LIKE $2
|
|
||||||
)
|
|
||||||
ORDER BY
|
|
||||||
st.is_final ASC NULLS FIRST,
|
|
||||||
s.created_at DESC
|
|
||||||
`, [ownerId, clientPhone]);
|
|
||||||
|
|
||||||
// Formatear servicios para el frontal
|
// 4. PROCESAMOS LOS ESTADOS EN JAVASCRIPT (No en SQL, para que no falle)
|
||||||
const formattedServices = qServices.rows.map(s => ({
|
// Necesitamos los nombres de los estados
|
||||||
id: s.id,
|
const qStats = await pool.query("SELECT id, name, is_final FROM service_statuses WHERE owner_id = $1", [ownerId]);
|
||||||
title: s.is_urgent ? `🚨 URGENTE: Expediente #${s.service_ref}` : `Expediente #${s.service_ref}`,
|
const statsMap = {};
|
||||||
description: s.raw_data?.["Descripción"] || s.raw_data?.["DESCRIPCION"] || "Revisión técnica solicitada.",
|
qStats.rows.forEach(s => { statsMap[String(s.id)] = s; });
|
||||||
status_name: s.status_name || 'Pendiente',
|
|
||||||
is_final: s.status_is_final === true,
|
const formattedServices = qServices.rows.map(s => {
|
||||||
scheduled_date: s.raw_data?.scheduled_date,
|
const statusId = String(s.raw_data?.status_operativo || "");
|
||||||
scheduled_time: s.raw_data?.scheduled_time,
|
const statusObj = statsMap[statusId];
|
||||||
assigned_worker: s.assigned_worker || 'Pendiente',
|
|
||||||
raw_data: s.raw_data
|
return {
|
||||||
}));
|
id: s.id,
|
||||||
|
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.",
|
||||||
|
status_name: statusObj ? statusObj.name : 'Pendiente',
|
||||||
|
is_final: statusObj ? statusObj.is_final : false,
|
||||||
|
scheduled_date: s.raw_data?.scheduled_date,
|
||||||
|
scheduled_time: s.raw_data?.scheduled_time,
|
||||||
|
assigned_worker: s.raw_data?.assigned_to_name || 'Pendiente',
|
||||||
|
raw_data: s.raw_data
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
res.json({ ok: true, client, company, services: formattedServices });
|
res.json({ ok: true, client, company, services: formattedServices });
|
||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("🔥 Error 500 en Portal Cliente:", e);
|
console.error("Error Crítico Portal:", e);
|
||||||
res.status(500).json({ ok: false, error: "Error interno del servidor" });
|
res.status(500).json({ ok: false, error: "Error de conexión" });
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user