diff --git a/services/tasks/src/queues/alert-notify.js b/services/tasks/src/queues/alert-notify.js index 5c68d9e..a0c9a21 100644 --- a/services/tasks/src/queues/alert-notify.js +++ b/services/tasks/src/queues/alert-notify.js @@ -167,7 +167,20 @@ module.exports = async function () { } } + logger.debug({ alertId }, "Querying alert record") + const [{ userId: alertUserId, level, code }] = await sql` + SELECT + "alert"."level" as "level", + "alert"."user_id" as "userId", + "alert"."code" as "code" + FROM + "alert" + WHERE + "alert"."id" = ${alertId} + ` + let sentOnce = false + await async.allLimit(devices, MAX_PARALLEL_PUSHES, async (device) => { const { id: deviceId, fcmToken } = device const notificationAlertLevel = device.notificationAlertLevel || "green" @@ -176,18 +189,6 @@ module.exports = async function () { "Found device record" ) - logger.debug({ alertId }, "Querying alert record") - const [{ userId: alertUserId, level, code }] = await sql` - SELECT - "alert"."level" as "level", - "alert"."user_id" as "userId", - "alert"."code" as "code" - FROM - "alert" - WHERE - "alert"."id" = ${alertId} - ` - if (alertUserId === alertingUserId) { logger.info( { alertUserId, alertingUserId },