services/tasks/src/queues/alert-notify.js

@@ -134,10 +134,10 @@ module.exports = async function () {
       const { reason, alertId, userId: alertingUserId } = alertingRow
       logger.debug({ reason, alertId, alertingUserId }, "Found alerting record")
 
-      let devicesList
+      const devices = []
       if (reason === "relative") {
         logger.debug({ alertingUserId }, "Querying device record for user")
-        devicesList = await sql`
+        const devicesList = await sql`
           SELECT
             "id",
             "fcm_token" as "fcmToken",
@@ -148,36 +148,26 @@ module.exports = async function () {
             "user_id" = ${alertingUserId}
             AND "fcm_token" IS NOT NULL
           `
+        devices.push(...devicesList.map((device) => ({ ...device })))
       } else {
         const { deviceId } = alertingRow
         logger.debug({ deviceId }, "Querying device record")
-        devicesList = await sql`
+        const [device] = await sql`
           SELECT
             "fcm_token" as "fcmToken",
             "notification_alert_level" as "notificationAlertLevel"
           FROM
             "device"
           WHERE
-            "user_id" = ${alertingUserId}
+            "id" = ${deviceId}
             AND "fcm_token" IS NOT NULL
           `
+        if (device) {
+          devices.push({ id: deviceId, ...device })
+        }
       }
-      const devices = devicesList.map((device) => ({ ...device }))
-
-      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"
@@ -186,6 +176,18 @@ 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 },

services/tasks/src/queues/intersect-alert-device.js

@@ -29,7 +29,7 @@ module.exports = async function () {
         "id" = ${alertId}
       `
 
-    if (!alert) {
+    if (alert) {
       // alert removed
       return
     }