fix(GRO-607): CTO review fixes — payment security and correctness

- Fix multi-invoice total calculation: use inArray() instead of eq()
  on single ID, sum all invoices not just first
- Add ownership check to payment method deletion: verify the payment
  method belongs to the authenticated Stripe customer before detaching
- Remove duplicate /config endpoint in portal.ts
- Fix webhook Stripe client: use getStripeClient() from payment service
  instead of constructing with WEBHOOK_SECRET
- Remove unnecessary body validator on /invoices/:id/pay route
- Export getStripeClient() for use by stripe-webhooks.ts
- Add inArray import to payment.ts

Co-Authored-By: Paperclip <noreply@paperclip.ing>

.dockerignore

@@ -7,5 +7,3 @@ apps/web/dist
 apps/api/dist
 packages/db/dist
 packages/types/dist
-.turbo
-screenshots/

.github/workflows/ci.yml

@@ -20,8 +20,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
 
       - uses: actions/setup-node@v4
         with:
@@ -44,8 +42,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
 
       - uses: actions/setup-node@v4
         with:
@@ -66,8 +62,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
 
       - uses: actions/setup-node@v4
         with:
@@ -107,8 +101,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
 
       - uses: actions/setup-node@v4
         with:
@@ -246,6 +238,7 @@ jobs:
           echo "Deploying images tagged $TAG to groombook-dev..."
 
           # Run migration with PR image
+          kubectl delete job migrate-schema -n groombook-dev --ignore-not-found
           kubectl delete job "migrate-pr-$PR_NUM" -n groombook-dev --ignore-not-found
           cat <<EOF | kubectl apply -n groombook-dev -f -
           apiVersion: batch/v1
@@ -310,8 +303,6 @@ jobs:
       - uses: actions/checkout@v4
 
       - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
 
       - uses: actions/setup-node@v4
         with:
@@ -418,17 +409,11 @@ jobs:
 
           git push -u origin "chore/update-image-tags-${TAG}"
 
-          # Check if PR already exists for this branch
-          EXISTING_PR=$(gh pr list --repo groombook/infra --head "chore/update-image-tags-${TAG}" --state open --json number -q '.[0].number' || true)
-          if [ -n "$EXISTING_PR" ]; then
-            echo "PR #$EXISTING_PR already exists for this tag, merging existing PR"
-            gh pr merge "$EXISTING_PR" --repo groombook/infra --merge
-          else
-            PR_URL=$(gh pr create \
-              --repo groombook/infra \
-              --base main \
-              --head "chore/update-image-tags-${TAG}" \
-              --title "chore: deploy ${TAG} to dev" \
-              --body "[GRO-178](/GRO/issues/GRO-178) — automated image tag update from main merge")
-            gh pr merge "$PR_URL" --merge
-          fi
+          # Create PR and merge immediately (no required checks on groombook/infra)
+          PR_URL=$(gh pr create \
+            --repo groombook/infra \
+            --base main \
+            --head "chore/update-image-tags-${TAG}" \
+            --title "chore: deploy ${TAG} to dev" \
+            --body "[GRO-178](/GRO/issues/GRO-178) — automated image tag update from main merge")
+          gh pr merge "$PR_URL" --merge

.github/workflows/promote-prod.yml

@@ -14,29 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     permissions:
       contents: read
-      packages: read
     steps:
-      - name: Validate tag format
-        run: |
-          TAG="${{ inputs.tag }}"
-          if ! echo "$TAG" | grep -qE '^[0-9]{4}\.[0-9]{2}\.[0-9]{2}-[a-f0-9]{7}$'; then
-            echo "::error::Invalid tag format: '$TAG'. Expected format: YYYY.MM.DD-sha7 (e.g. 2026.03.28-f1b85bf)"
-            exit 1
-          fi
-          echo "Tag format valid: $TAG"
-
-      - name: Verify image exists in GHCR
-        env:
-          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        run: |
-          TAG="${{ inputs.tag }}"
-          # Check that the API image exists — if API was pushed, web/migrate were too
-          if ! gh api "/orgs/groombook/packages/container/api/versions" --jq ".[].metadata.container.tags[]" 2>/dev/null | grep -qF "$TAG"; then
-            echo "::error::Image ghcr.io/groombook/api:$TAG not found in GHCR. Verify the tag was built and pushed."
-            exit 1
-          fi
-          echo "Image verified: ghcr.io/groombook/api:$TAG exists"
-
       - name: Generate infra repo token
         id: infra-token
         uses: tibdex/github-app-token@v2

apps/api/Dockerfile

@@ -12,7 +12,6 @@ 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 && \
@@ -35,9 +34,6 @@ COPY --from=builder /app/packages/types/dist packages/types/dist
 RUN pnpm install --frozen-lockfile --prod
 
 EXPOSE 3000
-RUN apk add --no-cache curl
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-  CMD curl -f http://localhost:3000/health || exit 1
 CMD ["node", "apps/api/dist/index.js"]
 
 # Migrate stage — runs drizzle-kit migrate against the database
@@ -50,4 +46,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"]

apps/api/src/__tests__/clients.test.ts

