fix(docker): use pnpm --filter for all monorepo package builds

Use pnpm --filter consistently for all three package builds in the
Dockerfile instead of mixing filter and cd approaches. Also set
--project . explicitly on tsc invocations to ensure tsconfig resolution
from the package directory rather than workspace root.

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

.gitea/workflows/ci.yml

@@ -62,10 +62,6 @@ jobs:
     name: Build & Push Docker Image
     runs-on: ubuntu-latest
     needs: [lint-typecheck, test]
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
     steps:
       - uses: actions/checkout@v4
 
@@ -83,12 +79,12 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Log in to GitHub Container Registry
+      - name: Log in to Gitea Container Registry
         uses: docker/login-action@v3
         with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
+          registry: git.farh.net
+          username: ${{ gitea.actor }}
+          password: ${{ secrets.REGISTRY_TOKEN }}
 
       - name: Build and push API image
         uses: docker/build-push-action@v6
@@ -97,7 +93,7 @@ jobs:
           file: Dockerfile
           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
+            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

Dockerfile

@@ -16,7 +16,7 @@ COPY packages/ packages/
 COPY src/ src/
 RUN pnpm --filter @groombook/types build && \
     pnpm --filter @groombook/db build && \
-    pnpm build
+    pnpm --filter @groombook/api build
 
 # Runtime
 FROM node:20-alpine AS runner

package.json

@@ -5,7 +5,7 @@
   "type": "module",
   "scripts": {
     "dev": "tsx watch src/index.ts",
-    "build": "tsc",
+    "build": "tsc --project .",
     "start": "node dist/index.js",
     "lint": "eslint src --ext .ts",
     "typecheck": "tsc --noEmit",

packages/db/package.json

@@ -16,7 +16,7 @@
     }
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --project .",
     "generate": "drizzle-kit generate",
     "migrate": "drizzle-kit migrate",
     "seed": "tsx src/seed.ts",

packages/db/src/factories.ts

@@ -99,6 +99,8 @@ export function buildPet(overrides: Partial<PetRow> & { clientId: string }): Pet
     cutStyle: null,
     shampooPreference: null,
     specialCareNotes: null,
+    coatType: null,
+    petSizeCategory: null,
     customFields: {},
     photoKey: null,
     photoUploadedAt: null,

packages/db/src/schema.ts

@@ -142,6 +142,8 @@ export const pets = pgTable(
     cutStyle: text("cut_style"),
     shampooPreference: text("shampoo_preference"),
     specialCareNotes: text("special_care_notes"),
+    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"),

packages/types/package.json

@@ -12,7 +12,7 @@
     }
   },
   "scripts": {
-    "build": "tsc",
+    "build": "tsc --project .",
     "typecheck": "tsc --noEmit"
   },
   "devDependencies": {

packages/types/src/index.ts

@@ -39,6 +39,12 @@ export interface Pet {
   cutStyle: string | null;
   shampooPreference: string | null;
   specialCareNotes: string | null;
+  coatType: string | null;
+  petSizeCategory: string | null;
+  preferredCuts: string[];
+  medicalAlerts: MedicalAlert[];
+  temperamentScore?: number;
+  temperamentFlags?: string[];
   customFields: Record<string, string>;
   photoKey?: string;
   photoUploadedAt?: string;
@@ -208,3 +214,14 @@ export interface PaginatedList<T> {
   page: number;
   pageSize: number;
 }
+
+export type AlertSeverity = "low" | "medium" | "high";
+
+export interface MedicalAlert {
+  id: string;
+  type: string;
+  description: string;
+  severity: AlertSeverity;
+}
+
+export type CoatType = "smooth" | "double" | "curly" | "wire" | "long" | "hairless";

src/middleware/rbac.ts

@@ -1,5 +1,5 @@
 import type { MiddlewareHandler } from "hono";
-import { and, eq, getDb, sql, staff, user } from "@groombook/db";
+import { and, eq, getDb, sql, staff } from "@groombook/db";
 
 export type StaffRole = "groomer" | "receptionist" | "manager";
 export type StaffRow = typeof staff.$inferSelect;
@@ -110,30 +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();
-    c.set("staff", newStaff);
-    await next();
-    return;
-  }
   return c.json(
     { error: "Forbidden: no staff record found for authenticated user" },
     403

src/routes/book.ts

@@ -112,6 +112,8 @@ const bookingSchema = z.object({
   petName: z.string().min(1).max(200),
   petSpecies: z.string().min(1).max(100),
   petBreed: z.string().max(100).optional(),
+  petSizeCategory: z.string().max(50).optional(),
+  petCoatType: z.string().max(50).optional(),
   notes: z.string().max(2000).optional(),
 });
 
@@ -191,6 +193,8 @@ bookRouter.post(
         name: body.petName,
         species: body.petSpecies,
         breed: body.petBreed ?? null,
+        coatType: body.petCoatType ?? null,
+        petSizeCategory: body.petSizeCategory ?? null,
       })
       .returning();
     const pet = petInserted[0];