fix: multi device lost notifications
All checks were successful
/ build (map[dockerfile:./services/api/Dockerfile name:api]) (push) Successful in 1m1s
/ build (map[dockerfile:./services/files/Dockerfile name:files]) (push) Successful in 1m32s
/ build (map[dockerfile:./services/web/Dockerfile name:web]) (push) Successful in 2m20s
/ build (map[dockerfile:./services/app/Dockerfile name:app]) (push) Successful in 1m35s
/ build (map[dockerfile:./services/tasks/Dockerfile name:tasks]) (push) Successful in 2m11s
/ build (map[dockerfile:./services/hasura/Dockerfile name:hasura]) (push) Successful in 2m15s
/ build (map[dockerfile:./services/watchers/Dockerfile name:watchers]) (push) Successful in 2m17s
/ deploy (push) Successful in 12s

This commit is contained in:
Jo 2025-08-24 12:55:50 +02:00
parent e4da0f59b3
commit 1cc35a57c9
Signed by: devthejo
GPG key ID: 00CCA7A92B1D5351

View file

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