Release 202506041937

web/src/lib/notifications.ts

@@ -12,6 +12,7 @@ import type { Prisma } from '@prisma/client'
 export function makeNotificationTitle(
   notification: Prisma.NotificationGetPayload<{
     select: {
+      id: true
       type: true
       aboutAccountStatusChange: true
       aboutCommentStatusChange: true
@@ -87,6 +88,9 @@ export function makeNotificationTitle(
   user: Prisma.UserGetPayload<{ select: { id: true } }> | null
 ): string {
   switch (notification.type) {
+    case 'TEST': {
+      return `Test notification #${notification.id.toString()}`
+    }
     case 'COMMENT_STATUS_CHANGE': {
       if (!notification.aboutComment) return 'A comment you are watching had a status change'
 
@@ -178,6 +182,7 @@ export function makeNotificationTitle(
 export function makeNotificationContent(
   notification: Prisma.NotificationGetPayload<{
     select: {
+      createdAt: true
       type: true
       aboutKarmaTransaction: {
         select: {
@@ -204,6 +209,9 @@ export function makeNotificationContent(
   }>
 ): string | null {
   switch (notification.type) {
+    case 'TEST': {
+      return `Created on ${notification.createdAt.toLocaleString()}`
+    }
     // TODO: [KARMA_UNLOCK] Will be added later, when karma unloks are in the database, not in the code.
     // case 'KARMA_UNLOCK':
     case 'KARMA_CHANGE': {
@@ -280,6 +288,9 @@ export function makeNotificationLink(
   origin: string
 ): string | null {
   switch (notification.type) {
+    case 'TEST': {
+      return `${origin}/notifications`
+    }
     case 'COMMENT_STATUS_CHANGE':
     case 'REPLY_COMMENT_CREATED':
     case 'COMMUNITY_NOTE_ADDED':

web/src/lib/postgresListenerIntegration.ts

@@ -2,15 +2,12 @@ import { z } from 'astro/zod'
 import { Client } from 'pg'
 
 import { zodParseJSON } from './json'
-import { makeNotificationContent, makeNotificationLink, makeNotificationTitle } from './notifications'
-import { prisma } from './prisma'
+import { sendNotifications } from './sendNotifications'
 import { getServerEnvVariable } from './serverEnvVariables'
-import { sendPushNotification, type NotificationData } from './webPush'
 
 import type { AstroIntegration, HookParameters } from 'astro'
 
 const DATABASE_URL = getServerEnvVariable('DATABASE_URL')
-const SITE_URL = getServerEnvVariable('SITE_URL')
 
 let pgClient: Client | null = null
 
@@ -24,155 +21,10 @@ async function handleNotificationCreated(
   try {
     logger.info(`Processing notification with ID: ${String(notificationId)}`)
 
-    const notification = await prisma.notification.findUnique({
-      where: { id: notificationId },
-      select: {
-        id: true,
-        type: true,
-        userId: true,
-        aboutAccountStatusChange: true,
-        aboutCommentStatusChange: true,
-        aboutServiceVerificationStatusChange: true,
-        aboutSuggestionStatusChange: true,
-        aboutComment: {
-          select: {
-            id: true,
-            author: { select: { id: true } },
-            status: true,
-            content: true,
-            communityNote: true,
-            parent: {
-              select: {
-                author: {
-                  select: {
-                    id: true,
-                  },
-                },
-              },
-            },
-            service: {
-              select: {
-                slug: true,
-                name: true,
-              },
-            },
-          },
-        },
-        aboutServiceSuggestionId: true,
-        aboutServiceSuggestion: {
-          select: {
-            status: true,
-            service: {
-              select: {
-                name: true,
-              },
-            },
-          },
-        },
-        aboutServiceSuggestionMessage: {
-          select: {
-            id: true,
-            content: true,
-            suggestion: {
-              select: {
-                id: true,
-                service: {
-                  select: {
-                    name: true,
-                  },
-                },
-              },
-            },
-          },
-        },
-        aboutEvent: {
-          select: {
-            title: true,
-            type: true,
-            service: {
-              select: {
-                slug: true,
-                name: true,
-              },
-            },
-          },
-        },
-        aboutService: {
-          select: {
-            slug: true,
-            name: true,
-            verificationStatus: true,
-          },
-        },
-        aboutKarmaTransaction: {
-          select: {
-            points: true,
-            action: true,
-            description: true,
-          },
-        },
-        user: {
-          select: {
-            id: true,
-            name: true,
-          },
-        },
-      },
-    })
-
-    if (!notification) {
-      logger.warn(`Notification with ID ${String(notificationId)} not found`)
-      return
-    }
-
-    const subscriptions = await prisma.pushSubscription.findMany({
-      where: { userId: notification.userId },
-      select: {
-        id: true,
-        endpoint: true,
-        p256dh: true,
-        auth: true,
-      },
-    })
-
-    if (subscriptions.length === 0) {
-      logger.info(`No push subscriptions found for user ${notification.user.name}`)
-      return
-    }
-    const notificationData = {
-      title: makeNotificationTitle(notification, notification.user),
-      body: makeNotificationContent(notification) ?? undefined,
-      url: makeNotificationLink(notification, SITE_URL) ?? undefined,
-    } satisfies NotificationData
-
-    const results = await Promise.allSettled(
-      subscriptions.map(async (subscription) => {
-        const result = await sendPushNotification(
-          {
-            endpoint: subscription.endpoint,
-            keys: {
-              p256dh: subscription.p256dh,
-              auth: subscription.auth,
-            },
-          },
-          notificationData
-        )
-
-        // Remove invalid subscriptions
-        if (result.error && (result.error.statusCode === 410 || result.error.statusCode === 404)) {
-          await prisma.pushSubscription.delete({ where: { id: subscription.id } })
-          logger.info(`Removed invalid subscription for user ${notification.user.name}`)
-        }
-
-        return result.success
-      })
-    )
-
-    const successCount = results.filter((r) => r.status === 'fulfilled' && r.value).length
-    const failureCount = results.filter((r) => !(r.status === 'fulfilled' && r.value)).length
+    const results = await sendNotifications([notificationId], logger)
 
     logger.info(
-      `Push notification sent for notification ${String(notificationId)} to user ${notification.user.name}: ${String(successCount)} successful, ${String(failureCount)} failed`
+      `Sent push notifications for notification ${String(notificationId)} to ${String(results.subscriptions.success)} devices, ${String(results.subscriptions.failure)} failed`
     )
   } catch (error) {
     logger.error(`Error processing notification ${String(notificationId)}: ${getErrorMessage(error)}`)

web/src/lib/sendNotifications.ts

@@ -0,0 +1,185 @@
+import { sum } from 'lodash-es'
+
+import { makeNotificationContent, makeNotificationLink, makeNotificationTitle } from './notifications'
+import { prisma } from './prisma'
+import { getServerEnvVariable } from './serverEnvVariables'
+import { type NotificationData, sendPushNotification } from './webPush'
+
+import type { AstroIntegrationLogger } from 'astro'
+
+const SITE_URL = getServerEnvVariable('SITE_URL')
+
+export async function sendNotifications(
+  notificationIds: number[],
+  logger: AstroIntegrationLogger | Console = console
+) {
+  const notifications = await prisma.notification.findMany({
+    where: { id: { in: notificationIds } },
+    select: {
+      id: true,
+      type: true,
+      userId: true,
+      createdAt: true,
+      aboutAccountStatusChange: true,
+      aboutCommentStatusChange: true,
+      aboutServiceVerificationStatusChange: true,
+      aboutSuggestionStatusChange: true,
+      aboutComment: {
+        select: {
+          id: true,
+          author: { select: { id: true } },
+          status: true,
+          content: true,
+          communityNote: true,
+          parent: {
+            select: {
+              author: {
+                select: {
+                  id: true,
+                },
+              },
+            },
+          },
+          service: {
+            select: {
+              slug: true,
+              name: true,
+            },
+          },
+        },
+      },
+      aboutServiceSuggestionId: true,
+      aboutServiceSuggestion: {
+        select: {
+          status: true,
+          service: {
+            select: {
+              name: true,
+            },
+          },
+        },
+      },
+      aboutServiceSuggestionMessage: {
+        select: {
+          id: true,
+          content: true,
+          suggestion: {
+            select: {
+              id: true,
+              service: {
+                select: {
+                  name: true,
+                },
+              },
+            },
+          },
+        },
+      },
+      aboutEvent: {
+        select: {
+          title: true,
+          type: true,
+          service: {
+            select: {
+              slug: true,
+              name: true,
+            },
+          },
+        },
+      },
+      aboutService: {
+        select: {
+          slug: true,
+          name: true,
+          verificationStatus: true,
+        },
+      },
+      aboutKarmaTransaction: {
+        select: {
+          points: true,
+          action: true,
+          description: true,
+        },
+      },
+      user: {
+        select: {
+          id: true,
+          name: true,
+        },
+      },
+    },
+  })
+
+  if (notifications.length < notificationIds.length) {
+    const missingNotificationIds = notificationIds.filter(
+      (id) => !notifications.some((notification) => notification.id === id)
+    )
+    logger.error(`Notifications with IDs ${missingNotificationIds.join(', ')} not found`)
+  }
+
+  const results = await Promise.allSettled(
+    notifications.map(async (notification) => {
+      const subscriptions = await prisma.pushSubscription.findMany({
+        where: { userId: notification.userId },
+        select: {
+          id: true,
+          endpoint: true,
+          p256dh: true,
+          auth: true,
+        },
+      })
+
+      if (subscriptions.length === 0) {
+        logger.info(`No push subscriptions found for user ${notification.user.name}`)
+        return
+      }
+      const notificationData = {
+        title: makeNotificationTitle(notification, notification.user),
+        body: makeNotificationContent(notification) ?? undefined,
+        url: makeNotificationLink(notification, SITE_URL) ?? undefined,
+      } satisfies NotificationData
+
+      const subscriptionResults = await Promise.allSettled(
+        subscriptions.map(async (subscription) => {
+          const result = await sendPushNotification(
+            {
+              endpoint: subscription.endpoint,
+              keys: {
+                p256dh: subscription.p256dh,
+                auth: subscription.auth,
+              },
+            },
+            notificationData
+          )
+
+          // Remove invalid subscriptions
+          if (result.error && (result.error.statusCode === 410 || result.error.statusCode === 404)) {
+            await prisma.pushSubscription.delete({ where: { id: subscription.id } })
+            logger.info(`Removed invalid subscription for user ${notification.user.name}`)
+          }
+
+          return result.success
+        })
+      )
+
+      return {
+        success: subscriptionResults.filter((r) => r.status === 'fulfilled' && r.value).length,
+        failure: subscriptionResults.filter((r) => !(r.status === 'fulfilled' && r.value)).length,
+        total: subscriptionResults.length,
+      }
+    })
+  )
+
+  return {
+    subscriptions: {
+      success: sum(results.map((r) => (r.status === 'fulfilled' && r.value?.success) ?? 0)),
+      failure: sum(results.map((r) => (r.status === 'fulfilled' && r.value?.failure) ?? 0)),
+      total: sum(results.map((r) => (r.status === 'fulfilled' && r.value?.total) ?? 0)),
+    },
+    notifications: {
+      success: results.filter((r) => r.status === 'fulfilled').length,
+      failure: results.filter((r) => r.status !== 'fulfilled').length,
+      total: results.length,
+    },
+  }
+}