Actualizar server.js
This commit is contained in:
29
server.js
29
server.js
@@ -922,7 +922,7 @@ app.get("/services/active", authMiddleware, async (req, res) => {
|
|||||||
app.put("/services/set-appointment/:id", authMiddleware, async (req, res) => {
|
app.put("/services/set-appointment/:id", authMiddleware, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
const { date, time, status_operativo, ...extra } = req.body;
|
let { date, time, status_operativo, ...extra } = req.body; // let en status_operativo para poder cambiarlo
|
||||||
|
|
||||||
const current = await pool.query('SELECT raw_data FROM scraped_services WHERE id = $1 AND owner_id = $2', [id, req.user.accountId]);
|
const current = await pool.query('SELECT raw_data FROM scraped_services WHERE id = $1 AND owner_id = $2', [id, req.user.accountId]);
|
||||||
if (current.rowCount === 0) return res.status(404).json({ ok: false, error: 'No encontrado' });
|
if (current.rowCount === 0) return res.status(404).json({ ok: false, error: 'No encontrado' });
|
||||||
@@ -931,32 +931,31 @@ app.put("/services/set-appointment/:id", authMiddleware, async (req, res) => {
|
|||||||
const oldTime = current.rows[0].raw_data.scheduled_time || "";
|
const oldTime = current.rows[0].raw_data.scheduled_time || "";
|
||||||
const newDate = date || "";
|
const newDate = date || "";
|
||||||
const newTime = time || "";
|
const newTime = time || "";
|
||||||
|
|
||||||
const updatedRawData = { ...current.rows[0].raw_data, ...extra, "scheduled_date": newDate, "scheduled_time": newTime, "status_operativo": status_operativo };
|
|
||||||
|
|
||||||
await pool.query('UPDATE scraped_services SET raw_data = $1 WHERE id = $2 AND owner_id = $3', [JSON.stringify(updatedRawData), id, req.user.accountId]);
|
|
||||||
|
|
||||||
const statusQ = await pool.query("SELECT name FROM service_statuses WHERE id=$1", [status_operativo]);
|
const statusQ = await pool.query("SELECT name FROM service_statuses WHERE id=$1", [status_operativo]);
|
||||||
const stName = statusQ.rows[0]?.name.toLowerCase() || "";
|
const stName = statusQ.rows[0]?.name.toLowerCase() || "";
|
||||||
|
|
||||||
// --- MOTOR DE EVENTOS CORREGIDO ---
|
// --- REGLA: ASIGNADO -> WA -> ESPERANDO AL CLIENTE ---
|
||||||
if (stName.includes('asignado')) {
|
if (stName.includes('asignado')) {
|
||||||
// REGLA: Si el estado contiene "asignado", disparar plantilla específica
|
const waEnviadoExito = await triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_assigned');
|
||||||
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_assigned');
|
if (waEnviadoExito) {
|
||||||
} else if (stName.includes('citado') && newDate !== "") {
|
// Si el WA se envía correctamente, forzamos el estado a "Esperando al Cliente"
|
||||||
if (oldDate === "") {
|
const estadoEsperando = await pool.query("SELECT id FROM service_statuses WHERE owner_id=$1 AND name='Esperando al Cliente' LIMIT 1", [req.user.accountId]);
|
||||||
// Primera vez que se pone fecha
|
if(estadoEsperando.rowCount > 0) status_operativo = estadoEsperando.rows[0].id;
|
||||||
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_date');
|
|
||||||
} else if (oldDate !== newDate || oldTime !== newTime) {
|
|
||||||
// Cambio de fecha u hora
|
|
||||||
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_update');
|
|
||||||
}
|
}
|
||||||
|
} else if (stName.includes('citado') && newDate !== "") {
|
||||||
|
if (oldDate === "") triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_date');
|
||||||
|
else if (oldDate !== newDate || oldTime !== newTime) triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_update');
|
||||||
} else if (stName.includes('camino')) {
|
} else if (stName.includes('camino')) {
|
||||||
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_onway');
|
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_onway');
|
||||||
} else if (stName.includes('finalizado') || stName.includes('terminado')) {
|
} else if (stName.includes('finalizado') || stName.includes('terminado')) {
|
||||||
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_survey');
|
triggerWhatsAppEvent(req.user.accountId, id, 'wa_evt_survey');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Guardamos el estado definitivo (sea el que arrastró, o el forzado a "Esperando")
|
||||||
|
const updatedRawData = { ...current.rows[0].raw_data, ...extra, "scheduled_date": newDate, "scheduled_time": newTime, "status_operativo": status_operativo };
|
||||||
|
await pool.query('UPDATE scraped_services SET raw_data = $1 WHERE id = $2 AND owner_id = $3', [JSON.stringify(updatedRawData), id, req.user.accountId]);
|
||||||
|
|
||||||
res.json({ ok: true });
|
res.json({ ok: true });
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
console.error("Error agendando cita:", e);
|
console.error("Error agendando cita:", e);
|
||||||
|
|||||||
Reference in New Issue
Block a user