diff --git a/apps/backend/src/lib/notif-job.ts b/apps/backend/src/lib/notif-job.ts index 7e9d011..2a27455 100644 --- a/apps/backend/src/lib/notif-job.ts +++ b/apps/backend/src/lib/notif-job.ts @@ -81,9 +81,8 @@ export async function sendAdminNotification(data: { try { const [ticket] = await expo.sendPushNotificationsAsync([message]); - console.log(`Notification sent:`, ticket); } catch (error) { - console.error(`Failed to send notification:`, error); + console.log(`Failed to send notification:`, error); throw error; } } diff --git a/apps/backend/src/lib/queue-consumer.ts b/apps/backend/src/lib/queue-consumer.ts index 7cbffda..8458bb7 100644 --- a/apps/backend/src/lib/queue-consumer.ts +++ b/apps/backend/src/lib/queue-consumer.ts @@ -2,12 +2,12 @@ import { sendAdminNotification } from '@/src/lib/notif-job' import { handleOrderCancelled, handleOrderPlaced } from '@/src/lib/post-order-handler' export const handleNotifQueue =async (batch: any) => { - console.log('notif batch,', {batch}) - batch.messages.forEach(async (message: any) => { + + for (const message of batch.messages || []) { const body = message?.body if (!body) { console.log('notif_queue message received with empty body') - return + continue } if (body.name === 'send-admin-notification' && body.jobData?.token) { @@ -17,11 +17,11 @@ export const handleNotifQueue =async (batch: any) => { body: body.jobData.body, imageUrl: body.jobData.imageUrl ?? null, }) - return + continue } // console.log('notif_queue', body) - }) + } } export const handleOrderPlacedQueue = async (batch: any) => { diff --git a/apps/backend/src/trpc/apis/admin-apis/apis/user.ts b/apps/backend/src/trpc/apis/admin-apis/apis/user.ts index 2c926f0..fa9af33 100644 --- a/apps/backend/src/trpc/apis/admin-apis/apis/user.ts +++ b/apps/backend/src/trpc/apis/admin-apis/apis/user.ts @@ -233,7 +233,7 @@ export const userRouter = { tokens = userTokens.map(t => t.token); } - tokens = ['ExponentPushToken[w4KTsLKnnp8SbURdl5-Q6x]', 'ExponentPushToken[81Io9TG3Qg0s3N0V8L86T-]', 'ExponentPushToken[YJRSQmMUEUbaI2VCZLaoN_]', 'ExponentPushToken[LQZgYkFG_3CweaUbv0fBKJ]'] + // tokens = ['ExponentPushToken[w4KTsLKnnp8SbURdl5-Q6x]', 'ExponentPushToken[81Io9TG3Qg0s3N0V8L86T-]', 'ExponentPushToken[YJRSQmMUEUbaI2VCZLaoN_]', 'ExponentPushToken[LQZgYkFG_3CweaUbv0fBKJ]'] // Queue one job per token let queuedCount = 0;