Merge branch 'main' into fix/gro-660-uat-seed-manager-superuser

fix(api): add server-side pagination to churn risk query (GRO-641)
2026-04-15 00:42:57 +00:00 · 2026-04-15 00:32:11 +00:00 · 2026-04-15 00:25:56 +00:00 · 2026-04-15 00:25:55 +00:00 · 2026-04-15 00:12:01 +00:00 · 2026-04-14 23:02:37 +00:00
3 changed files with 29 additions and 5 deletions
@@ -12,6 +12,7 @@ RUN pnpm install --frozen-lockfile

 # Build
 FROM deps AS builder
+RUN mkdir -p /home/node/.cache/node/corepack
 COPY packages/ packages/
 COPY apps/api/ apps/api/
 RUN pnpm --filter @groombook/types build && \
@@ -49,4 +50,4 @@ CMD ["pnpm", "db:seed"]

 # Reset stage — drops all tables, re-runs migrations, and re-seeds
 FROM builder AS reset
-CMD ["pnpm", "db:reset"]
+CMD ["pnpm", "db:reset"]
@@ -286,6 +286,10 @@ reportsRouter.get("/clients", async (c) => {
  ninetyDaysAgo.setUTCDate(ninetyDaysAgo.getUTCDate() - 90);
  const ninetyDaysAgoISO = ninetyDaysAgo.toISOString();

+  const page = Math.max(1, parseInt(c.req.query("page") ?? "1", 10) || 1);
+  const limit = Math.min(100, Math.max(1, parseInt(c.req.query("limit") ?? "20", 10) || 20));
+  const offset = (page - 1) * limit;
+
  const churnRisk = await db
    .select({
      clientId: clients.id,
@@ -298,15 +302,34 @@ reportsRouter.get("/clients", async (c) => {
    .having(
      sql`MAX(${appointments.startTime}) < ${ninetyDaysAgoISO}::timestamptz OR MAX(${appointments.startTime}) IS NULL`
    )
-    .orderBy(sql`MAX(${appointments.startTime}) ASC NULLS FIRST`);
+    .orderBy(sql`MAX(${appointments.startTime}) ASC NULLS FIRST`)
+    .limit(limit)
+    .offset(offset);
+
+  const [churnCountRow] = await db
+    .select({ total: sql<number>`count(*)::int` })
+    .from(
+      db
+        .select({ id: clients.id })
+        .from(clients)
+        .leftJoin(appointments, eq(appointments.clientId, clients.id))
+        .groupBy(clients.id)
+        .having(
+          sql`MAX(${appointments.startTime}) < ${ninetyDaysAgoISO}::timestamptz OR MAX(${appointments.startTime}) IS NULL`
+        )
+        .as("churn_count")
+    );
+  const churnRiskTotal = churnCountRow?.total ?? 0;

  return c.json({
    from: from.toISOString(),
    to: to.toISOString(),
    newClients,
    activeInPeriodCount: activeInPeriod.length,
-    churnRisk: churnRisk.slice(0, 20), // top 20 at-risk clients
-    churnRiskTotal: churnRisk.length,
+    churnRisk,
+    churnRiskTotal,
+    page,
+    limit,
  });
 });

@@ -567,7 +567,7 @@ async function seed() {

  // ── Staff ──
  const managerStaff = Array.from({ length: cfg.staffCount.manager }, (_, i) =>
-    ({ id: uuid(), name: `Manager ${i + 1}`, email: `manager${i + 1}@groombook.dev`, role: "manager" as const, isSuperUser: false })
+    ({ id: uuid(), name: `Manager ${i + 1}`, email: `manager${i + 1}@groombook.dev`, role: "manager" as const, isSuperUser: profile === "uat" && i === 0 })
  );
  const receptionistStaff = Array.from({ length: cfg.staffCount.receptionist }, (_, i) =>
    ({ id: uuid(), name: `Receptionist ${i + 1}`, email: `receptionist${i + 1}@groombook.dev`, role: "receptionist" as const, isSuperUser: false })
Author	SHA1	Message	Date
groombook-cto[bot]	6e4526d37a	Merge branch 'main' into fix/gro-660-uat-seed-manager-superuser	2026-04-15 00:42:57 +00:00
groombook-cto[bot]	ca88385b8d	fix(api): add server-side pagination to churn risk query (GRO-641) fix(api): add server-side pagination to churn risk query (GRO-641)	2026-04-15 00:32:11 +00:00
Flea Flicker	85ec814b26	fix: set Manager 1 as super user in UAT seed to resolve OOBE redirect	2026-04-15 00:25:56 +00:00
groombook-cto[bot]	3f2769a43a	Merge branch 'main' into fix/gro-641-churn-pagination	2026-04-15 00:25:55 +00:00
Flea Flicker	0ed87f9ed8	fix(api): add server-side pagination to churn risk query (GRO-641) - Add SQL-level LIMIT/OFFSET pagination to churn risk query - Add separate COUNT(*) subquery for total without fetching all rows - Accept page and limit query params with sensible defaults and bounds - Return page, limit, and churnRiskTotal in response Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-15 00:12:01 +00:00
groombook-cto[bot]	648755eee5	fix: add corepack cache dir to Dockerfile (GRO-655) Adds mkdir -p /home/node/.cache/node/corepack in builder stage to fix ENOENT crash in migration/seed jobs. Root cause: `c438f57` image regression — container user's home cache directory not pre-created for corepack. Blocking: GRO-618 (UAT promotion), GRO-607 (payment UI), GRO-609 Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-14 23:02:37 +00:00
Flea Flicker	77a6319459	fix(GRO-655): create corepack cache dir in builder stage Prevents ENOENT crash in migrate and seed jobs. Root cause: corepack tries to mkdir /home/node/.cache/node/corepack/v1 but the directory does not exist in the builder stage. This was a regression in `c438f57` where the cache directory was not pre-created. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-14 22:45:37 +00:00
groombook-cto[bot]	df07f2d6dc	fix(GRO-635): implement groomer data isolation in appointmentGroups, groomingLogs + batherStaffId conflict check - appointmentGroups: Hono<AppEnv>() + groomer isolation on all 5 endpoints - groomingLogs: Hono<AppEnv>() + groomer isolation on GET, POST, DELETE with appointmentId preserved - appointments: batherStaffId conflict checks in POST and PATCH handlers - Non-groomer roles retain full access Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-04-14 18:15:05 +00:00