diff --git a/.gitea/workflows/ci.yml b/.gitea/workflows/ci.yml index 33d7b0c..df10baa 100644 --- a/.gitea/workflows/ci.yml +++ b/.gitea/workflows/ci.yml @@ -25,17 +25,17 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: pnpm - name: Install dependencies run: pnpm install --frozen-lockfile - name: Typecheck - run: pnpm typecheck + run: pnpm --filter @groombook/api typecheck - name: Lint - run: pnpm lint + run: pnpm --filter @groombook/api lint test: name: Test @@ -49,17 +49,17 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: pnpm - name: Install dependencies run: pnpm install --frozen-lockfile - name: Run tests - run: pnpm test + run: pnpm --filter @groombook/api test docker: - name: Build & Push Docker Image + name: Build & Push Docker Images runs-on: ubuntu-latest needs: [lint-typecheck, test] steps: @@ -91,9 +91,49 @@ jobs: with: context: . file: Dockerfile + target: runner push: true 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 \ No newline at end of file + 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 + 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 + 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 + 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 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 3881905..0fb65b7 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -25,7 +25,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: pnpm - name: Install dependencies @@ -49,7 +49,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: pnpm - name: Install dependencies @@ -71,7 +71,7 @@ jobs: - uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 cache: pnpm - name: Install dependencies diff --git a/Dockerfile b/Dockerfile index 93e6bc3..ac523cc 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:20-alpine AS base +FROM node:22-alpine AS base RUN corepack enable && corepack prepare pnpm@9.15.4 --activate WORKDIR /app @@ -17,10 +17,10 @@ COPY src/ src/ COPY tsconfig.json ./ RUN pnpm --filter @groombook/types build && \ pnpm --filter @groombook/db build && \ - pnpm --filter @groombook/api build + pnpm build # Runtime -FROM node:20-alpine AS runner +FROM node:22-alpine AS runner RUN corepack enable && corepack prepare pnpm@9.15.4 --activate WORKDIR /app ENV NODE_ENV=production @@ -42,12 +42,12 @@ CMD ["node", "dist/index.js"] # Migrate stage — runs drizzle-kit migrate against the database FROM builder AS migrate -CMD ["pnpm", "db:migrate"] +CMD ["pnpm", "--filter", "@groombook/db", "migrate"] # Seed stage — populates the database with test data FROM builder AS seed -CMD ["pnpm", "db:seed"] +CMD ["pnpm", "--filter", "@groombook/db", "seed"] # Reset stage — drops all tables, re-runs migrations, and re-seeds FROM builder AS reset -CMD ["pnpm", "db:reset"] +CMD ["pnpm", "--filter", "@groombook/db", "reset"] diff --git a/apps/api/src/__tests__/petsExtendedFields.test.ts b/apps/api/src/__tests__/petsExtendedFields.test.ts index 3425234..44085ac 100644 --- a/apps/api/src/__tests__/petsExtendedFields.test.ts +++ b/apps/api/src/__tests__/petsExtendedFields.test.ts @@ -135,7 +135,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 +165,10 @@ vi.mock("../db", async (importOriginal) => { }), pets, appointments, -and: db.and, - eq: db.eq, - exists: db.exists, - or: db.or, + and: vi.fn(), + eq: vi.fn(), + exists: vi.fn(), + or: vi.fn(), }; }); diff --git a/apps/api/src/__tests__/portal.test.ts b/apps/api/src/__tests__/portal.test.ts index 2388943..bbeacbd 100644 --- a/apps/api/src/__tests__/portal.test.ts +++ b/apps/api/src/__tests__/portal.test.ts @@ -67,6 +67,11 @@ 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 }) } @@ -99,8 +104,12 @@ vi.mock("../db", () => { }), }), }), + insert: () => ({ + values: () => ({ returning: () => [{}] }), + }), }), impersonationSessions, + impersonationAuditLogs, appointments, eq: vi.fn(), and: vi.fn(), diff --git a/package.json b/package.json index 3ee2ac8..e2a0164 100644 --- a/package.json +++ b/package.json @@ -3,6 +3,7 @@ "version": "0.0.1", "private": true, "type": "module", + "packageManager": "pnpm@9.15.4", "scripts": { "dev": "tsx watch src/index.ts", "build": "tsc --project .", diff --git a/packages/db/src/factories.ts b/packages/db/src/factories.ts index cac71f7..2ecad06 100644 --- a/packages/db/src/factories.ts +++ b/packages/db/src/factories.ts @@ -105,8 +105,6 @@ export function buildPet(overrides: Partial & { clientId: string }): Pet photoKey: null, photoUploadedAt: null, image: null, - coatType: null, - petSizeCategory: null, createdAt: new Date("2025-01-01T00:00:00Z"), updatedAt: new Date("2025-01-01T00:00:00Z"), }; @@ -121,7 +119,7 @@ export function buildService(overrides: Partial = {}): ServiceRow { description: "A grooming service", basePriceCents: 6500, durationMinutes: 60, - defaultBufferMinutes: null, + defaultBufferMinutes: 0, active: true, createdAt: new Date("2025-01-01T00:00:00Z"), updatedAt: new Date("2025-01-01T00:00:00Z"), diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts index bb3c8f6..de0ab29 100644 --- a/packages/db/src/schema.ts +++ b/packages/db/src/schema.ts @@ -48,22 +48,6 @@ export const clientStatusEnum = pgEnum("client_status", [ "disabled", ]); -export const petSizeCategoryEnum = pgEnum("pet_size_category", [ - "small", - "medium", - "large", - "xlarge", -]); - -export const coatTypeEnum = pgEnum("coat_type", [ - "smooth", - "double", - "wire", - "curly", - "long", - "hairless", -]); - // ─── Better-Auth Tables ────────────────────────────────────────────────────── export const user = pgTable("user", { @@ -196,35 +180,12 @@ export const services = pgTable("services", { description: text("description"), basePriceCents: integer("base_price_cents").notNull(), durationMinutes: integer("duration_minutes").notNull(), - defaultBufferMinutes: integer("default_buffer_minutes"), 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(), }); -export const bufferRules = pgTable( - "buffer_rules", - { - id: uuid("id").primaryKey().defaultRandom(), - serviceId: uuid("service_id") - .notNull() - .references(() => services.id, { onDelete: "cascade" }), - sizeCategory: petSizeCategoryEnum("size_category"), - coatType: coatTypeEnum("coat_type"), - bufferMinutes: integer("buffer_minutes").notNull(), - createdAt: timestamp("created_at").notNull().defaultNow(), - updatedAt: timestamp("updated_at").notNull().defaultNow(), - }, - (t) => [ - unique("uq_buffer_rules_service_size_coat").on( - t.serviceId, - t.sizeCategory, - t.coatType - ), - ] -); - export const staff = pgTable("staff", { id: uuid("id").primaryKey().defaultRandom(), name: text("name").notNull(), diff --git a/src/routes/book.ts b/src/routes/book.ts index 828c11c..c380439 100644 --- a/src/routes/book.ts +++ b/src/routes/book.ts @@ -193,8 +193,8 @@ bookRouter.post( name: body.petName, species: body.petSpecies, breed: body.petBreed ?? null, - coatType: (body.petCoatType ?? null) as "smooth" | "double" | "wire" | "curly" | "long" | "hairless" | null, - petSizeCategory: (body.petSizeCategory ?? null) as "small" | "medium" | "large" | "xlarge" | 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, }) .returning(); const pet = petInserted[0]; diff --git a/src/routes/buffer-rules.ts b/src/routes/buffer-rules.ts index fb3ff2b..72a98a7 100644 --- a/src/routes/buffer-rules.ts +++ b/src/routes/buffer-rules.ts @@ -19,8 +19,8 @@ bufferRulesRouter.use("*", requireRole("manager")); const createBufferRuleSchema = z.object({ serviceId: z.string().uuid(), - sizeCategory: z.enum(["small", "medium", "large", "xlarge"]).optional(), - coatType: z.enum(["smooth", "double", "wire", "curly", "long", "hairless"]).optional(), + 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(), }); diff --git a/src/routes/pets.ts b/src/routes/pets.ts index 9642450..039e8a5 100644 --- a/src/routes/pets.ts +++ b/src/routes/pets.ts @@ -24,8 +24,8 @@ 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", "xlarge"]).optional(), - coatType: z.enum(["smooth", "double", "wire", "curly", "long", "hairless"]).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 });