Actualizar server.js
This commit is contained in:
20
server.js
20
server.js
@@ -404,12 +404,11 @@ app.get("/public/portal/:token", async (req, res) => {
|
|||||||
let phoneMatch = String(client.phone || "").replace(/\D/g, "").slice(-9);
|
let phoneMatch = String(client.phone || "").replace(/\D/g, "").slice(-9);
|
||||||
if (phoneMatch.length < 8) phoneMatch = "NO_VALIDO_123";
|
if (phoneMatch.length < 8) phoneMatch = "NO_VALIDO_123";
|
||||||
|
|
||||||
// 4. CONSTRUIMOS LA BÚSQUEDA (Doble vía para evitar colapsos)
|
// 4. BÚSQUEDA BLINDADA (Hemos quitado el client_id que hacía explotar la base de datos)
|
||||||
let qServices;
|
let qServices;
|
||||||
if (serviceIdParam && !isNaN(parseInt(serviceIdParam))) {
|
if (serviceIdParam && !isNaN(parseInt(serviceIdParam))) {
|
||||||
// Si nos envían el ID por URL, buscamos ESE servicio exacto
|
|
||||||
qServices = await pool.query(`
|
qServices = await pool.query(`
|
||||||
SELECT s.id, s.service_ref, s.is_urgent, s.raw_data, s.created_at, s.client_id,
|
SELECT s.id, s.service_ref, s.is_urgent, s.raw_data, s.created_at,
|
||||||
st.name as real_status_name, st.is_final as is_status_final,
|
st.name as real_status_name, st.is_final as is_status_final,
|
||||||
u.full_name as worker_name, u.phone as worker_phone
|
u.full_name as worker_name, u.phone as worker_phone
|
||||||
FROM scraped_services s
|
FROM scraped_services s
|
||||||
@@ -418,9 +417,8 @@ app.get("/public/portal/:token", async (req, res) => {
|
|||||||
WHERE s.id = $1 AND s.owner_id = $2
|
WHERE s.id = $1 AND s.owner_id = $2
|
||||||
`, [parseInt(serviceIdParam), ownerId]);
|
`, [parseInt(serviceIdParam), ownerId]);
|
||||||
} else {
|
} else {
|
||||||
// Si no hay ID, buscamos por el teléfono
|
|
||||||
qServices = await pool.query(`
|
qServices = await pool.query(`
|
||||||
SELECT s.id, s.service_ref, s.is_urgent, s.raw_data, s.created_at, s.client_id,
|
SELECT s.id, s.service_ref, s.is_urgent, s.raw_data, s.created_at,
|
||||||
st.name as real_status_name, st.is_final as is_status_final,
|
st.name as real_status_name, st.is_final as is_status_final,
|
||||||
u.full_name as worker_name, u.phone as worker_phone
|
u.full_name as worker_name, u.phone as worker_phone
|
||||||
FROM scraped_services s
|
FROM scraped_services s
|
||||||
@@ -428,13 +426,12 @@ app.get("/public/portal/:token", async (req, res) => {
|
|||||||
LEFT JOIN service_statuses st ON st.id::text = (s.raw_data->>'status_operativo')::text
|
LEFT JOIN service_statuses st ON st.id::text = (s.raw_data->>'status_operativo')::text
|
||||||
WHERE s.owner_id = $1 AND s.provider != 'SYSTEM_BLOCK'
|
WHERE s.owner_id = $1 AND s.provider != 'SYSTEM_BLOCK'
|
||||||
AND (
|
AND (
|
||||||
s.client_id = $2
|
REPLACE(s.raw_data->>'Teléfono', ' ', '') LIKE $2
|
||||||
OR REPLACE(s.raw_data->>'Teléfono', ' ', '') LIKE $3
|
OR REPLACE(s.raw_data->>'TELEFONO', ' ', '') LIKE $2
|
||||||
OR REPLACE(s.raw_data->>'TELEFONO', ' ', '') LIKE $3
|
OR REPLACE(s.raw_data->>'TELEFONOS', ' ', '') LIKE $2
|
||||||
OR REPLACE(s.raw_data->>'TELEFONOS', ' ', '') LIKE $3
|
|
||||||
)
|
)
|
||||||
ORDER BY s.created_at DESC
|
ORDER BY s.created_at DESC
|
||||||
`, [ownerId, client.id, `%${phoneMatch}%`]);
|
`, [ownerId, `%${phoneMatch}%`]);
|
||||||
}
|
}
|
||||||
|
|
||||||
const formattedServices = qServices.rows.map(s => {
|
const formattedServices = qServices.rows.map(s => {
|
||||||
@@ -456,8 +453,7 @@ app.get("/public/portal/:token", async (req, res) => {
|
|||||||
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("🔥 ERROR EN PORTAL:", e.message);
|
console.error("🔥 ERROR EN PORTAL:", e.message);
|
||||||
// AHORA EL SERVIDOR LE CHIVARÁ AL NAVEGADOR EL MOTIVO EXACTO DEL ERROR
|
res.status(500).json({ ok: false, error: "Error de base de datos" });
|
||||||
res.status(500).json({ ok: false, error: e.message, debug_stack: e.stack });
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user