fix(GRO-1173): remove stale .github/workflows/ci.yml

The .github/workflows/ci.yml targets ghcr.io and is replaced by .gitea/workflows/ci.yml which targets git.farh.net with REGISTRY_TOKEN. Co-Authored-By: Paperclip <noreply@paperclip.ing>
fix: align types/index.ts with dev to resolve merge conflict
2026-05-21 14:27:37 +00:00 · 2026-05-21 04:32:13 +00:00 · 2026-05-21 04:32:13 +00:00 · 2026-05-21 04:31:37 +00:00
26 changed files with 54 additions and 949 deletions
@@ -25,17 +25,17 @@ jobs:

      - uses: actions/setup-node@v4
        with:
-          node-version: 22
+          node-version: 20
          cache: pnpm

      - name: Install dependencies
        run: pnpm install --frozen-lockfile

      - name: Typecheck
-        run: pnpm --filter @groombook/api typecheck
+        run: pnpm typecheck

      - name: Lint
-        run: pnpm --filter @groombook/api lint
+        run: pnpm lint

  test:
    name: Test
@@ -49,17 +49,17 @@ jobs:

      - uses: actions/setup-node@v4
        with:
-          node-version: 22
+          node-version: 20
          cache: pnpm

      - name: Install dependencies
        run: pnpm install --frozen-lockfile

      - name: Run tests
-        run: pnpm --filter @groombook/api test
+        run: pnpm test

  docker:
-    name: Build & Push Docker Images
+    name: Build & Push Docker Image
    runs-on: ubuntu-latest
    needs: [lint-typecheck, test]
    steps:
@@ -91,53 +91,9 @@ jobs:
        with:
          context: .
          file: Dockerfile
-          target: runner
          push: true
-          provenance: false
          tags: |
            git.farh.net/groombook/api:${{ steps.version.outputs.tag }}
            ${{ github.ref == 'refs/heads/main' && 'git.farh.net/groombook/api:latest' || '' }}
          cache-from: type=registry,ref=git.farh.net/groombook/cache:api
