Actualizar server.js
This commit is contained in:
14
server.js
14
server.js
@@ -592,15 +592,19 @@ app.get("/services/active", authMiddleware, async (req, res) => {
|
|||||||
const q = await pool.query(`
|
const q = await pool.query(`
|
||||||
SELECT
|
SELECT
|
||||||
s.*,
|
s.*,
|
||||||
st.name as status_name,
|
|
||||||
st.color as status_color,
|
|
||||||
u.full_name as assigned_name,
|
u.full_name as assigned_name,
|
||||||
g.name as guild_name
|
g.name as guild_name,
|
||||||
|
-- Determinamos el estado operativo
|
||||||
|
CASE
|
||||||
|
WHEN (s.raw_data->>'scheduled_date') IS NULL OR (s.raw_data->>'scheduled_date') = '' THEN 'asignado_operario'
|
||||||
|
ELSE 'citado'
|
||||||
|
END as estado_operativo
|
||||||
FROM scraped_services s
|
FROM scraped_services s
|
||||||
LEFT JOIN service_statuses st ON (s.raw_data->>'status_id')::int = st.id
|
|
||||||
LEFT JOIN users u ON (s.raw_data->>'assigned_to')::int = u.id
|
LEFT JOIN users u ON (s.raw_data->>'assigned_to')::int = u.id
|
||||||
LEFT JOIN guilds g ON (s.raw_data->>'guild_id')::int = g.id
|
LEFT JOIN guilds g ON (s.raw_data->>'guild_id')::int = g.id
|
||||||
WHERE s.owner_id = $1 AND s.status = 'imported'
|
WHERE s.owner_id = $1
|
||||||
|
AND (s.automation_status = 'completed' OR s.status = 'imported')
|
||||||
|
AND s.status != 'archived'
|
||||||
ORDER BY s.created_at DESC
|
ORDER BY s.created_at DESC
|
||||||
`, [req.user.accountId]);
|
`, [req.user.accountId]);
|
||||||
res.json({ ok: true, services: q.rows });
|
res.json({ ok: true, services: q.rows });
|
||||||
|
|||||||
Reference in New Issue
Block a user