perf(webapp): aggregate admin notification interaction counts in the database

The admin notifications list fetched every interaction row for the page's
notifications (~76k rows/call) into the webapp to compute three per-notification
counters in JS. Replace the Prisma relation include with a single grouped
COUNT(*) FILTER aggregate scoped to the page's ids, returning ~20 rows instead
of ~76k and eliminating the egress and object hydration.

Author: ericallam

.server-changes/admin-notifications-list-interaction-counts.md

@@ -0,0 +1,6 @@
+---
+area: webapp
+type: improvement
+---
+
+The notifications admin list loads faster by counting interactions in the database instead of loading every interaction row per page.

apps/webapp/app/services/platformNotifications.server.test.ts

@@ -0,0 +1,78 @@
+import { postgresTest } from "@internal/testcontainers";
+import { describe, expect, vi } from "vitest";
+
+vi.mock("~/db.server", async () => {
+  const { Prisma } = await import("@trigger.dev/database");
+  return {
+    prisma: {},
+    Prisma,
+    sqlDatabaseSchema: Prisma.sql(["public"]),
+  };
+});
+
+vi.mock("~/services/platformNotificationCounter.server", () => ({
+  incrementCliRequestCounter: vi.fn(),
+}));
+
+import { getAdminNotificationsList } from "./platformNotifications.server";
+
+vi.setConfig({ testTimeout: 60_000 });
+
+describe("getAdminNotificationsList interaction stats", () => {
+  postgresTest("counts seen/clicked/dismissed per notification", async ({ prisma }) => {
+    const now = new Date();
+    const later = new Date(now.getTime() + 1000 * 60 * 60 * 24);
+
+    const withInteractions = await prisma.platformNotification.create({
+      data: {
+        title: "with-interactions",
+        payload: {},
+        surface: "WEBAPP",
+        scope: "GLOBAL",
+        startsAt: now,
+        endsAt: later,
+      },
+    });
+
+    const withoutInteractions = await prisma.platformNotification.create({
+      data: {
+        title: "without-interactions",
+        payload: {},
+        surface: "WEBAPP",
+        scope: "GLOBAL",
+        startsAt: now,
+        endsAt: later,
+      },
+    });
+
+    const users = await Promise.all(
+      [1, 2, 3, 4, 5].map((n) =>
+        prisma.user.create({
+          data: { email: `pni-stats-${n}@example.com`, authenticationMethod: "MAGIC_LINK" },
+        })
+      )
+    );
+
+    await prisma.platformNotificationInteraction.createMany({
+      data: [
+        { notificationId: withInteractions.id, userId: users[0].id, webappClickedAt: now },
+        { notificationId: withInteractions.id, userId: users[1].id, webappDismissedAt: now },
+        { notificationId: withInteractions.id, userId: users[2].id, cliDismissedAt: now },
+        {
+          notificationId: withInteractions.id,
+          userId: users[3].id,
+          webappDismissedAt: now,
+          cliDismissedAt: now,
+        },
+        { notificationId: withInteractions.id, userId: users[4].id },
+      ],
+    });
+
+    const result = await getAdminNotificationsList({}, prisma);
+
+    const byId = new Map(result.notifications.map((n) => [n.id, n.stats]));
+
+    expect(byId.get(withInteractions.id)).toEqual({ seen: 5, clicked: 1, dismissed: 3 });
+    expect(byId.get(withoutInteractions.id)).toEqual({ seen: 0, clicked: 0, dismissed: 0 });
+  });
+});

apps/webapp/app/services/platformNotifications.server.ts

@@ -1,6 +1,6 @@
 import type { z } from "zod";
 import { errAsync, fromPromise, type ResultAsync } from "neverthrow";