@@ -27,14 +27,12 @@ const DISABLED_CLIENT = {
 // ─── Queue-based mock DB ──────────────────────────────────────────────────────
 
 let selectRows: Record<string, unknown>[] = [];
-let appointmentRows: Record<string, unknown>[] = [];
 let insertedValues: Record<string, unknown>[] = [];
 let updatedValues: Record<string, unknown>[] = [];
 let deletedId: string | null = null;
 
 function resetMock() {
   selectRows = [];
-  appointmentRows = [];
   insertedValues = [];
   updatedValues = [];
   deletedId = null;
@@ -60,19 +58,10 @@ vi.mock("@groombook/db", () => {
     { get: (t, p) => (p === "_name" ? "clients" : { table: "clients", column: p }) }
   );
 
-  const appointments = new Proxy(
-    { _name: "appointments" },
-    { get: (t, p) => (p === "_name" ? "appointments" : { table: "appointments", column: p }) }
-  );
-
   return {
     getDb: () => ({
       select: () => ({
-        from: (table: unknown) => {
-          const tableName = (table as { _name?: string })._name;
-          const rows = tableName === "appointments" ? appointmentRows : selectRows;
-          return makeChainable(rows);
-        },
+        from: () => makeChainable(selectRows),
       }),
       insert: () => ({
         values: (vals: Record<string, unknown>) => {
@@ -106,10 +95,8 @@ vi.mock("@groombook/db", () => {
       }),
     }),
     clients,
-    appointments,
     eq: vi.fn(),
     and: vi.fn(),
-    or: vi.fn(),
   };
 });
 

apps/api/src/index.ts

@@ -187,24 +187,9 @@ api.route("/search", searchRouter);
 const port = Number(process.env.PORT ?? 3000);
 await initAuth();
 console.log(`API server listening on port ${port}`);
-const server = serve({ fetch: app.fetch, port });
+serve({ fetch: app.fetch, port });
 
 // Start background reminder scheduler (runs every minute to check for upcoming appointments)
 startReminderScheduler();
 
-function shutdown() {
-  console.log("Shutting down gracefully...");
-  server.close(() => {
-    console.log("HTTP server closed");
-    process.exit(0);
-  });
-  setTimeout(() => {
-    console.error("Forced shutdown after timeout");
-    process.exit(1);
-  }, 10_000);
-}
-
-process.on("SIGTERM", shutdown);
-process.on("SIGINT", shutdown);
-
 export default app;

apps/api/src/middleware/rbac.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareHandler } from "hono";
-import { and, eq, getDb, sql, staff } from "@groombook/db";
+import { eq, getDb, staff } from "@groombook/db";
 
 export type StaffRole = "groomer" | "receptionist" | "manager";
 export type StaffRow = typeof staff.$inferSelect;
@@ -89,31 +89,14 @@ export const resolveStaffMiddleware: MiddlewareHandler<AppEnv> = async (
     .select()
     .from(staff)
     .where(eq(staff.oidcSub, jwt.sub));
-  if (fallbackRow) {
-    c.set("staff", fallbackRow);
-    await next();
-    return;
+  if (!fallbackRow) {
+    return c.json(
+      { error: "Forbidden: no staff record found for authenticated user" },
+      403
+    );
   }
-  // Auto-link by email: staff record exists with matching email but no userId
-  if (jwt.email) {
-    const [byEmail] = await db
-      .select()
-      .from(staff)
-      .where(and(eq(staff.email, jwt.email), sql`${staff.userId} IS NULL`));
-    if (byEmail) {
-      await db
-        .update(staff)
-        .set({ userId: jwt.sub, updatedAt: new Date() })
-        .where(eq(staff.id, byEmail.id));
-      c.set("staff", { ...byEmail, userId: jwt.sub });
-      await next();
-      return;
-    }
-  }
-  return c.json(
-    { error: "Forbidden: no staff record found for authenticated user" },
-    403
-  );
+  c.set("staff", fallbackRow);
+  await next();
 };
 
 /**

apps/api/src/routes/appointmentGroups.ts

@@ -16,9 +16,8 @@ import {
   services,
   staff,
 } from "@groombook/db";
-import type { AppEnv } from "../middleware/rbac.js";
 
-export const appointmentGroupsRouter = new Hono<AppEnv>();
+export const appointmentGroupsRouter = new Hono();
 
 // ─── Schemas ──────────────────────────────────────────────────────────────────
 
@@ -50,8 +49,6 @@ appointmentGroupsRouter.get("/", async (c) => {
   const clientId = c.req.query("clientId");
   const from = c.req.query("from");
   const to = c.req.query("to");
-  const staffRow = c.get("staff");
-  const isGroomer = staffRow?.role === "groomer";
 
   const groupConditions = clientId
     ? [eq(appointmentGroups.clientId, clientId)]
@@ -91,16 +88,6 @@ appointmentGroupsRouter.get("/", async (c) => {
     }))
     .filter((g) => !from || g.appointments.length > 0);
 
-  if (isGroomer) {
-    return c.json(
-      result.filter((g) =>
-        g.appointments.some(
-          (a) => a.staffId === staffRow.id || a.batherStaffId === staffRow.id
-        )
-      )
-    );
-  }
-
   return c.json(result);
 });
 
@@ -109,8 +96,6 @@ appointmentGroupsRouter.get("/", async (c) => {
 appointmentGroupsRouter.get("/:id", async (c) => {
   const db = getDb();
   const id = c.req.param("id");
-  const staffRow = c.get("staff");
-  const isGroomer = staffRow?.role === "groomer";
 
   const [group] = await db
     .select()
@@ -126,7 +111,6 @@ appointmentGroupsRouter.get("/:id", async (c) => {
       serviceId: appointments.serviceId,
       serviceName: services.name,
       staffId: appointments.staffId,
-      batherStaffId: appointments.batherStaffId,
       staffName: staff.name,
       status: appointments.status,
       startTime: appointments.startTime,
@@ -141,15 +125,6 @@ appointmentGroupsRouter.get("/:id", async (c) => {
     .where(eq(appointments.groupId, id))
     .orderBy(appointments.startTime);
 
-  if (
-    isGroomer &&
-    !groupAppts.some(
-      (a) => a.staffId === staffRow.id || a.batherStaffId === staffRow.id
-    )
-  ) {
-    return c.json({ error: "Forbidden" }, 403);
-  }
-
   const [client] = await db
     .select({ name: clients.name, email: clients.email })
     .from(clients)
@@ -165,13 +140,6 @@ appointmentGroupsRouter.post(
   zValidator("json", createGroupSchema),
   async (c) => {
     const db = getDb();
-    const staffRow = c.get("staff");
-    if (staffRow?.role === "groomer") {
-      return c.json(
-        { error: "Forbidden: groomers cannot create group bookings" },
-        403
-      );
-    }
     const body = c.req.valid("json");
     const startTime = new Date(body.startTime);
 
@@ -276,28 +244,6 @@ appointmentGroupsRouter.patch(
     const db = getDb();
     const id = c.req.param("id");
     const body = c.req.valid("json");
-    const staffRow = c.get("staff");
-    const isGroomer = staffRow?.role === "groomer";
-
-    const [group] = await db
-      .select({ id: appointmentGroups.id })
-      .from(appointmentGroups)
-      .where(eq(appointmentGroups.id, id));
-    if (!group) return c.json({ error: "Not found" }, 404);
-
-    if (isGroomer) {
-      const groupAppts = await db
-        .select({ staffId: appointments.staffId, batherStaffId: appointments.batherStaffId })
-        .from(appointments)
-        .where(eq(appointments.groupId, id));
-      if (
-        !groupAppts.some(
-          (a) => a.staffId === staffRow.id || a.batherStaffId === staffRow.id
-        )
-      ) {
-        return c.json({ error: "Forbidden" }, 403);
-      }
-    }
 
     const [updated] = await db
       .update(appointmentGroups)
@@ -315,8 +261,6 @@ appointmentGroupsRouter.patch(
 appointmentGroupsRouter.delete("/:id", async (c) => {
   const db = getDb();
   const id = c.req.param("id");
-  const staffRow = c.get("staff");
-  const isGroomer = staffRow?.role === "groomer";
 
   const [group] = await db
     .select({ id: appointmentGroups.id })
@@ -324,20 +268,6 @@ appointmentGroupsRouter.delete("/:id", async (c) => {
     .where(eq(appointmentGroups.id, id));
   if (!group) return c.json({ error: "Not found" }, 404);
 
-  if (isGroomer) {
-    const groupAppts = await db
-      .select({ staffId: appointments.staffId, batherStaffId: appointments.batherStaffId })
-      .from(appointments)
-      .where(eq(appointments.groupId, id));
-    if (
-      !groupAppts.some(
-        (a) => a.staffId === staffRow.id || a.batherStaffId === staffRow.id
-      )
-    ) {
-      return c.json({ error: "Forbidden" }, 403);
-    }
-  }
-
   await db
     .update(appointments)
     .set({ status: "cancelled", updatedAt: new Date() })

apps/api/src/routes/appointments.ts

@@ -23,27 +23,6 @@ import { buildConfirmationEmail, sendEmail } from "../services/email.js";
 import { notifyWaitlistForAppointment } from "../services/waitlistNotify.js";
 import type { AppEnv } from "../middleware/rbac.js";
 
-async function withRetry<T>(
-  fn: () => Promise<T>,
-  maxRetries: number,
-  delayMs: number,
-  context: string
-): Promise<void> {
-  let lastError: unknown;
-  for (let attempt = 0; attempt <= maxRetries; attempt++) {
-    try {
-      await fn();
-      return;
-    } catch (err) {
-      lastError = err;
-      if (attempt < maxRetries) {
-        await new Promise((resolve) => setTimeout(resolve, delayMs));
-      }
-    }
-  }
-  console.error(`[appointments] ${context}: ${lastError}`);
-}
-
 export const appointmentsRouter = new Hono<AppEnv>();
 
 const createAppointmentSchema = z.object({
@@ -62,10 +41,6 @@ const createAppointmentSchema = z.object({
       frequencyWeeks: z.number().int().min(1).max(52),
       count: z.number().int().min(2).max(52),
     })
-    .refine(
-      (r) => r.frequencyWeeks * r.count <= 52,
-      { message: "Recurrence series must not exceed 1 year" }
-    )
     .optional(),
 });
 
@@ -188,28 +163,6 @@ appointmentsRouter.post(
           }
         }
 
-        if (apptFields.batherStaffId) {
-          const bathConflicts = await tx
-            .select({ id: appointments.id })
-            .from(appointments)
-            .where(
-              and(
-                or(
-                  eq(appointments.staffId, apptFields.batherStaffId),
-                  eq(appointments.batherStaffId, apptFields.batherStaffId)
-                ),
-                lt(appointments.startTime, end),
-                gte(appointments.endTime, start),
-                ne(appointments.status, "cancelled"),
-                ne(appointments.status, "no_show"),
-              )
-            )
-            .limit(1);
-          if (bathConflicts.length > 0) {
-            throw Object.assign(new Error("conflict"), { statusCode: 409 });
-          }
-        }
-
         if (!recurrence) {
           // Single appointment
           const [inserted] = await tx
@@ -233,54 +186,11 @@ appointmentsRouter.post(
           recurrence.frequencyWeeks * 7 * 24 * 60 * 60 * 1000;
 
         let first: typeof appointments.$inferSelect | undefined;
-        const conflictingInstances: number[] = [];
         for (let i = 0; i < recurrence.count; i++) {
           const instanceStart = new Date(start.getTime() + i * intervalMs);
           const instanceEnd = new Date(
             instanceStart.getTime() + durationMs
           );
-
-          if (apptFields.staffId) {
-            const conflicts = await tx
-              .select({ id: appointments.id })
-              .from(appointments)
-              .where(
-                and(
-                  eq(appointments.staffId, apptFields.staffId),
-                  lt(appointments.startTime, instanceEnd),
-                  gte(appointments.endTime, instanceStart),
-                  ne(appointments.status, "cancelled"),
-                  ne(appointments.status, "no_show"),
-                )
-              )
-              .limit(1);
-            if (conflicts.length > 0) {
-              conflictingInstances.push(i);
-            }
-          }
-
-          if (apptFields.batherStaffId) {
-            const conflicts = await tx
-              .select({ id: appointments.id })
-              .from(appointments)
-              .where(
-                and(
-                  or(
-                    eq(appointments.staffId, apptFields.batherStaffId),
-                    eq(appointments.batherStaffId, apptFields.batherStaffId)
-                  ),
-                  lt(appointments.startTime, instanceEnd),
-                  gte(appointments.endTime, instanceStart),
-                  ne(appointments.status, "cancelled"),
-                  ne(appointments.status, "no_show"),
-                )
-              )
-              .limit(1);
-            if (conflicts.length > 0) {
-              conflictingInstances.push(i);
-            }
-          }
-
           const [inserted] = await tx
             .insert(appointments)
             .values({
@@ -291,19 +201,9 @@ appointmentsRouter.post(
               seriesIndex: i,
             })
             .returning();
-          if (!inserted) throw new Error(`Insert failed for occurrence ${i}`);
           if (i === 0) first = inserted;
         }
 
-        if (conflictingInstances.length > 0) {
-          throw Object.assign(
-            new Error(
-              `Conflicts detected at occurrence(s): ${conflictingInstances.join(", ")}`
-            ),
-            { statusCode: 409 }
-          );
-        }
-
         if (!first) throw new Error("No appointments created");
         return first;
       });
@@ -321,12 +221,9 @@ appointmentsRouter.post(
     }
 
     // Send confirmation email (fire-and-forget — never fails the request)
-    withRetry(
-      () => sendConfirmationEmail(db, firstRow),
-      2,
-      1000,
-      `Failed to send confirmation email for appointment ${firstRow.id}`
-    );
+    sendConfirmationEmail(db, firstRow).catch((err) => {
+      console.error("[appointments] Failed to send confirmation email:", err);
+    });
 
     return c.json(firstRow, 201);
   }
@@ -455,76 +352,6 @@ appointmentsRouter.patch(
 
           let firstUpdated: typeof appointments.$inferSelect | undefined;
           for (const appt of affected) {
-            const newStart =
-              startDeltaMs !== 0
-                ? new Date(appt.startTime.getTime() + startDeltaMs)
-                : appt.startTime;
-            const newEnd =
-              endDeltaMs !== 0
-                ? new Date(appt.endTime.getTime() + endDeltaMs)
-                : appt.endTime;
-            const newStaffId =
-              updateFields.staffId !== undefined
-                ? updateFields.staffId
-                : appt.staffId;
-            const newBatherStaffId =
-              updateFields.batherStaffId !== undefined
-                ? updateFields.batherStaffId
-                : appt.batherStaffId;
-
-            if (
-              newStaffId &&
-              (startDeltaMs !== 0 ||
-                endDeltaMs !== 0 ||
-                updateFields.staffId !== undefined)
-            ) {
-              const conflicts = await tx
-                .select({ id: appointments.id })
-                .from(appointments)
-                .where(
-                  and(
-                    eq(appointments.staffId, newStaffId),
-                    lt(appointments.startTime, newEnd),
-                    gte(appointments.endTime, newStart),
-                    ne(appointments.status, "cancelled"),
-                    ne(appointments.status, "no_show"),
-                    ne(appointments.id, appt.id),
-                  )
-                )
-                .limit(1);
-              if (conflicts.length > 0) {
-                throw Object.assign(new Error("conflict"), { statusCode: 409 });
-              }
-            }
-
-            if (
-              newBatherStaffId &&
-              (startDeltaMs !== 0 ||
-                endDeltaMs !== 0 ||
-                updateFields.batherStaffId !== undefined)
-            ) {
-              const conflicts = await tx
-                .select({ id: appointments.id })
-                .from(appointments)
-                .where(
-                  and(
-                    or(
-                      eq(appointments.staffId, newBatherStaffId),
-                      eq(appointments.batherStaffId, newBatherStaffId)
-                    ),
-                    lt(appointments.startTime, newEnd),
-                    gte(appointments.endTime, newStart),
-                    ne(appointments.status, "cancelled"),
-                    ne(appointments.status, "no_show"),
-                    ne(appointments.id, appt.id),
-                  )
-                )
-                .limit(1);
-              if (conflicts.length > 0) {
-                throw Object.assign(new Error("conflict"), { statusCode: 409 });
-              }
-            }
-
             const apptUpdate: Record<string, unknown> = {
               updatedAt: new Date(),
             };
@@ -560,13 +387,6 @@ appointmentsRouter.patch(
         if (statusCode === 404) return c.json({ error: "Not found" }, 404);
         if (statusCode === 422)
           return c.json({ error: "endTime must be after startTime" }, 422);
-        if (statusCode === 409)
-          return c.json(
-            {
-              error: "Staff member has a conflicting appointment at this time",
-            },
-            409
-          );
         throw err;
       }
 
@@ -578,8 +398,7 @@ appointmentsRouter.patch(
     const needsConflictCheck =
       updateFields.startTime !== undefined ||
       updateFields.endTime !== undefined ||
-      updateFields.staffId !== undefined ||
-      updateFields.batherStaffId !== undefined;
+      updateFields.staffId !== undefined;
 
     const update: Record<string, unknown> = {
       ...updateFields,
@@ -615,11 +434,6 @@ appointmentsRouter.patch(
             updateFields.staffId !== undefined
               ? updateFields.staffId
               : current.staffId;
-          // Use provided batherStaffId (may be null to unassign); fall back to existing
-          const batherStaffId =
-            updateFields.batherStaffId !== undefined
-              ? updateFields.batherStaffId
-              : current.batherStaffId;
 
           if (end <= start) {
             throw Object.assign(new Error("end before start"), {
@@ -647,29 +461,6 @@ appointmentsRouter.patch(
             }
           }
 
-          if (batherStaffId) {
-            const bathConflicts = await tx
-              .select({ id: appointments.id })
-              .from(appointments)
-              .where(
-                and(
-                  or(
-                    eq(appointments.staffId, batherStaffId),
-                    eq(appointments.batherStaffId, batherStaffId)
-                  ),
-                  lt(appointments.startTime, end),
-                  gte(appointments.endTime, start),
-                  ne(appointments.status, "cancelled"),
-                  ne(appointments.status, "no_show"),
-                  ne(appointments.id, id),
-                )
-              )
-              .limit(1);
-            if (bathConflicts.length > 0) {
-              throw Object.assign(new Error("conflict"), { statusCode: 409 });
-            }
-          }
-
           const [updated] = await tx
             .update(appointments)
             .set(update)
@@ -744,12 +535,9 @@ appointmentsRouter.delete("/:id", async (c) => {
 
     const apptDate = current.startTime.toISOString().slice(0, 10);
     const apptTime = current.startTime.toLocaleTimeString("en-US", { hour: "2-digit", minute: "2-digit", hour12: true });
-    withRetry(
-      () => notifyWaitlistForAppointment(id, apptDate, apptTime, current.serviceId),
-      2,
-      1000,
-      `Failed to notify waitlist for appointment ${id}`
-    );
+    notifyWaitlistForAppointment(id, apptDate, apptTime, current.serviceId).catch((err) => {
+      console.error("[appointments] Failed to notify waitlist:", err);
+    });
 
     return c.json({ ok: true });
   }
@@ -772,12 +560,9 @@ appointmentsRouter.delete("/:id", async (c) => {
     .returning();
   if (!row) return c.json({ error: "Not found" }, 404);
 
-  withRetry(
-    () => notifyWaitlistForAppointment(id, apptDate, apptTime, current.serviceId),
-    2,
-    1000,
-    `Failed to notify waitlist for appointment ${id}`
-  );
+  notifyWaitlistForAppointment(id, apptDate, apptTime, current.serviceId).catch((err) => {
+    console.error("[appointments] Failed to notify waitlist:", err);
+  });
 
   return c.json({ ok: true });
 });

apps/api/src/routes/book.ts

@@ -102,10 +102,7 @@ bookRouter.get("/availability", async (c) => {
 
 const bookingSchema = z.object({
   serviceId: z.string().uuid(),
-  startTime: z.string().datetime().refine(
-    (dt) => new Date(dt) > new Date(),
-    { message: "Appointment must be in the future" }
-  ),
+  startTime: z.string().datetime(),
   clientName: z.string().min(1).max(200),
   clientEmail: z.string().email(),
   clientPhone: z.string().max(50).optional(),

apps/api/src/routes/clients.ts

@@ -135,24 +135,9 @@ clientsRouter.delete("/:id", async (c) => {
   }
 
   const db = getDb();
-  const clientId = c.req.param("id");
-
-  const [existingAppt] = await db
-    .select({ id: appointments.id })
-    .from(appointments)
-    .where(eq(appointments.clientId, clientId))
-    .limit(1);
-
-  if (existingAppt) {
-    return c.json(
-      { error: "Cannot delete client with existing appointments. Cancel or reassign appointments first." },
-      409
-    );
-  }
-
   const [row] = await db
     .delete(clients)
-    .where(eq(clients.id, clientId))
+    .where(eq(clients.id, c.req.param("id")))
     .returning();
   if (!row) return c.json({ error: "Not found" }, 404);
   return c.json({ ok: true });

apps/api/src/routes/groomingLogs.ts

@@ -1,10 +1,9 @@
 import { Hono } from "hono";
 import { zValidator } from "@hono/zod-validator";
 import { z } from "zod/v3";
-import { and, desc, eq, getDb, groomingVisitLogs, appointments, or } from "@groombook/db";
-import type { AppEnv } from "../middleware/rbac.js";
+import { desc, eq, getDb, groomingVisitLogs } from "@groombook/db";
 
-export const groomingLogsRouter = new Hono<AppEnv>();
+export const groomingLogsRouter = new Hono();
 
 const createLogSchema = z.object({
   petId: z.string().uuid(),
@@ -21,26 +20,6 @@ groomingLogsRouter.get("/", async (c) => {
   const db = getDb();
   const petId = c.req.query("petId");
   if (!petId) return c.json({ error: "petId is required" }, 400);
-  const staffRow = c.get("staff");
-  const isGroomer = staffRow?.role === "groomer";
-
-  if (isGroomer) {
-    const [appt] = await db
-      .select({ id: appointments.id })
-      .from(appointments)
-      .where(
-        and(
-          eq(appointments.petId, petId),
-          or(
-            eq(appointments.staffId, staffRow.id),
-            eq(appointments.batherStaffId, staffRow.id)
-          )
-        )
-      )
-      .limit(1);
-    if (!appt) return c.json({ error: "Forbidden" }, 403);
-  }
-
   const rows = await db
     .select()
     .from(groomingVisitLogs)
@@ -54,50 +33,11 @@ groomingLogsRouter.post(
   zValidator("json", createLogSchema),
   async (c) => {
     const db = getDb();
-    const { groomedAt, petId, appointmentId, ...rest } = c.req.valid("json");
-    const staffRow = c.get("staff");
-    const isGroomer = staffRow?.role === "groomer";
-
-    if (isGroomer) {
-      if (appointmentId) {
-        const [appt] = await db
-          .select({ id: appointments.id })
-          .from(appointments)
-          .where(
-            and(
-              eq(appointments.id, appointmentId),
-              or(
-                eq(appointments.staffId, staffRow.id),
-                eq(appointments.batherStaffId, staffRow.id)
-              )
-            )
-          )
-          .limit(1);
-        if (!appt) return c.json({ error: "Forbidden" }, 403);
-      } else {
-        const [appt] = await db
-          .select({ id: appointments.id })
-          .from(appointments)
-          .where(
-            and(
-              eq(appointments.petId, petId),
-              or(
-                eq(appointments.staffId, staffRow.id),
-                eq(appointments.batherStaffId, staffRow.id)
-              )
-            )
-          )
-          .limit(1);
-        if (!appt) return c.json({ error: "Forbidden" }, 403);
-      }
-    }
-
+    const { groomedAt, ...rest } = c.req.valid("json");
     const [row] = await db
       .insert(groomingVisitLogs)
       .values({
         ...rest,
-        petId,
-        appointmentId: appointmentId ?? null,
         groomedAt: groomedAt ? new Date(groomedAt) : new Date(),
       })
       .returning();
@@ -107,37 +47,10 @@ groomingLogsRouter.post(
 
 groomingLogsRouter.delete("/:id", async (c) => {
   const db = getDb();
-  const id = c.req.param("id");
-  const staffRow = c.get("staff");
-  const isGroomer = staffRow?.role === "groomer";
-
-  const [log] = await db
-    .select()
-    .from(groomingVisitLogs)
-    .where(eq(groomingVisitLogs.id, id))
-    .limit(1);
-  if (!log) return c.json({ error: "Not found" }, 404);
-
-  if (isGroomer) {
-    const [appt] = await db
-      .select({ id: appointments.id })
-      .from(appointments)
-      .where(
-        and(
-          eq(appointments.petId, log.petId),
-          or(
-            eq(appointments.staffId, staffRow.id),
-            eq(appointments.batherStaffId, staffRow.id)
-          )
-        )
-      )
-      .limit(1);
-    if (!appt) return c.json({ error: "Forbidden" }, 403);
-  }
-
-  await db
+  const [row] = await db
     .delete(groomingVisitLogs)
-    .where(eq(groomingVisitLogs.id, id))
+    .where(eq(groomingVisitLogs.id, c.req.param("id")))
     .returning();
+  if (!row) return c.json({ error: "Not found" }, 404);
   return c.json({ ok: true });
 });

apps/api/src/routes/invoices.ts

@@ -8,7 +8,6 @@ import {
   invoices,
   invoiceLineItems,
   invoiceTipSplits,
-  refunds,
   appointments,
   services,
   clients,
@@ -45,61 +44,53 @@ const updateInvoiceSchema = z.object({
 });
 
 // List invoices
-const listInvoicesQuerySchema = z.object({
-  clientId: z.string().uuid().optional(),
-  appointmentId: z.string().uuid().optional(),
-  status: z.enum(["draft", "pending", "paid", "void"]).optional(),
-  limit: z.coerce.number().int().min(1).max(200).default(50),
-  offset: z.coerce.number().int().min(0).default(0),
+invoicesRouter.get("/", async (c) => {
+  const db = getDb();
+  const clientId = c.req.query("clientId");
+  const appointmentId = c.req.query("appointmentId");
+  const status = c.req.query("status");
+  const limit = Math.min(parseInt(c.req.query("limit") || "50", 10), 200);
+  const offset = parseInt(c.req.query("offset") || "0", 10);
+
+  const conditions = [];
+  if (clientId) conditions.push(eq(invoices.clientId, clientId));
+  if (appointmentId) conditions.push(eq(invoices.appointmentId, appointmentId));
+  if (status) conditions.push(eq(invoices.status, status as "draft" | "pending" | "paid" | "void"));
+
+  const whereClause = conditions.length > 0 ? and(...conditions) : undefined;
+
+  const [totalResult] = await db
+    .select({ count: sql<number>`count(*)` })
+    .from(invoices)
+    .where(whereClause);
+
+  const rows = await db
+    .select({
+      id: invoices.id,
+      appointmentId: invoices.appointmentId,
+      clientId: invoices.clientId,
+      clientName: clients.name,
+      subtotalCents: invoices.subtotalCents,
+      taxCents: invoices.taxCents,
+      tipCents: invoices.tipCents,
+      totalCents: invoices.totalCents,
+      status: invoices.status,
+      paymentMethod: invoices.paymentMethod,
+      paidAt: invoices.paidAt,
+      notes: invoices.notes,
+      createdAt: invoices.createdAt,
+      updatedAt: invoices.updatedAt,
+    })
+    .from(invoices)
+    .leftJoin(clients, eq(invoices.clientId, clients.id))
+    .where(whereClause)
+    .orderBy(invoices.createdAt)
+    .limit(limit)
+    .offset(offset);
+
+  return c.json({ data: rows, total: totalResult?.count ?? 0 });
 });
 
-invoicesRouter.get(
-  "/",
-  zValidator("query", listInvoicesQuerySchema),
-  async (c) => {
-    const db = getDb();
-    const { clientId, appointmentId, status, limit, offset } = c.req.valid("query");
-
-    const conditions = [];
-    if (clientId) conditions.push(eq(invoices.clientId, clientId));
-    if (appointmentId) conditions.push(eq(invoices.appointmentId, appointmentId));
-    if (status) conditions.push(eq(invoices.status, status as "draft" | "pending" | "paid" | "void"));
-
-    const whereClause = conditions.length > 0 ? and(...conditions) : undefined;
-
-    const [totalResult] = await db
-      .select({ count: sql<number>`count(*)` })
-      .from(invoices)
-      .where(whereClause);
-
-    const rows = await db
-      .select({
-        id: invoices.id,
-        appointmentId: invoices.appointmentId,
-        clientId: invoices.clientId,
-        clientName: clients.name,
-        subtotalCents: invoices.subtotalCents,
-        taxCents: invoices.taxCents,
-        tipCents: invoices.tipCents,
-        totalCents: invoices.totalCents,
-        status: invoices.status,
-        paymentMethod: invoices.paymentMethod,
-        paidAt: invoices.paidAt,
-        notes: invoices.notes,
-        createdAt: invoices.createdAt,
-        updatedAt: invoices.updatedAt,
-      })
-      .from(invoices)
-      .leftJoin(clients, eq(invoices.clientId, clients.id))
-      .where(whereClause)
-      .orderBy(invoices.createdAt)
-      .limit(limit)
-      .offset(offset);
-
-    return c.json({ data: rows, total: totalResult?.count ?? 0 });
-  }
-);
-
 // Get single invoice with line items and tip splits
 invoicesRouter.get("/:id", async (c) => {
   const db = getDb();
@@ -126,8 +117,8 @@ const tipSplitSchema = z.object({
     })
   ).min(1).refine(
     (splits) => {
-      const totalBps = splits.reduce((sum, s) => sum + Math.round(s.sharePct * 100), 0);
-      return totalBps === 10000;
+      const total = splits.reduce((sum, s) => sum + s.sharePct, 0);
+      return Math.abs(total - 100) < 0.01;
     },
     { message: "Split percentages must sum to 100" }
   ),
@@ -171,13 +162,12 @@ invoicesRouter.post(
       }
     });
 
-    const [updatedInvoice] = await db.select().from(invoices).where(eq(invoices.id, id));
-    const [lineItems, tipSplits] = await Promise.all([
-      db.select().from(invoiceLineItems).where(eq(invoiceLineItems.invoiceId, id)),
-      db.select().from(invoiceTipSplits).where(eq(invoiceTipSplits.invoiceId, id)),
-    ]);
+    const splits = await db
+      .select()
+      .from(invoiceTipSplits)
+      .where(eq(invoiceTipSplits.invoiceId, id));
 
-    return c.json({ ...updatedInvoice, lineItems, tipSplits }, 201);
+    return c.json(splits, 201);
   }
 );
 
@@ -302,13 +292,6 @@ invoicesRouter.post("/from-appointment/:appointmentId", async (c) => {
   return c.json({ ...invoice, lineItems: [lineItem] }, 201);
 });
 
-const ALLOWED_TRANSITIONS: Record<string, string[]> = {
-  draft: ["pending", "void"],
-  pending: ["draft", "paid", "void"],
-  paid: ["void"],
-  void: [],
-};
-
 // Update invoice
 invoicesRouter.patch(
   "/:id",
@@ -324,14 +307,8 @@ invoicesRouter.patch(
       .where(eq(invoices.id, id));
     if (!current) return c.json({ error: "Not found" }, 404);
 
-    if (body.status !== undefined) {
-      const allowed = ALLOWED_TRANSITIONS[current.status] ?? [];
-      if (!allowed.includes(body.status)) {
-        return c.json(
-          { error: `Invalid status transition from ${current.status} to ${body.status}` },
-          422
-        );
-      }
+    if (current.status === "void") {
+      return c.json({ error: "Cannot modify a voided invoice" }, 422);
     }
 
     const update: Record<string, unknown> = { ...body, updatedAt: new Date() };
@@ -369,7 +346,6 @@ import { processRefund } from "../services/payment.js";
 
 const refundSchema = z.object({
   amountCents: z.number().int().nonnegative().optional(),
-  idempotencyKey: z.string().max(255).optional(),
 });
 
 invoicesRouter.post(
@@ -395,28 +371,9 @@ invoicesRouter.post(
       return c.json({ error: "No Stripe payment intent found for this invoice" }, 422);
     }
 
-    return await db.transaction(async (tx) => {
-      if (body.idempotencyKey) {
-        const [existing] = await tx
-          .select()
-          .from(refunds)
-          .where(eq(refunds.idempotencyKey, body.idempotencyKey));
-        if (existing) {
-          return c.json({ refundId: existing.stripeRefundId });
-        }
-      }
+    const result = await processRefund(id, body.amountCents);
+    if (!result) return c.json({ error: "Refund failed" }, 500);
 
-      const result = await processRefund(id, body.amountCents);
-      if (!result) return c.json({ error: "Refund failed" }, 500);
-
-      await tx.insert(refunds).values({
-        invoiceId: id,
-        stripeRefundId: result.refundId,
-        idempotencyKey: body.idempotencyKey ?? null,
-        amountCents: body.amountCents ?? null,
-      });
-
-      return c.json({ refundId: result.refundId });
-    });
+    return c.json({ refundId: result.refundId });
   }
 );

apps/api/src/routes/reports.ts

@@ -286,10 +286,6 @@ 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,
@@ -302,34 +298,15 @@ 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`)
-    .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;
+    .orderBy(sql`MAX(${appointments.startTime}) ASC NULLS FIRST`);
 
   return c.json({
     from: from.toISOString(),
     to: to.toISOString(),
     newClients,
     activeInPeriodCount: activeInPeriod.length,
-    churnRisk,
-    churnRiskTotal,
-    page,
-    limit,
+    churnRisk: churnRisk.slice(0, 20), // top 20 at-risk clients
+    churnRiskTotal: churnRisk.length,
   });
 });
 

apps/api/src/routes/services.ts

@@ -9,7 +9,7 @@ const createServiceSchema = z.object({
   name: z.string().min(1).max(200),
   description: z.string().max(2000).optional(),
   basePriceCents: z.number().int().positive(),
-  durationMinutes: z.number().int().positive().max(480),
+  durationMinutes: z.number().int().positive(),
   active: z.boolean().default(true),
 });
 

apps/api/src/routes/stripe-webhooks.ts

@@ -1,6 +1,5 @@
 import { Hono } from "hono";
 import Stripe from "stripe";
-import { z } from "zod/v3";
 import { eq, getDb, invoices } from "@groombook/db";
 import { getStripeClient } from "../services/payment.js";
 
@@ -45,13 +44,10 @@ webhooksRouter.post("/stripe", async (c) => {
       const invoiceIds = pi.metadata.groombook_invoice_ids.split(",");
       for (const invoiceId of invoiceIds) {
         if (!invoiceId) continue;
-        const parsed = z.string().uuid().safeParse(invoiceId.trim());
-        if (!parsed.success) continue;
-        const invoiceIdTrimmed = invoiceId.trim();
         const [inv] = await db
           .select()
           .from(invoices)
-          .where(eq(invoices.id, invoiceIdTrimmed))
+          .where(eq(invoices.id, invoiceId))
           .limit(1);
         if (!inv) continue;
         if (inv.stripePaymentIntentId && inv.stripePaymentIntentId !== pi.id) continue;
@@ -64,7 +60,7 @@ webhooksRouter.post("/stripe", async (c) => {
             stripePaymentIntentId: pi.id,
             updatedAt: new Date(),
           })
-          .where(eq(invoices.id, invoiceIdTrimmed));
+          .where(eq(invoices.id, invoiceId));
       }
     }
   } else if (event.type === "payment_intent.payment_failed") {
@@ -73,16 +69,13 @@ webhooksRouter.post("/stripe", async (c) => {
       const invoiceIds = pi.metadata.groombook_invoice_ids.split(",");
       for (const invoiceId of invoiceIds) {
         if (!invoiceId) continue;
-        const parsed = z.string().uuid().safeParse(invoiceId.trim());
-        if (!parsed.success) continue;
-        const invoiceIdTrimmed = invoiceId.trim();
         await db
           .update(invoices)
           .set({
             paymentFailureReason: pi.last_payment_error?.message ?? "Payment failed",
             updatedAt: new Date(),
           })
-          .where(eq(invoices.id, invoiceIdTrimmed));
+          .where(eq(invoices.id, invoiceId));
       }
     }
   } else if (event.type === "charge.refunded") {

apps/web/Dockerfile

@@ -20,5 +20,3 @@ FROM nginx:alpine AS runner
 COPY apps/web/nginx.conf /etc/nginx/conf.d/default.conf
 COPY --from=builder /app/apps/web/dist /usr/share/nginx/html
 EXPOSE 80
-HEALTHCHECK --interval=30s --timeout=5s --start-period=5s --retries=3 \
-  CMD curl -f http://localhost:80/ || exit 1

apps/web/nginx.conf

@@ -3,22 +3,10 @@ server {
     root /usr/share/nginx/html;
     index index.html;
 
-    # Security headers
-    add_header X-Content-Type-Options "nosniff" always;
-    add_header X-Frame-Options "SAMEORIGIN" always;
-    add_header Referrer-Policy "strict-origin-when-cross-origin" always;
-    add_header X-XSS-Protection "1; mode=block" always;
-    add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
-
     # Cache static assets
     location ~* \.(js|css|png|svg|ico|woff2)$ {
         expires 1y;
         add_header Cache-Control "public, immutable";
-        add_header X-Content-Type-Options "nosniff" always;
-        add_header X-Frame-Options "SAMEORIGIN" always;
-        add_header Referrer-Policy "strict-origin-when-cross-origin" always;
-        add_header X-XSS-Protection "1; mode=block" always;
-        add_header Permissions-Policy "camera=(), microphone=(), geolocation=()" always;
     }
 
     # Proxy API calls to the API service

packages/db/migrations/0027_refunds.sql

@@ -1,11 +0,0 @@
-CREATE TABLE "refunds" (
-  "id" uuid PRIMARY KEY DEFAULT gen_random_uuid(),
-  "invoice_id" uuid NOT NULL REFERENCES "invoices"("id") ON DELETE RESTRICT,
-  "stripe_refund_id" text NOT NULL,
-  "idempotency_key" text UNIQUE,
-  "amount_cents" integer,
-  "created_at" timestamp NOT NULL DEFAULT NOW()
-);
-
-CREATE INDEX "idx_refunds_invoice_id" ON "refunds"("invoice_id");
-CREATE INDEX "idx_refunds_idempotency_key" ON "refunds"("idempotency_key");

packages/db/migrations/meta/_journal.json

@@ -190,13 +190,6 @@
       "when": 1775568867192,
       "tag": "0026_stripe_payment",
       "breakpoints": true
-    },
-    {
-      "idx": 27,
-      "version": "7",
-      "when": 1775655267192,
-      "tag": "0027_refunds",
-      "breakpoints": true
     }
   ]
 }

packages/db/src/schema.ts

@@ -300,25 +300,6 @@ export const invoiceTipSplits = pgTable(
   (t) => [index("idx_invoice_tip_splits_invoice_id").on(t.invoiceId)]
 );
 
-// Refund records with idempotency key support
-export const refunds = pgTable(
-  "refunds",
-  {
-    id: uuid("id").primaryKey().defaultRandom(),
-    invoiceId: uuid("invoice_id")
-      .notNull()
-      .references(() => invoices.id, { onDelete: "restrict" }),
-    stripeRefundId: text("stripe_refund_id").notNull(),
-    idempotencyKey: text("idempotency_key").unique(),
-    amountCents: integer("amount_cents"),
-    createdAt: timestamp("created_at").notNull().defaultNow(),
-  },
-  (t) => [
-    index("idx_refunds_invoice_id").on(t.invoiceId),
-    index("idx_refunds_idempotency_key").on(t.idempotencyKey),
-  ]
-);
-
 // Tracks which reminder emails have been sent per appointment (prevents duplicates).
 // reminder_type values: "confirmation", "24h", "2h"
 export const reminderLogs = pgTable(

packages/db/src/seed.ts

@@ -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: profile === "uat" && i === 0 })
+    ({ id: uuid(), name: `Manager ${i + 1}`, email: `manager${i + 1}@groombook.dev`, role: "manager" as const, isSuperUser: false })
   );
   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 })