alerte-secours/as-services
3
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
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
1 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
services/tasks/src/queues/alert-notify.js
View file

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