-          cache-to: type=registry,ref=git.farh.net/groombook/cache:api,mode=max
-
-      - name: Build and push Migrate image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: migrate
-          push: true
-          provenance: false
-          tags: |
-            git.farh.net/groombook/migrate:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'git.farh.net/groombook/migrate:latest' || '' }}
-          cache-from: type=registry,ref=git.farh.net/groombook/cache:migrate
-          cache-to: type=registry,ref=git.farh.net/groombook/cache:migrate,mode=max
-
-      - name: Build and push Seed image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: seed
-          push: true
-          provenance: false
-          tags: |
-            git.farh.net/groombook/seed:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'git.farh.net/groombook/seed:latest' || '' }}
-          cache-from: type=registry,ref=git.farh.net/groombook/cache:seed
-          cache-to: type=registry,ref=git.farh.net/groombook/cache:seed,mode=max
-
-      - name: Build and push Reset image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: reset
-          push: true
-          provenance: false
-          tags: |
-            git.farh.net/groombook/reset:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'git.farh.net/groombook/reset:latest' || '' }}
-          cache-from: type=registry,ref=git.farh.net/groombook/cache:reset
-          cache-to: type=registry,ref=git.farh.net/groombook/cache:reset,mode=max
+          cache-to: type=registry,ref=git.farh.net/groombook/cache:api,mode=max
@@ -1,257 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches: [main, dev]
-  pull_request:
-    branches: [main, dev]
-  workflow_dispatch:
-    inputs:
-      ref:
-        description: "Branch or ref to run CI against"
-        required: false
-        default: "main"
-
-jobs:
-  lint-typecheck:
-    name: Lint & Typecheck
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Typecheck
-        run: pnpm --filter @groombook/api typecheck
-
-      - name: Lint
-        run: pnpm --filter @groombook/api lint
-
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Run tests
-        run: pnpm --filter @groombook/api test
-
-  build:
-    name: Build
-    runs-on: ubuntu-latest
-    needs: [lint-typecheck, test]
-    steps:
-      - uses: actions/checkout@v4
-
-      - uses: pnpm/action-setup@v4
-        with:
-          version: '9.15.4'
-
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
-          cache: pnpm
-
-      - name: Install dependencies
-        run: pnpm install --frozen-lockfile
-
-      - name: Build
-        run: pnpm --filter @groombook/api build
-
-  docker:
-    name: Build & Push Docker Images
-    runs-on: ubuntu-latest
-    needs: [build]
-    outputs:
-      tag: ${{ steps.version.outputs.tag }}
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Generate image tag
-        id: version
-        run: |
-          if [ "${{ github.event_name }}" = "pull_request" ]; then
-            TAG="pr-${{ github.event.pull_request.number }}-${GITHUB_SHA::7}"
-          else
-            TAG="$(date -u +%Y.%m.%d)-${GITHUB_SHA::7}"
-          fi
-          echo "tag=$TAG" >> "$GITHUB_OUTPUT"
-          echo "Image tag: $TAG"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Log in to GitHub Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push API image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: runner
-          push: true
-          tags: |
-            ghcr.io/groombook/api:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'ghcr.io/groombook/api:latest' || '' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Build and push Migrate image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: migrate
-          push: true
-          tags: |
-            ghcr.io/groombook/migrate:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'ghcr.io/groombook/migrate:latest' || '' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Build and push Seed image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: seed
-          push: true
-          tags: |
-            ghcr.io/groombook/seed:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'ghcr.io/groombook/seed:latest' || '' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-      - name: Build and push Reset image
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          file: Dockerfile
-          target: reset
-          push: true
-          tags: |
-            ghcr.io/groombook/reset:${{ steps.version.outputs.tag }}
-            ${{ github.ref == 'refs/heads/main' && 'ghcr.io/groombook/reset:latest' || '' }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
-
-  cd:
-    name: Update Infra Image Tags
-    runs-on: ubuntu-latest
-    needs: [docker]
-    if: (github.ref == 'refs/heads/main' || github.ref == 'refs/heads/dev') && github.event_name == 'push'
-    permissions:
-      contents: write
-      pull-requests: write
-    steps:
-      - name: Generate infra repo token
-        id: infra-token
-        uses: tibdex/github-app-token@v2
-        with:
-          app_id: ${{ vars.GH_APP_ID }}
-          private_key: ${{ secrets.GH_APP_PRIVATE_KEY }}
-
-      - name: Clone groombook/infra
-        run: |
-          git clone https://x-access-token:${{ steps.infra-token.outputs.token }}@github.com/groombook/infra.git /tmp/infra
-
-      - name: Install yq
-        run: |
-          sudo wget -qO /usr/local/bin/yq https://github.com/mikefarah/yq/releases/latest/download/yq_linux_amd64
-          sudo chmod +x /usr/local/bin/yq
-
-      - name: Update dev overlay image tags
-        env:
-          TAG: ${{ needs.docker.outputs.tag }}
-          SHA: ${{ github.sha }}
-        run: |
-          if [ -z "$TAG" ]; then
-            TAG="$(date -u +%Y.%m.%d)-${SHA::7}"
-          fi
-          export SHORT_SHA="${SHA::7}"
-          echo "Updating dev overlay image tags to: $TAG"
-          echo "Updating migration/seed Job names with SHA: $SHORT_SHA"
-          cd /tmp/infra
-          DEV_KUST="apps/overlays/dev/kustomization.yaml"
-          yq -i '(.images[] | select(.name == "ghcr.io/groombook/api")).newTag = env(TAG)' "$DEV_KUST"
-          yq -i '(.images[] | select(.name == "ghcr.io/groombook/migrate")).newTag = env(TAG)' "$DEV_KUST"
-          yq -i '(.images[] | select(.name == "ghcr.io/groombook/seed")).newTag = env(TAG)' "$DEV_KUST"
-          yq -i '(.images[] | select(.name == "ghcr.io/groombook/reset")).newTag = env(TAG)' "$DEV_KUST"
-
-          MIGRATE_JOB="apps/base/migrate-job.yaml"
-          if [ -f "$MIGRATE_JOB" ]; then
-            yq -i '.metadata.name = "migrate-schema-" + env(SHORT_SHA)' "$MIGRATE_JOB"
-            yq -i '.metadata.annotations."groombook.app/deploy-version" = env(TAG)' "$MIGRATE_JOB"
-            yq -i '.spec.ttlSecondsAfterFinished = (.spec.ttlSecondsAfterFinished // 86400)' "$MIGRATE_JOB"
-          fi
-
-          SEED_JOB="apps/base/seed-job.yaml"
-          if [ -f "$SEED_JOB" ]; then
-            yq -i '.metadata.name = "seed-test-data-" + env(SHORT_SHA)' "$SEED_JOB"
-            yq -i '.metadata.annotations."groombook.app/deploy-version" = env(TAG)' "$SEED_JOB"
-            yq -i '.spec.ttlSecondsAfterFinished = (.spec.ttlSecondsAfterFinished // 86400)' "$SEED_JOB"
-          fi
-
-          git -C /tmp/infra diff --stat
-
-      - name: Create PR on groombook/infra
-        env:
-          TAG: ${{ needs.docker.outputs.tag }}
-          GH_TOKEN: ${{ steps.infra-token.outputs.token }}
-        run: |
-          if [ -z "$TAG" ]; then
-            TAG="$(date -u +%Y.%m.%d)-${GITHUB_SHA::7}"
-          fi
-
-          cd /tmp/infra
-          git config user.name "groombook-engineer[bot]"
-          git config user.email "3141748+groombook-engineer[bot]@users.noreply.github.com"
-          git checkout -b "chore/update-image-tags-${TAG}"
-          git add apps/overlays/dev/ apps/base/migrate-job.yaml apps/base/seed-job.yaml
-          git commit -m "chore: update image tags and migration/seed Job names to ${TAG}"
-
-          git push -u origin "chore/update-image-tags-${TAG}"
-
-          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
@@ -1,4 +1,4 @@
-FROM node:22-alpine AS base
+FROM node:20-alpine AS base
 RUN corepack enable && corepack prepare pnpm@9.15.4 --activate
 WORKDIR /app

@@ -14,13 +14,12 @@ FROM deps AS builder
 RUN mkdir -p /home/node/.cache/node/corepack
 COPY packages/ packages/
 COPY src/ src/
-COPY tsconfig.json ./
 RUN pnpm --filter @groombook/types build && \
    pnpm --filter @groombook/db build && \
-    pnpm build
+    pnpm --filter @groombook/api build

 # Runtime
-FROM node:22-alpine AS runner
+FROM node:20-alpine AS runner
 RUN corepack enable && corepack prepare pnpm@9.15.4 --activate
 WORKDIR /app
 ENV NODE_ENV=production
@@ -42,12 +41,12 @@ CMD ["node", "dist/index.js"]

 # Migrate stage — runs drizzle-kit migrate against the database
 FROM builder AS migrate
-CMD ["pnpm", "--filter", "@groombook/db", "migrate"]
+CMD ["pnpm", "db:migrate"]

 # Seed stage — populates the database with test data
 FROM builder AS seed
-CMD ["pnpm", "--filter", "@groombook/db", "seed"]
+CMD ["pnpm", "db:seed"]

 # Reset stage — drops all tables, re-runs migrations, and re-seeds
 FROM builder AS reset
-CMD ["pnpm", "--filter", "@groombook/db", "reset"]
+CMD ["pnpm", "db:reset"]
@@ -26,19 +26,14 @@ GroomBook API is a Hono-based REST service (TypeScript/Node.js) powering the pet
 | # | Scenario | Steps | Expected |
 |---|----------|-------|----------|
 | TC-API-1.1 | Login via OIDC | POST to OIDC provider callback, verify JWT token issued | 200 OK, JWT returned with valid claims |
+| TC-API-1.2 | Session persistence | Make authenticated request, verify session token valid | 200 OK, request succeeds |
+| TC-API-1.3 | Logout | Call logout endpoint, verify token invalidated | 200 OK, subsequent requests return 401 |
 | TC-API-1.4 | Email+password login (UAT) | POST /api/auth/sign-in/email with uat-super@groombook.dev + SEED_UAT_SUPER_PASSWORD | 200 OK, session cookie returned |
 | TC-API-1.5 | Email+password login — groomer | POST /api/auth/sign-in/email with uat-groomer@groombook.dev + SEED_UAT_GROOMER_PASSWORD | 200 OK, session cookie returned |
 | TC-API-1.6 | Email+password login — customer | POST /api/auth/sign-in/email with uat-customer@groombook.dev + SEED_UAT_CUSTOMER_PASSWORD | 200 OK, session cookie returned |
 | TC-API-1.7 | Email+password login — tester | POST /api/auth/sign-in/email with uat-tester@groombook.dev + SEED_UAT_TESTER_PASSWORD | 200 OK, session cookie returned |
 | TC-API-1.8 | Email+password — invalid password | POST /api/auth/sign-in/email with wrong password | 400 Bad Request, error returned |
 | TC-API-1.9 | Email+password — unknown user | POST /api/auth/sign-in/email with non-existent email | 400 Bad Request, error returned |
-| TC-API-1.10 | Auto-provision on first OIDC login | First login as a Better-Auth user with no existing staff record | 200 OK, access granted; groomer staff record auto-created with name/email from user table |
-| TC-API-1.11 | Existing staff unaffected by OIDC login | Login as uat-groomer@groombook.dev (email+password), then GET /api/staff to find that record | 200 OK, staff record unchanged — no duplicate created, original role and isSuperUser preserved |
-| TC-API-1.12 | Auto-provisioned role and superUser flags | After TC-API-1.10, GET /api/staff and inspect the auto-created record | role = "groomer", isSuperUser = false, active = true |
-| TC-API-1.13 | Name fallback — user.name present | Auto-provision where Better-Auth user has name set | Staff name = user.name value from user table |
-| TC-API-1.14 | Name fallback — no name, email present | Auto-provision where Better-Auth user has name = null, email = "test@example.com" | Staff name = "test" (email prefix before @) |
-| TC-API-1.15 | Name fallback — no name, no email | Auto-provision where Better-Auth user has name = null, email = null | Staff name = "Unknown" |
-| TC-API-1.16 | OIDC login — Terraform-provisioned user | Initiate OIDC login as any UAT persona (uat-super, uat-groomer, uat-customer, uat-tester), complete authentik callback | 200 OK, session created — no account_not_linked error |

 ### 4.2 Client Management

@@ -196,18 +191,6 @@ GroomBook API is a Hono-based REST service (TypeScript/Node.js) powering the pet
 | TC-API-14.4 | Update group notes | PATCH /api/appointment-groups/{id} with notes | 200 OK, notes updated |
 | TC-API-14.5 | Cancel group | DELETE /api/appointment-groups/{id} | 200 OK, all appointments cancelled |

-### 4.15 Buffer Rules
-
-| # | Scenario | Steps | Expected |
-|---|----------|-------|----------|
-| TC-API-15.1 | List buffer rules | GET /api/admin/buffer-rules | 200 OK, list of active buffer rules returned |
-| TC-API-15.2 | Create buffer rule | POST /api/admin/buffer-rules with service, species, sizeCategory, bufferMinutes | 201 Created, buffer rule created |
-| TC-API-15.3 | Update buffer rule | PATCH /api/admin/buffer-rules/{id} with updated bufferMinutes | 200 OK, buffer rule updated |
-| TC-API-15.4 | Delete buffer rule | DELETE /api/admin/buffer-rules/{id} | 200 OK, buffer rule removed |
-| TC-API-15.5 | Reject invalid bufferMinutes | POST /api/admin/buffer-rules with bufferMinutes: -5 | 400 Bad Request, invalid bufferMinutes rejected |
-| TC-API-15.6 | Reject missing required fields | POST /api/admin/buffer-rules with service only | 400 Bad Request, species and sizeCategory required |
-| TC-API-15.7 | Booking uses buffer | Book appointment for pet with sizeCategory; verify duration reflects buffer | 201 Created, appointment duration includes buffer time |
-
 ## Pass/Fail Criteria

 **Pass:**
@@ -2,7 +2,6 @@ import { describe, it, expect, vi, beforeEach } from "vitest";
 import { Hono } from "hono";
 import type { AppEnv, StaffRow } from "../middleware/rbac.js";
 import { petsRouter } from "../routes/pets.js";
-import { and, eq, exists, or } from "../db/index.js";

 // ─── Mock staff fixtures ──────────────────────────────────────────────────────

@@ -22,8 +21,8 @@ const MANAGER: StaffRow = {

 // ─── Mutable mock state ───────────────────────────────────────────────────────

-const CLIENT_ID = "a0000000-0000-4000-8000-000000000001";
-const PET_ID = "b0000000-0000-4000-8000-000000000002";
+const CLIENT_ID = "client-uuid-extended";
+const PET_ID = "pet-uuid-extended";

 let petRows: Record<string, unknown>[] = [];
 let appointmentRows: Record<string, unknown>[] = [];
@@ -135,7 +134,7 @@ function makeDeleteChainable(): unknown {
      }
      if (prop === "returning") {
        return () => {
-          const row = petRows[0]!;
+          const row = petRows[0];
          deletedId = row.id as string;
          return [row];
        };
@@ -165,10 +164,10 @@ vi.mock("../db", async (importOriginal) => {
    }),
    pets,
    appointments,
-    and: vi.fn(),
-    eq: vi.fn(),
-    exists: vi.fn(),
-    or: vi.fn(),
+    and: db.and,
+    eq: db.eq,
+    exists: db.exists,
+    or: db.or,
  };
 });