-import { prisma } from "~/db.server";
+import { Prisma, prisma, sqlDatabaseSchema, type PrismaClientOrTransaction } from "~/db.server";
 import {
   type PlatformNotificationScope,
   type PlatformNotificationSurface,
@@ -32,42 +32,61 @@ export type PlatformNotificationWithPayload = {
 
 // --- Read: admin list with interaction stats ---
 
-export async function getAdminNotificationsList({
-  page = 1,
-  pageSize = 20,
-  hideInactive = false,
-}: {
-  page?: number;
-  pageSize?: number;
-  hideInactive?: boolean;
-}) {
+export async function getAdminNotificationsList(
+  {
+    page = 1,
+    pageSize = 20,
+    hideInactive = false,
+  }: {
+    page?: number;
+    pageSize?: number;
+    hideInactive?: boolean;
+  },
+  prismaClient: PrismaClientOrTransaction = prisma
+) {
   const where = hideInactive ? { archivedAt: null, endsAt: { gt: new Date() } } : {};
 
   const [notifications, total] = await Promise.all([
-    prisma.platformNotification.findMany({
+    prismaClient.platformNotification.findMany({
       where,
       orderBy: [{ createdAt: "desc" }],
       skip: (page - 1) * pageSize,
       take: pageSize,
-      include: {
-        _count: {
-          select: { interactions: true },
-        },
-        interactions: {
-          select: {
-            webappDismissedAt: true,
-            webappClickedAt: true,
-            cliDismissedAt: true,
-          },
-        },
-      },
     }),
-    prisma.platformNotification.count({ where }),
+    prismaClient.platformNotification.count({ where }),
   ]);
 
+  const notificationIds = notifications.map((n) => n.id);
+
+  const interactionStats =
+    notificationIds.length > 0
+      ? await prismaClient.$queryRaw<
+          {
+            notificationId: string;
+            seen: bigint;
+            clicked: bigint;
+            dismissed: bigint;
+          }[]
+        >`
+          SELECT
+            "notificationId",
+            COUNT(*) AS seen,
+            COUNT(*) FILTER (WHERE "webappClickedAt" IS NOT NULL) AS clicked,
+            COUNT(*) FILTER (
+              WHERE "webappDismissedAt" IS NOT NULL OR "cliDismissedAt" IS NOT NULL
+            ) AS dismissed
+          FROM ${sqlDatabaseSchema}."PlatformNotificationInteraction"
+          WHERE "notificationId" IN (${Prisma.join(notificationIds)})
+          GROUP BY "notificationId"
+        `
+      : [];
+
+  const statsById = new Map(interactionStats.map((row) => [row.notificationId, row]));
+
   return {
     notifications: notifications.map((n) => {
       const parsed = PayloadV1Schema.safeParse(n.payload);
+      const stats = statsById.get(n.id);
       return {
         id: n.id,
         friendlyId: n.friendlyId,
@@ -99,11 +118,9 @@ export async function getAdminNotificationsList({
         cliMaxDaysAfterFirstSeen: n.cliMaxDaysAfterFirstSeen,
         cliShowEvery: n.cliShowEvery,
         stats: {
-          seen: n._count.interactions,
-          clicked: n.interactions.filter((i) => i.webappClickedAt !== null).length,
-          dismissed: n.interactions.filter(
-            (i) => i.webappDismissedAt !== null || i.cliDismissedAt !== null
-          ).length,
+          seen: stats ? Number(stats.seen) : 0,
+          clicked: stats ? Number(stats.clicked) : 0,
+          dismissed: stats ? Number(stats.dismissed) : 0,
         },
       };
     }),

apps/webapp/vitest.config.ts

@@ -17,6 +17,7 @@ export default defineConfig({
       "app/v3/services/bulk/**/*.test.ts",
       "app/runEngine/concerns/**/*.test.ts",
       "app/runEngine/services/**/*.test.ts",
+      "app/services/**/*.test.ts",
       "app/utils/**/*.test.ts",
       "app/components/code/**/*.test.ts",
       "app/components/dashboard-agent/**/*.test.ts",