Actualizar server.js
This commit is contained in:
13
server.js
13
server.js
@@ -406,13 +406,17 @@ app.post("/providers/credentials", authMiddleware, async (req, res) => {
|
|||||||
|
|
||||||
app.get("/providers/scraped", authMiddleware, async (req, res) => {
|
app.get("/providers/scraped", authMiddleware, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
// Consultamos los servicios y unimos con el ping activo para saber quién tiene el turno
|
|
||||||
const q = await pool.query(`
|
const q = await pool.query(`
|
||||||
SELECT
|
SELECT
|
||||||
s.*,
|
s.*,
|
||||||
ap.token as active_token,
|
ap.token as active_token,
|
||||||
ap.expires_at as token_expires_at,
|
ap.expires_at as token_expires_at,
|
||||||
u.full_name as current_worker_name
|
u.full_name as current_worker_name,
|
||||||
|
-- Obtenemos los nombres de los operarios que ya expiraron para este servicio
|
||||||
|
(SELECT json_agg(u2.full_name)
|
||||||
|
FROM assignment_pings ap2
|
||||||
|
JOIN users u2 ON ap2.user_id = u2.id
|
||||||
|
WHERE ap2.scraped_id = s.id AND ap2.status IN ('expired', 'rejected')) as attempted_workers
|
||||||
FROM scraped_services s
|
FROM scraped_services s
|
||||||
LEFT JOIN assignment_pings ap ON s.id = ap.scraped_id AND ap.status = 'pending'
|
LEFT JOIN assignment_pings ap ON s.id = ap.scraped_id AND ap.status = 'pending'
|
||||||
LEFT JOIN users u ON ap.user_id = u.id
|
LEFT JOIN users u ON ap.user_id = u.id
|
||||||
@@ -421,10 +425,7 @@ app.get("/providers/scraped", authMiddleware, async (req, res) => {
|
|||||||
`, [req.user.accountId]);
|
`, [req.user.accountId]);
|
||||||
|
|
||||||
res.json({ ok: true, services: q.rows });
|
res.json({ ok: true, services: q.rows });
|
||||||
} catch (e) {
|
} catch (e) { res.status(500).json({ ok: false }); }
|
||||||
console.error("❌ Error al obtener servicios:", e.message);
|
|
||||||
res.status(500).json({ ok: false });
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
|
||||||
app.post("/providers/automate/:id", authMiddleware, async (req, res) => {
|
app.post("/providers/automate/:id", authMiddleware, async (req, res) => {
|
||||||
|
|||||||
Reference in New Issue
Block a user