@@ -67,11 +67,6 @@ vi.mock("../db", () => {
    { get: (t, p) => (p === "_name" ? "impersonationSessions" : { table: "impersonationSessions", column: p }) }
  );

-  const impersonationAuditLogs = new Proxy(
-    { _name: "impersonationAuditLogs" },
-    { get: (t, p) => (p === "_name" ? "impersonationAuditLogs" : { table: "impersonationAuditLogs", column: p }) }
-  );
-
  const appointments = new Proxy(
    { _name: "appointments" },
    { get: (t, p) => (p === "_name" ? "appointments" : { table: "appointments", column: p }) }
@@ -104,12 +99,8 @@ vi.mock("../db", () => {
          }),
        }),
      }),
-      insert: () => ({
-        values: () => ({ returning: () => [{}] }),
-      }),
    }),
    impersonationSessions,
-    impersonationAuditLogs,
    appointments,
    eq: vi.fn(),
    and: vi.fn(),
@@ -45,76 +45,40 @@ const GROOMER: StaffRow = {

 let staffLookupResult: StaffRow | null = null;
 let managerFallbackResult: StaffRow | null = MANAGER;
-let userLookupResult: { id: string; name: string | null; email: string | null } | null = null;
-let _insertedStaff: StaffRow | null = null;

 vi.mock("../db", () => {
-  const makeTableProxy = (name: string) =>
-    new Proxy(
-      { _name: name },
-      {
-        get(target, prop) {
-          if (prop === "_name") return name;
-          if (prop === "$inferSelect") return {};
-          return { table: name, column: prop };
-        },
-      }
-    );
-
-  const staff = makeTableProxy("staff");
-  const user = makeTableProxy("user");
-
-  const buildQuery = (result: unknown, fallback: unknown) => ({
-    [Symbol.iterator]: function* () {
-      if (result) yield result;
-    },
-    limit: (_n: number) => {
-      const item = result ?? fallback;
-      return {
-        [Symbol.iterator]: function* () { if (item) yield item; },
-        0: item,
-        length: item ? 1 : 0,
-      };
-    },
-  });
+  const staff = new Proxy(
+    { _name: "staff" },
+    {
+      get(target, prop) {
+        if (prop === "_name") return "staff";
+        if (prop === "$inferSelect") return {};
+        return { table: "staff", column: prop };
+      },
+    }
+  );

  return {
    getDb: () => ({
      select: () => ({
-        from: (table: unknown) => ({
-          where: () => buildQuery(
-            table === staff ? staffLookupResult : userLookupResult,
-            table === staff ? managerFallbackResult : null
-          ),
-        }),
-      }),
-      insert: (_table: unknown) => ({
-        values: (vals: Record<string, unknown>) => ({
-          returning: () => {
-            const newStaff: StaffRow = {
-              id: "new-staff-id",
-              oidcSub: null,
-              userId: vals.userId as string,
-              role: vals.role as StaffRow["role"],
-              isSuperUser: false,
-              name: vals.name as string,
-              email: vals.email as string,
-              active: true,
-              icalToken: null,
-              createdAt: new Date(),
-              updatedAt: new Date(),
-            };
-            _insertedStaff = newStaff;
-            return [newStaff];
-          },
+        from: () => ({
+          where: () => ({
+            limit: () => {
+              // dev mode fallback to first manager
+              return managerFallbackResult ? [managerFallbackResult] : [];
+            },
+            [Symbol.iterator]: function* () {
+              if (staffLookupResult) yield staffLookupResult;
+            },
+            0: staffLookupResult,
+            length: staffLookupResult ? 1 : 0,
+          }),
        }),
      }),
    }),
    staff,
-    user,
    eq: vi.fn((_col: unknown, _val: unknown) => ({ col: _col, val: _val })),
    and: vi.fn((..._clauses: unknown[]) => ({})),
-    sql: vi.fn((..._args: unknown[]) => ({})),
  };
 });

@@ -123,8 +87,6 @@ vi.mock("../db", () => {
 function resetMocks() {
  staffLookupResult = null;
  managerFallbackResult = MANAGER;
-  userLookupResult = null;
-  _insertedStaff = null;
 }

 /** Build a minimal Hono app with jwtPayload pre-set, then apply a middleware. */
@@ -134,10 +96,7 @@ function buildApp(
 ) {
  const app = new Hono<AppEnv>();
  app.use("*", async (c, next) => {
-    c.set("jwtPayload", {
-      sub: userLookupResult?.id ?? staffLookupResult?.userId ?? "unknown-sub",
-      email: userLookupResult?.email,
-    });
+    c.set("jwtPayload", { sub: staffLookupResult?.userId ?? "unknown-sub" });
    await next();
  });
  app.use("*", middleware);
@@ -243,50 +202,6 @@ describe("resolveStaffMiddleware", () => {
    const body = await res.json();
    expect(body.error).toMatch(/no staff records found/i);
  });
-
-  it("auto-provision: creates groomer staff record on first login when Better-Auth user exists", async () => {
-    staffLookupResult = null;
-    userLookupResult = { id: "ba-user-new", name: "New User", email: "newuser@example.com" };
-    let capturedStaff: StaffRow | null = null;
-    const app = buildApp(resolveStaffMiddleware, (c) => {
-      capturedStaff = c.get("staff");
-      return c.json({ ok: true });
-    });
-
-    const res = await app.request("/test");
-    expect(res.status).toBe(200);
-    expect(capturedStaff).not.toBeNull();
-    expect(capturedStaff!.role).toBe("groomer");
-    expect(capturedStaff!.userId).toBe("ba-user-new");
-    expect(capturedStaff!.name).toBe("New User");
-    expect(capturedStaff!.email).toBe("newuser@example.com");
-    expect(capturedStaff!.isSuperUser).toBe(false);
-  });
-
-  it("auto-provision: falls back to email prefix when user has no name", async () => {
-    staffLookupResult = null;
-    userLookupResult = { id: "ba-user-noname", name: null, email: "firstlogin@example.com" };
-    let capturedStaff: StaffRow | null = null;
-    const app = buildApp(resolveStaffMiddleware, (c) => {
-      capturedStaff = c.get("staff");
-      return c.json({ ok: true });
-    });
-
-    const res = await app.request("/test");
-    expect(res.status).toBe(200);
-    expect(capturedStaff!.name).toBe("firstlogin");
-  });
-
-  it("auto-provision: returns 403 when no staff record and no Better-Auth user exists", async () => {
-    staffLookupResult = null;
-    userLookupResult = null;
-    const app = buildApp(resolveStaffMiddleware);
-
-    const res = await app.request("/test");
-    expect(res.status).toBe(403);
-    const body = await res.json();
-    expect(body.error).toMatch(/no staff record found for authenticated user/i);
-  });
 });

 // ─── requireRole tests ────────────────────────────────────────────────────────
@@ -26,7 +26,6 @@ import { getDb, businessSettings, eq, staff } from "./db/index.js";
 import { authMiddleware } from "./middleware/auth.js";
 import { resolveStaffMiddleware, requireRole, requireRoleOrSuperUser, requireSuperUser } from "./middleware/rbac.js";
 import { devRouter } from "./routes/dev.js";
-import { bufferRulesRouter } from "./routes/buffer-rules.js";
 import { adminSeedRouter } from "./routes/admin/seed.js";
 import { startReminderScheduler } from "./services/reminders.js";
 import { webhooksRouter } from "./routes/stripe-webhooks.js";
@@ -212,7 +211,6 @@ api.on(["GET"], "/staff/*", requireRole("manager", "receptionist", "groomer"));
 // Staff write routes: manager OR super-user (combined guard — avoids AND stacking)
 api.on(["POST", "PATCH", "DELETE"], "/staff/*", requireRoleOrSuperUser("manager"));
 api.use("/admin/*", requireRoleOrSuperUser("manager"));
-api.use("/buffer-rules/*", requireRole("manager"));
 api.use("/admin/settings/*", requireSuperUser());
 api.use("/reports/*", requireRole("manager"));
 api.use("/invoices/*", requireRole("manager", "groomer"));
@@ -270,7 +268,6 @@ api.route("/impersonation", impersonationRouter);
 api.route("/admin/settings", settingsRouter);
 api.route("/admin/auth-provider", authProviderRouter);
 api.route("/admin/seed", adminSeedRouter);
-api.route("/buffer-rules", bufferRulesRouter);
 api.route("/search", searchRouter);

 const port = Number(process.env.PORT ?? 3000);
@@ -1,5 +1,5 @@
 import type { MiddlewareHandler } from "hono";
-import { and, eq, getDb, sql, staff, user } from "../db/index.js";
+import { and, eq, getDb, sql, staff } from "../db/index.js";

 export type StaffRole = "groomer" | "receptionist" | "manager";
 export type StaffRow = typeof staff.$inferSelect;
@@ -110,33 +110,6 @@ export const resolveStaffMiddleware: MiddlewareHandler<AppEnv> = async (
      return;
    }
  }
-  // Auto-provision: no staff record exists for this user at all, but a valid
-  // Better-Auth user session exists (jwt.sub = user.id from user table).
-  // Create a minimal groomer staff record on first login.
-  const [userRow] = await db
-    .select({ id: user.id, name: user.name, email: user.email })
-    .from(user)
-    .where(eq(user.id, jwt.sub))
-    .limit(1);
-  if (userRow) {
-    const [newStaff] = await db
-      .insert(staff)
-      .values({
-        name: userRow.name ?? jwt.email?.split("@")[0] ?? "Unknown",
-        email: userRow.email ?? jwt.email ?? "",
-        userId: jwt.sub,
-        role: "groomer",
-        isSuperUser: false,
-        active: true,
-      })
-      .returning();
-    if (!newStaff) {
-      return c.json({ error: "Internal error: staff record creation failed" }, 500);
-    }
-    c.set("staff", newStaff);
-    await next();
-    return;
-  }
  return c.json(
    { error: "Forbidden: no staff record found for authenticated user" },
    403
@@ -1,124 +0,0 @@
-import { Hono } from "hono";
-import { zValidator } from "@hono/zod-validator";
-import { z } from "zod/v3";
-import { and, eq, getDb, isNull } from "../db/index.js";
-import type { AppEnv } from "../middleware/rbac.js";
-import { bufferRules, services } from "../db/index.js";
-
-export const bufferRulesRouter = new Hono<AppEnv>();
-
-const createBufferRuleSchema = z.object({
-  serviceId: z.string().uuid(),
-  sizeCategory: z
-    .enum(["small", "medium", "large", "extra_large"])
-    .optional(),
-  coatType: z
-    .enum(["short", "medium", "long", "double", "wire", "silky", "curly", "hairless"])
-    .optional(),
-  bufferMinutes: z.number().int().positive(),
-});
-
-const updateBufferRuleSchema = z.object({
-  bufferMinutes: z.number().int().positive(),
-});
-
-// GET / — list all buffer rules, optionally filtered by serviceId
-bufferRulesRouter.get("/", async (c) => {
-  const db = getDb();
-  const serviceId = c.req.query("serviceId");
-
-  const conditions = [];
-  if (serviceId) conditions.push(eq(bufferRules.serviceId, serviceId));
-
-  const rows = await db
-    .select({
-      id: bufferRules.id,
-      serviceId: bufferRules.serviceId,
-      sizeCategory: bufferRules.sizeCategory,
-      coatType: bufferRules.coatType,
-      bufferMinutes: bufferRules.bufferMinutes,
-      createdAt: bufferRules.createdAt,
-      updatedAt: bufferRules.updatedAt,
-      serviceName: services.name,
-    })
-    .from(bufferRules)
-    .innerJoin(services, eq(bufferRules.serviceId, services.id))
-    .where(conditions.length > 0 ? and(...conditions) : undefined)
-    .orderBy(bufferRules.createdAt);
-
-  return c.json(rows);
-});
-
-// POST / — create a buffer rule
-bufferRulesRouter.post(
-  "/",
-  zValidator("json", createBufferRuleSchema),
-  async (c) => {
-    const db = getDb();
-    const body = c.req.valid("json");
-
-    // Validate serviceId exists
-    const [svc] = await db
-      .select({ id: services.id })
-      .from(services)
-      .where(eq(services.id, body.serviceId));
-    if (!svc) return c.json({ error: "Service not found" }, 404);
-
-    // Check for duplicate (service + size + coat)
-    const [existing] = await db
-      .select({ id: bufferRules.id })
-      .from(bufferRules)
-      .where(
-        and(
-          eq(bufferRules.serviceId, body.serviceId),
-          body.sizeCategory !== undefined
-            ? eq(bufferRules.sizeCategory, body.sizeCategory)
-            : isNull(bufferRules.sizeCategory),
-          body.coatType !== undefined
-            ? eq(bufferRules.coatType, body.coatType)
-            : isNull(bufferRules.coatType)
-        )
-      );
-    if (existing) return c.json({ error: "Duplicate rule for this service+size+coat combination" }, 409);
-
-    const [row] = await db
-      .insert(bufferRules)
-      .values({
-        serviceId: body.serviceId,
-        sizeCategory: body.sizeCategory ?? null,
-        coatType: body.coatType ?? null,
-        bufferMinutes: body.bufferMinutes,
-      })
-      .returning();
-
-    return c.json(row, 201);
-  }
-);
-
-// PATCH /:id — update bufferMinutes only
-bufferRulesRouter.patch(
-  "/:id",
-  zValidator("json", updateBufferRuleSchema),
-  async (c) => {
-    const db = getDb();
-    const body = c.req.valid("json");
-    const [row] = await db
-      .update(bufferRules)
-      .set({ bufferMinutes: body.bufferMinutes, updatedAt: new Date() })
-      .where(eq(bufferRules.id, c.req.param("id")))
-      .returning();
-    if (!row) return c.json({ error: "Not found" }, 404);
-    return c.json(row);
-  }
-);
-
-// DELETE /:id — delete a buffer rule
-bufferRulesRouter.delete("/:id", async (c) => {
-  const db = getDb();
-  const [row] = await db
-    .delete(bufferRules)
-    .where(eq(bufferRules.id, c.req.param("id")))
-    .returning();
-  if (!row) return c.json({ error: "Not found" }, 404);
-  return c.json({ ok: true });
-});
@@ -24,7 +24,6 @@ const createPetSchema = z.object({
  shampooPreference: z.string().max(500).optional(),
  specialCareNotes: z.string().max(2000).optional(),
  customFields: z.record(z.string(), z.string()).optional(),
-  sizeCategory: z.enum(["small", "medium", "large", "extra_large"]).optional(),
  coatType: z.enum(["short", "medium", "long", "double", "wire", "silky", "curly", "hairless"]).optional(),
  temperamentScore: z.number().int().min(1).max(5).optional(),
  temperamentFlags: z.array(z.string().max(100)).max(20).optional(),
@@ -13,9 +13,7 @@ const createServiceSchema = z.object({
  active: z.boolean().default(true),
 });

-const updateServiceSchema = createServiceSchema.partial().extend({
-  defaultBufferMinutes: z.number().int().min(0).optional(),
-});
+const updateServiceSchema = createServiceSchema.partial();

 servicesRouter.get("/", async (c) => {
  const db = getDb();
@@ -26,19 +26,6 @@ export interface Client {
  updatedAt: string;
 }

-// ─── Medical Alerts ────────────────────────────────────────────────────────────
-
-export type AlertSeverity = "low" | "medium" | "high";
-
-export interface MedicalAlert {
-  type: string;
-  description: string;
-  severity: AlertSeverity;
-}
-
-// ─── Pet Profile Summary ────────────────────────────────────────────────────
-
-export type CoatType = "short" | "medium" | "long" | "double" | "wire" | "silky" | "curly" | "hairless";
 export interface Pet {
  id: string;
  clientId: string;
@@ -3,7 +3,6 @@
  "version": "0.0.1",
  "private": true,
  "type": "module",
-  "packageManager": "pnpm@9.15.4",
  "scripts": {
    "dev": "tsx watch src/index.ts",
    "build": "tsc --project .",
@@ -1,31 +0,0 @@
-- Migration: 0031_buffer_rules.sql
-- Buffer rules CRUD: pet size/coat enums, bufferRules table, services.defaultBufferMinutes
-
-- ─── Enums ───────────────────────────────────────────────────────────────────
-
-CREATE TYPE "pet_size_category" AS ENUM ('small', 'medium', 'large', 'xlarge');
-CREATE TYPE "coat_type" AS ENUM ('smooth', 'double', 'wire', 'curly', 'long', 'hairless');
-
-- ─── Alter pets columns to use new enums ─────────────────────────────────────
-
-ALTER TABLE "pets" ALTER COLUMN "coat_type" TYPE "coat_type" USING "coat_type"::text::"coat_type";
-ALTER TABLE "pets" ALTER COLUMN "pet_size_category" TYPE "pet_size_category" USING "pet_size_category"::text::"pet_size_category";
-
-- ─── Services: add defaultBufferMinutes ───────────────────────────────────────
-
-ALTER TABLE "services" ADD COLUMN "default_buffer_minutes" integer;
-
-- ─── Buffer Rules table ───────────────────────────────────────────────────────
-
-CREATE TABLE "buffer_rules" (
-  "id" uuid PRIMARY KEY DEFAULT gen_random_uuid(),
-  "service_id" uuid NOT NULL REFERENCES "services"("id") ON DELETE CASCADE,
-  "size_category" "pet_size_category",
-  "coat_type" "coat_type",
-  "buffer_minutes" integer NOT NULL,
-  "created_at" timestamp NOT NULL DEFAULT now(),
-  "updated_at" timestamp NOT NULL DEFAULT now(),
-  CONSTRAINT "uq_buffer_rules_service_size_coat" UNIQUE ("service_id", "size_category", "coat_type")
-);
-
-CREATE INDEX "idx_buffer_rules_service_id" ON "buffer_rules"("service_id");
@@ -25,7 +25,6 @@
    "typecheck": "tsc --noEmit"
  },
  "dependencies": {
-    "better-auth": "^1.5.6",
    "drizzle-orm": "^0.38.4",
    "postgres": "^3.4.5"
  },
@@ -119,7 +119,6 @@ export function buildService(overrides: Partial<ServiceRow> = {}): ServiceRow {
    description: "A grooming service",
    basePriceCents: 6500,
    durationMinutes: 60,
-    defaultBufferMinutes: 0,
    active: true,
    createdAt: new Date("2025-01-01T00:00:00Z"),
    updatedAt: new Date("2025-01-01T00:00:00Z"),
@@ -100,26 +100,6 @@ export const verification = pgTable("verification", {
  updatedAt: timestamp("updated_at").notNull().defaultNow(),
 });

-// ─── Pet enums ─────────────────────────────────────────────────────────────────
-
-export const petSizeCategoryEnum = pgEnum("pet_size_category", [
-  "small",
-  "medium",
-  "large",
-  "extra_large",
-]);
-
-export const coatTypeEnum = pgEnum("coat_type", [
-  "short",
-  "medium",
-  "long",
-  "double",
-  "wire",
-  "silky",
-  "curly",
-  "hairless",
-]);
-
 // ─── Tables ───────────────────────────────────────────────────────────────────

 export const clients = pgTable(
@@ -162,8 +142,8 @@ export const pets = pgTable(
    cutStyle: text("cut_style"),
    shampooPreference: text("shampoo_preference"),
    specialCareNotes: text("special_care_notes"),
-    coatType: coatTypeEnum("coat_type"),
-    petSizeCategory: petSizeCategoryEnum("pet_size_category"),
+    coatType: text("coat_type"),
+    petSizeCategory: text("pet_size_category"),
    customFields: jsonb("custom_fields").$type<Record<string, string>>().notNull().default({}),
    photoKey: text("photo_key"),
    photoUploadedAt: timestamp("photo_uploaded_at"),
@@ -181,7 +161,6 @@ export const services = pgTable("services", {
  basePriceCents: integer("base_price_cents").notNull(),
  durationMinutes: integer("duration_minutes").notNull(),
  active: boolean("active").notNull().default(true),
-  defaultBufferMinutes: integer("default_buffer_minutes").notNull().default(0),
  createdAt: timestamp("created_at").notNull().defaultNow(),
  updatedAt: timestamp("updated_at").notNull().defaultNow(),
 });
@@ -622,34 +601,3 @@ export const authProviderConfig = pgTable("auth_provider_config", {
  createdAt: timestamp("created_at").notNull().defaultNow(),
  updatedAt: timestamp("updated_at").notNull().defaultNow(),
 });
-
-// ─── Buffer Rules ─────────────────────────────────────────────────────────────
-
-// Buffer time rules per service + pet size/coat combination.
-// Covers service-level defaults and pet-specific overrides.
-export const bufferRules = pgTable(
-  "buffer_rules",
-  {
-    id: uuid("id").primaryKey().defaultRandom(),
-    serviceId: uuid("service_id")
-      .notNull()
-      .references(() => services.id, { onDelete: "cascade" }),
-    // null sizeCategory means "any size" (wildcard)
-    sizeCategory: petSizeCategoryEnum("size_category"),
-    // null coatType means "any coat type" (wildcard)
-    coatType: coatTypeEnum("coat_type"),
-    // minutes to add to the service duration for this size/coat combo
-    bufferMinutes: integer("buffer_minutes").notNull(),
-    createdAt: timestamp("created_at").notNull().defaultNow(),
-    updatedAt: timestamp("updated_at").notNull().defaultNow(),
-  },
-  (t) => [
-    // One rule per unique (service, size, coat) combination
-    unique("uq_buffer_rules_service_size_coat").on(
-      t.serviceId,
-      t.sizeCategory,
-      t.coatType
-    ),
-    index("idx_buffer_rules_service_id").on(t.serviceId),
-  ]
-);
@@ -18,7 +18,7 @@

 import postgres from "postgres";
 import { drizzle } from "drizzle-orm/postgres-js";
-import { eq, and, sql } from "drizzle-orm";
+import { eq, sql } from "drizzle-orm";
 import * as schema from "./schema.js";

 // ── Seed profile configuration ─────────────────────────────────────────────
@@ -490,90 +490,6 @@ async function seedKnownUsers() {
    }
  }

-  // ── Better-Auth email+password credentials for UAT accounts ──────────────────
-  // Provisions Better-Auth user + account records so UAT testers can log in
-  // via email+password (POST /api/auth/sign-in/email) instead of Authentik SSO.
-  const uatPasswordAccounts = [
-    { email: "uat-super@groombook.dev", name: "UAT Super User", passwordEnv: "SEED_UAT_SUPER_PASSWORD", staffEmail: "uat-super@groombook.dev" },
-    { email: "uat-groomer@groombook.dev", name: "UAT Staff Groomer", passwordEnv: "SEED_UAT_GROOMER_PASSWORD", staffEmail: "uat-groomer@groombook.dev" },
-    { email: "uat-customer@groombook.dev", name: "UAT Customer", passwordEnv: "SEED_UAT_CUSTOMER_PASSWORD", staffEmail: null },
-    { email: "uat-tester@groombook.dev", name: "UAT Tester", passwordEnv: "SEED_UAT_TESTER_PASSWORD", staffEmail: "uat-tester@groombook.dev" },
-  ];
-
-  for (const acct of uatPasswordAccounts) {
-    const password = process.env[acct.passwordEnv];
-    if (!password) {
-      console.warn(`⚠ Skipping ${acct.email} — ${acct.passwordEnv} not set`);
-      continue;
-    }
-
-    // 1. Find or create the Better-Auth user
-    const [existingUser] = await db
-      .select()
-      .from(schema.user)
-      .where(eq(schema.user.email, acct.email))
-      .limit(1);
-
-    let userId: string;
-    if (existingUser) {
-      userId = existingUser.id;
-      console.log(`✓ Better-Auth user '${acct.name}' already exists — skipping user creation`);
-    } else {
-      userId = uuid();
-      await db.insert(schema.user).values({
-        id: userId,
-        name: acct.name,
-        email: acct.email,
-        emailVerified: true,
-      });
-      console.log(`✓ Created Better-Auth user '${acct.name}' (${acct.email})`);
-    }
-
-    // 2. Check if credential account already exists
-    const [existingAccount] = await db
-      .select()
-      .from(schema.account)
-      .where(and(
-        eq(schema.account.userId, userId),
-        eq(schema.account.providerId, "credential")
-      ))
-      .limit(1);
-
-    if (existingAccount) {
-      console.log(`✓ Credential account for '${acct.email}' already exists — skipping`);
-    } else {
-      // Use Better-Auth's own hashPassword so the hash format matches what
-      // better-auth validates at sign-in time.
-      // better-auth/crypto uses: N=16384, r=16, p=1, dkLen=64.
-      const { hashPassword } = await import("better-auth/crypto");
-      const passwordHash = await hashPassword(password);
-
-      await db.insert(schema.account).values({
-        id: uuid(),
-        accountId: userId,
-        providerId: "credential",
-        userId,
-        password: passwordHash,
-      });
-      console.log(`✓ Created credential account for '${acct.email}'`);
-    }
-
-    // 3. Link staff record to Better-Auth user (for accounts that have staff records)
-    if (acct.staffEmail) {
-      const [existingStaff] = await db
-        .select()
-        .from(schema.staff)
-        .where(eq(schema.staff.email, acct.staffEmail))
-        .limit(1);
-      if (existingStaff && !existingStaff.userId) {
-        await db.update(schema.staff)
-          .set({ userId })
-          .where(eq(schema.staff.id, existingStaff.id));
-        console.log(`✓ Linked staff '${acct.staffEmail}' → Better-Auth user`);
-      }
-    }
-  }
-
  // ── Services: idempotent upsert using name as unique key ─────────────────────
  // UNIQUE constraint on services.name (migration 0020) must exist first.
  // Uses b0000001-... IDs to match main seed servicesDef for same-named services.
@@ -28,7 +28,7 @@ importers:
        version: 0.7.6(hono@4.12.18)(zod@4.4.3)
      better-auth:
        specifier: ^1.5.6
-        version: 1.6.10(drizzle-kit@0.30.6)(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0))
+        version: 1.6.10(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0))
      drizzle-orm:
        specifier: ^0.38.4
        version: 0.38.4(kysely@0.28.17)(postgres@3.4.9)
@@ -84,9 +84,6 @@ importers:

  packages/db:
    dependencies:
-      better-auth:
-        specifier: ^1.5.6
-        version: 1.6.10(drizzle-kit@0.30.6)(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0))
      drizzle-orm:
        specifier: ^0.38.4
        version: 0.38.4(kysely@0.28.17)(postgres@3.4.9)
@@ -3930,7 +3927,7 @@ snapshots:

  balanced-match@4.0.4: {}

-  better-auth@1.6.10(drizzle-kit@0.30.6)(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0)):
+  better-auth@1.6.10(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))(vitest@3.2.4(@types/node@22.19.18)(tsx@4.21.0)):
    dependencies:
      '@better-auth/core': 1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0)
      '@better-auth/drizzle-adapter': 1.6.10(@better-auth/core@1.6.10(@better-auth/utils@0.4.0)(@better-fetch/fetch@1.1.21)(better-call@1.3.5(zod@4.4.3))(jose@6.2.3)(kysely@0.28.17)(nanostores@1.3.0))(@better-auth/utils@0.4.0)(drizzle-orm@0.38.4(kysely@0.28.17)(postgres@3.4.9))
@@ -3950,7 +3947,6 @@ snapshots:
      nanostores: 1.3.0
      zod: 4.4.3
    optionalDependencies:
-      drizzle-kit: 0.30.6
      drizzle-orm: 0.38.4(kysely@0.28.17)(postgres@3.4.9)
      vitest: 3.2.4(@types/node@22.19.18)(tsx@4.21.0)
    transitivePeerDependencies:
@@ -19,7 +19,6 @@ import { impersonationRouter } from "./routes/impersonation.js";
 import { settingsRouter } from "./routes/settings.js";
 import { authProviderRouter } from "./routes/authProvider.js";
 import { searchRouter } from "./routes/search.js";
-import { bufferRulesRouter } from "./routes/buffer-rules.js";
 import { getObject } from "./lib/s3.js";
 import { calendarRouter } from "./routes/calendar.js";
 import { setupRouter } from "./routes/setup.js";
@@ -270,7 +269,6 @@ api.route("/admin/settings", settingsRouter);
 api.route("/admin/auth-provider", authProviderRouter);
 api.route("/admin/seed", adminSeedRouter);
 api.route("/search", searchRouter);
-api.route("/buffer-rules", bufferRulesRouter);

 const port = Number(process.env.PORT ?? 3000);
 await initAuth();
@@ -251,10 +251,6 @@ export async function initAuth(): Promise<void> {
        },
      },
      account: {
-        accountLinking: {
-          enabled: true,
-          trustedProviders: ["authentik"],
-        },
        storeStateStrategy: "cookie" as const,
      },
      emailAndPassword: {
@@ -193,8 +193,8 @@ bookRouter.post(
        name: body.petName,
        species: body.petSpecies,
        breed: body.petBreed ?? null,
-        coatType: (body.petCoatType ?? null) as "short" | "medium" | "long" | "double" | "wire" | "silky" | "curly" | "hairless" | null,
-        petSizeCategory: (body.petSizeCategory ?? null) as "small" | "medium" | "large" | "extra_large" | null,
+        coatType: body.petCoatType ?? null,
+        petSizeCategory: body.petSizeCategory ?? null,
      })
      .returning();
    const pet = petInserted[0];
@@ -1,128 +0,0 @@
-import { Hono } from "hono";
-import { zValidator } from "@hono/zod-validator";
-import { z } from "zod/v3";
-import {
-  and,
-  eq,
-  isNull,
-  getDb,
-  bufferRules,
-  services,
-} from "@groombook/db";
-import type { AppEnv } from "../middleware/rbac.js";
-import { requireRole } from "../middleware/rbac.js";
-
-export const bufferRulesRouter = new Hono<AppEnv>();
-
-// Apply manager role guard to all routes
-bufferRulesRouter.use("*", requireRole("manager"));
-
-const createBufferRuleSchema = z.object({
-  serviceId: z.string().uuid(),
-  sizeCategory: z.enum(["small", "medium", "large", "extra_large"]).optional(),
-  coatType: z.enum(["short", "medium", "long", "double", "wire", "silky", "curly", "hairless"]).optional(),
-  bufferMinutes: z.number().int().positive(),
-});
-
-const updateBufferRuleSchema = z.object({
-  bufferMinutes: z.number().int().positive(),
-});
-
-bufferRulesRouter.get("/", async (c) => {
-  const db = getDb();
-  const serviceId = c.req.query("serviceId");
-
-  const conditions = [];
-  if (serviceId) conditions.push(eq(bufferRules.serviceId, serviceId));
-
-  const rows = await db
-    .select({
-      id: bufferRules.id,
-      serviceId: bufferRules.serviceId,
-      serviceName: services.name,
-      sizeCategory: bufferRules.sizeCategory,
-      coatType: bufferRules.coatType,
-      bufferMinutes: bufferRules.bufferMinutes,
-      createdAt: bufferRules.createdAt,
-      updatedAt: bufferRules.updatedAt,
-    })
-    .from(bufferRules)
-    .leftJoin(services, eq(bufferRules.serviceId, services.id))
-    .where(conditions.length > 0 ? and(...conditions) : undefined);
-
-  return c.json(rows);
-});
-
-bufferRulesRouter.post(
-  "/",
-  zValidator("json", createBufferRuleSchema),
-  async (c) => {
-    const db = getDb();
-    const body = c.req.valid("json");
-
-    // Validate serviceId exists
-    const [svc] = await db
-      .select({ id: services.id })
-      .from(services)
-      .where(eq(services.id, body.serviceId))
-      .limit(1);
-    if (!svc) return c.json({ error: "Service not found" }, 404);
-
-    // Check for duplicate — sizeCategory/coatType are nullable, use isNull for null check
-    const conditions = [eq(bufferRules.serviceId, body.serviceId)];
-    if (body.sizeCategory) {
-      conditions.push(eq(bufferRules.sizeCategory, body.sizeCategory));
-    } else {
-      conditions.push(isNull(bufferRules.sizeCategory));
-    }
-    if (body.coatType) {
-      conditions.push(eq(bufferRules.coatType, body.coatType));
-    } else {
-      conditions.push(isNull(bufferRules.coatType));
-    }
-    const [existing] = await db
-      .select({ id: bufferRules.id })
-      .from(bufferRules)
-      .where(and(...conditions))
-      .limit(1);
-    if (existing) return c.json({ error: "Duplicate rule for this service and attributes" }, 409);
-
-    const [row] = await db
-      .insert(bufferRules)
-      .values({
-        serviceId: body.serviceId,
-        sizeCategory: body.sizeCategory,
-        coatType: body.coatType,
-        bufferMinutes: body.bufferMinutes,
-      })
-      .returning();
-
-    return c.json(row, 201);
-  }
-);
-
-bufferRulesRouter.patch(
-  "/:id",
-  zValidator("json", updateBufferRuleSchema),
-  async (c) => {
-    const db = getDb();
-    const body = c.req.valid("json");
-    const [row] = await db
-      .update(bufferRules)
-      .set({ bufferMinutes: body.bufferMinutes, updatedAt: new Date() })
-      .where(eq(bufferRules.id, c.req.param("id")))
-      .returning();
-    if (!row) return c.json({ error: "Not found" }, 404);
-    return c.json(row);
-  }
-);
-
-bufferRulesRouter.delete("/:id", async (c) => {
-  const db = getDb();
-  const [row] = await db
-    .delete(bufferRules)
-    .where(eq(bufferRules.id, c.req.param("id")))
-    .returning();
-  if (!row) return c.json({ error: "Not found" }, 404);
-  return c.json({ ok: true });
-});
@@ -24,8 +24,6 @@ const createPetSchema = z.object({
  shampooPreference: z.string().max(500).optional(),
  specialCareNotes: z.string().max(2000).optional(),
  customFields: z.record(z.string(), z.string()).optional(),
-  petSizeCategory: z.enum(["small", "medium", "large", "extra_large"]).optional(),
-  coatType: z.enum(["short", "medium", "long", "double", "wire", "silky", "curly", "hairless"]).optional(),
 });

 const updatePetSchema = createPetSchema.partial().omit({ clientId: true });
@@ -10,7 +10,6 @@ const createServiceSchema = z.object({
  description: z.string().max(2000).optional(),
  basePriceCents: z.number().int().positive(),
  durationMinutes: z.number().int().positive().max(480),
-  defaultBufferMinutes: z.number().int().min(0).optional(),
  active: z.boolean().default(true),
 });
Author	SHA1	Message	Date
Flea Flicker	e4b7601de9	fix(GRO-1173): remove stale .github/workflows/ci.yml CI / Lint & Typecheck (pull_request) Successful in 16s Details CI / Test (pull_request) Failing after 22s Details CI / Build & Push Docker Image (pull_request) Has been skipped Details The .github/workflows/ci.yml targets ghcr.io and is replaced by .gitea/workflows/ci.yml which targets git.farh.net with REGISTRY_TOKEN. Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-21 14:27:37 +00:00
The Dogfather	5d478e0aab	fix: align types/index.ts with dev to resolve merge conflict CI / Lint & Typecheck (pull_request) Successful in 16s Details CI / Test (pull_request) Failing after 24s Details CI / Build & Push Docker Image (pull_request) Has been skipped Details	2026-05-21 04:32:13 +00:00
Chris Farhood	5c85c27c9e	fix(GRO-1365): address QA review findings on api/#21 1. Fix vi.mock factory: importOriginal -> db.and/eq/exists/or stubs (removes ReferenceError from undeclared imports in test) 2. Remove MedicalAlert.id — not in schema/migration/DB, only in types 3. Replace z.string().max(100) coatType with z.enum for CoatType union 4. Fix test expecting coatType "smooth" (invalid) -> "double" (valid) 5. Add TC-API-3.8 through TC-API-3.15 to UAT_PLAYBOOK.md §4.3 Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>	2026-05-21 04:32:13 +00:00
Chris Farhood	4a92aaa9ac	fix: add missing extended pet profile fields to buildPet factory - Add coatType, temperamentScore, temperamentFlags, medicalAlerts, preferredCuts - Fixes TypeScript error on factories.ts:89 where extended profile fields were missing - GRO-1346 Co-Authored-By: Paperclip <noreply@paperclip.ing>	2026-05-21 04:31:37 +00:00