Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| f976b90871 |
@@ -14,7 +14,6 @@ FROM deps AS builder
|
|||||||
RUN mkdir -p /home/node/.cache/node/corepack
|
RUN mkdir -p /home/node/.cache/node/corepack
|
||||||
COPY packages/ packages/
|
COPY packages/ packages/
|
||||||
COPY src/ src/
|
COPY src/ src/
|
||||||
COPY tsconfig.json ./
|
|
||||||
RUN pnpm --filter @groombook/types build && \
|
RUN pnpm --filter @groombook/types build && \
|
||||||
pnpm --filter @groombook/db build && \
|
pnpm --filter @groombook/db build && \
|
||||||
pnpm --filter @groombook/api build
|
pnpm --filter @groombook/api build
|
||||||
|
|||||||
+2
-12
@@ -57,6 +57,8 @@ GroomBook API is a Hono-based REST service (TypeScript/Node.js) powering the pet
|
|||||||
| TC-API-3.5 | Delete pet | DELETE /api/pets/{id} | 200 OK, pet deleted |
|
| TC-API-3.5 | Delete pet | DELETE /api/pets/{id} | 200 OK, pet deleted |
|
||||||
| TC-API-3.6 | Upload pet photo | POST /api/pets/{id}/photo/upload-url, then confirm | 200 OK, photo uploaded and key stored |
|
| TC-API-3.6 | Upload pet photo | POST /api/pets/{id}/photo/upload-url, then confirm | 200 OK, photo uploaded and key stored |
|
||||||
| TC-API-3.7 | View pet photo | GET /api/pets/{id}/photo | 200 OK, presigned URL returned |
|
| TC-API-3.7 | View pet photo | GET /api/pets/{id}/photo | 200 OK, presigned URL returned |
|
||||||
|
| TC-API-3.8 | Get pet profile summary | GET /api/pets/{id}/profile-summary | 200 OK, aggregated profile with grooming history, visit count, upcoming appointment |
|
||||||
|
| TC-API-3.9 | Get pet profile summary — groomer restricted | GET /api/pets/{id}/profile-summary as groomer with no pet linkage | 403 Forbidden |
|
||||||
|
|
||||||
### 4.4 Appointment Scheduling
|
### 4.4 Appointment Scheduling
|
||||||
|
|
||||||
@@ -183,18 +185,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.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 |
|
| 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/Fail Criteria
|
||||||
|
|
||||||
**Pass:**
|
**Pass:**
|
||||||
|
|||||||
@@ -0,0 +1,307 @@
|
|||||||
|
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";
|
||||||
|
|
||||||
|
// ─── Mock staff fixtures ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const MANAGER: StaffRow = {
|
||||||
|
id: "staff-manager-id",
|
||||||
|
oidcSub: "oidc-manager-sub",
|
||||||
|
userId: null,
|
||||||
|
role: "manager",
|
||||||
|
isSuperUser: true,
|
||||||
|
name: "Manager McManager",
|
||||||
|
email: "manager@example.com",
|
||||||
|
active: true,
|
||||||
|
icalToken: null,
|
||||||
|
createdAt: new Date(),
|
||||||
|
updatedAt: new Date(),
|
||||||
|
};
|
||||||
|
|
||||||
|
const GROOMER: StaffRow = {
|
||||||
|
id: "staff-groomer-id",
|
||||||
|
oidcSub: "oidc-groomer-sub",
|
||||||
|
userId: null,
|
||||||
|
role: "groomer",
|
||||||
|
isSuperUser: false,
|
||||||
|
name: "Groomer McGroome",
|
||||||
|
email: "groomer@example.com",
|
||||||
|
active: true,
|
||||||
|
icalToken: null,
|
||||||
|
createdAt: new Date(),
|
||||||
|
updatedAt: new Date(),
|
||||||
|
};
|
||||||
|
|
||||||
|
// ─── Mutable mock state ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
const CLIENT_ID = "client-uuid-summary";
|
||||||
|
const PET_ID = "pet-uuid-summary";
|
||||||
|
|
||||||
|
interface MockState {
|
||||||
|
pets: Record<string, unknown>[];
|
||||||
|
appointments: Record<string, unknown>[];
|
||||||
|
groomingLogs: Record<string, unknown>[];
|
||||||
|
staffMembers: Record<string, unknown>[];
|
||||||
|
services: Record<string, unknown>[];
|
||||||
|
}
|
||||||
|
|
||||||
|
let mock: MockState;
|
||||||
|
|
||||||
|
function resetMock() {
|
||||||
|
mock = {
|
||||||
|
pets: [{
|
||||||
|
id: PET_ID,
|
||||||
|
clientId: CLIENT_ID,
|
||||||
|
name: "Biscuit",
|
||||||
|
species: "dog",
|
||||||
|
breed: "Golden Retriever",
|
||||||
|
weightKg: "30.00",
|
||||||
|
dateOfBirth: null,
|
||||||
|
healthAlerts: null,
|
||||||
|
groomingNotes: null,
|
||||||
|
cutStyle: null,
|
||||||
|
shampooPreference: null,
|
||||||
|
specialCareNotes: null,
|
||||||
|
customFields: {},
|
||||||
|
photoKey: null,
|
||||||
|
photoUploadedAt: null,
|
||||||
|
image: null,
|
||||||
|
coatType: "double",
|
||||||
|
temperamentScore: 3,
|
||||||
|
temperamentFlags: ["gentle"],
|
||||||
|
medicalAlerts: [],
|
||||||
|
preferredCuts: ["puppy cut"],
|
||||||
|
createdAt: new Date("2024-01-01"),
|
||||||
|
updatedAt: new Date("2024-01-01"),
|
||||||
|
}],
|
||||||
|
appointments: [
|
||||||
|
{
|
||||||
|
id: "appt-completed-1",
|
||||||
|
clientId: CLIENT_ID,
|
||||||
|
petId: PET_ID,
|
||||||
|
serviceId: "service-1",
|
||||||
|
staffId: "staff-groomer-id",
|
||||||
|
batherStaffId: null,
|
||||||
|
status: "completed",
|
||||||
|
startTime: new Date("2024-06-01T09:00:00Z"),
|
||||||
|
endTime: new Date("2024-06-01T11:00:00Z"),
|
||||||
|
notes: null,
|
||||||
|
priceCents: 6000,
|
||||||
|
seriesId: null,
|
||||||
|
seriesIndex: null,
|
||||||
|
groupId: null,
|
||||||
|
confirmationStatus: "confirmed",
|
||||||
|
confirmedAt: null,
|
||||||
|
cancelledAt: null,
|
||||||
|
confirmationToken: null,
|
||||||
|
customerNotes: null,
|
||||||
|
createdAt: new Date("2024-05-15"),
|
||||||
|
updatedAt: new Date("2024-05-15"),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "appt-upcoming-1",
|
||||||
|
clientId: CLIENT_ID,
|
||||||
|
petId: PET_ID,
|
||||||
|
serviceId: "service-2",
|
||||||
|
staffId: "staff-groomer-id",
|
||||||
|
batherStaffId: null,
|
||||||
|
status: "confirmed",
|
||||||
|
startTime: new Date("2024-12-01T09:00:00Z"),
|
||||||
|
endTime: new Date("2024-12-01T11:00:00Z"),
|
||||||
|
notes: null,
|
||||||
|
priceCents: 6500,
|
||||||
|
seriesId: null,
|
||||||
|
seriesIndex: null,
|
||||||
|
groupId: null,
|
||||||
|
confirmationStatus: "confirmed",
|
||||||
|
confirmedAt: null,
|
||||||
|
cancelledAt: null,
|
||||||
|
confirmationToken: null,
|
||||||
|
customerNotes: null,
|
||||||
|
createdAt: new Date("2024-11-01"),
|
||||||
|
updatedAt: new Date("2024-11-01"),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
groomingLogs: [
|
||||||
|
{
|
||||||
|
id: "log-1",
|
||||||
|
petId: PET_ID,
|
||||||
|
appointmentId: "appt-completed-1",
|
||||||
|
staffId: "staff-groomer-id",
|
||||||
|
cutStyle: "puppy cut",
|
||||||
|
productsUsed: "oatmeal shampoo",
|
||||||
|
notes: "Trimmed nails",
|
||||||
|
groomedAt: new Date("2024-06-01T10:00:00Z"),
|
||||||
|
createdAt: new Date("2024-06-01T10:00:00Z"),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
staffMembers: [
|
||||||
|
{
|
||||||
|
id: "staff-groomer-id",
|
||||||
|
name: "Groomer McGroome",
|
||||||
|
email: "groomer@example.com",
|
||||||
|
role: "groomer",
|
||||||
|
isSuperUser: false,
|
||||||
|
active: true,
|
||||||
|
oidcSub: "oidc-groomer-sub",
|
||||||
|
userId: null,
|
||||||
|
icalToken: null,
|
||||||
|
createdAt: new Date(),
|
||||||
|
updatedAt: new Date(),
|
||||||
|
},
|
||||||
|
{
|
||||||
|
id: "staff-manager-id",
|
||||||
|
name: "Manager McManager",
|
||||||
|
email: "manager@example.com",
|
||||||
|
role: "manager",
|
||||||
|
isSuperUser: true,
|
||||||
|
active: true,
|
||||||
|
oidcSub: "oidc-manager-sub",
|
||||||
|
userId: null,
|
||||||
|
icalToken: null,
|
||||||
|
createdAt: new Date(),
|
||||||
|
updatedAt: new Date(),
|
||||||
|
},
|
||||||
|
],
|
||||||
|
services: [
|
||||||
|
{ id: "service-1", name: "Full Groom", description: null, basePriceCents: 6000, durationMinutes: 120, active: true, createdAt: new Date(), updatedAt: new Date() },
|
||||||
|
{ id: "service-2", name: "Bath & Brush", description: null, basePriceCents: 4000, durationMinutes: 60, active: true, createdAt: new Date(), updatedAt: new Date() },
|
||||||
|
],
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
vi.mock("../db/index.js", () => {
|
||||||
|
const pets = new Proxy({ _name: "pets" }, { get: (t, p) => p === "_name" ? "pets" : {} });
|
||||||
|
const appointments = new Proxy({ _name: "appointments" }, { get: (t, p) => p === "_name" ? "appointments" : {} });
|
||||||
|
const groomingVisitLogs = new Proxy({ _name: "groomingVisitLogs" }, { get: (t, p) => p === "_name" ? "groomingVisitLogs" : {} });
|
||||||
|
const staff = new Proxy({ _name: "staff" }, { get: (t, p) => p === "_name" ? "staff" : {} });
|
||||||
|
const services = new Proxy({ _name: "services" }, { get: (t, p) => p === "_name" ? "services" : {} });
|
||||||
|
|
||||||
|
function makeChainable(rows: unknown[]) {
|
||||||
|
const arr = rows as unknown[];
|
||||||
|
return new Proxy(arr, {
|
||||||
|
get(target, prop) {
|
||||||
|
if (prop === "where" || prop === "orderBy" || prop === "limit" || prop === "leftJoin" || prop === "from") {
|
||||||
|
return () => makeChainable(target);
|
||||||
|
}
|
||||||
|
if (prop === Symbol.iterator) {
|
||||||
|
return function* () { for (const v of target) yield v; };
|
||||||
|
}
|
||||||
|
// @ts-expect-error proxy
|
||||||
|
return target[prop];
|
||||||
|
},
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
return {
|
||||||
|
getDb: () => ({
|
||||||
|
select: () => ({
|
||||||
|
from: (table: unknown) => {
|
||||||
|
const name = (table as { _name?: string })._name;
|
||||||
|
if (name === "pets") return makeChainable(mock.pets);
|
||||||
|
if (name === "appointments") return makeChainable(mock.appointments);
|
||||||
|
if (name === "groomingVisitLogs") return makeChainable(mock.groomingLogs);
|
||||||
|
if (name === "staff") return makeChainable(mock.staffMembers);
|
||||||
|
if (name === "services") return makeChainable(mock.services);
|
||||||
|
return makeChainable([]);
|
||||||
|
},
|
||||||
|
}),
|
||||||
|
insert: () => ({ values: () => ({ returning: () => [{}] }) }),
|
||||||
|
update: () => ({ set: () => ({ where: () => ({ returning: () => [{}] }) }) }),
|
||||||
|
delete: () => ({ where: () => ({ returning: () => [{}] }) }),
|
||||||
|
}),
|
||||||
|
pets,
|
||||||
|
appointments,
|
||||||
|
groomingVisitLogs,
|
||||||
|
staff,
|
||||||
|
services,
|
||||||
|
and: vi.fn((a: unknown, b: unknown) => [a, b]),
|
||||||
|
desc: vi.fn((c: unknown) => c),
|
||||||
|
eq: vi.fn((_col: unknown, _val: unknown) => ({ col: _col, val: _val })),
|
||||||
|
exists: vi.fn(() => true),
|
||||||
|
or: vi.fn((a: unknown, b: unknown) => [a, b]),
|
||||||
|
};
|
||||||
|
});
|
||||||
|
|
||||||
|
// ─── Helpers ──────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
function makeApp(staff: StaffRow = MANAGER) {
|
||||||
|
const app = new Hono<AppEnv>();
|
||||||
|
app.use("*", async (c, next) => {
|
||||||
|
c.set("staff", staff);
|
||||||
|
await next();
|
||||||
|
});
|
||||||
|
return app.route("/pets", petsRouter);
|
||||||
|
}
|
||||||
|
|
||||||
|
// ─── Tests ────────────────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
describe("GET /:id/profile-summary", () => {
|
||||||
|
beforeEach(resetMock);
|
||||||
|
|
||||||
|
it("returns 404 for non-existent pet", async () => {
|
||||||
|
const app = makeApp();
|
||||||
|
mock.pets = [];
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(404);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns 403 for groomer with no pet linkage", async () => {
|
||||||
|
const app = makeApp(GROOMER);
|
||||||
|
// Groomer has no linkage to this pet's client — clear appointments
|
||||||
|
mock.appointments = [];
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(403);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns complete aggregated profile for manager", async () => {
|
||||||
|
const app = makeApp(MANAGER);
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.id).toBe(PET_ID);
|
||||||
|
expect(body.name).toBe("Biscuit");
|
||||||
|
expect(body.species).toBe("dog");
|
||||||
|
expect(body.recentGroomingHistory).toBeInstanceOf(Array);
|
||||||
|
expect(body.lastVisitDate).toBeTruthy();
|
||||||
|
expect(body.visitCount).toBeGreaterThanOrEqual(0);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("groomer with pet linkage returns 200", async () => {
|
||||||
|
const app = makeApp(GROOMER);
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("recentGroomingHistory is limited to 10 entries", async () => {
|
||||||
|
const app = makeApp(MANAGER);
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.recentGroomingHistory.length).toBeLessThanOrEqual(10);
|
||||||
|
});
|
||||||
|
|
||||||
|
it("returns null upcomingAppointment when none scheduled", async () => {
|
||||||
|
const app = makeApp(MANAGER);
|
||||||
|
mock.appointments = [];
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.upcomingAppointment).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
describe("GET /:id/profile-summary — empty history", () => {
|
||||||
|
beforeEach(resetMock);
|
||||||
|
|
||||||
|
it("returns empty history array when no grooming logs", async () => {
|
||||||
|
const app = makeApp(MANAGER);
|
||||||
|
mock.groomingLogs = [];
|
||||||
|
const res = await app.request(`/pets/${PET_ID}/profile-summary`);
|
||||||
|
expect(res.status).toBe(200);
|
||||||
|
const body = await res.json();
|
||||||
|
expect(body.recentGroomingHistory).toEqual([]);
|
||||||
|
expect(body.lastVisitDate).toBeNull();
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -21,8 +21,8 @@ const MANAGER: StaffRow = {
|
|||||||
|
|
||||||
// ─── Mutable mock state ───────────────────────────────────────────────────────
|
// ─── Mutable mock state ───────────────────────────────────────────────────────
|
||||||
|
|
||||||
const CLIENT_ID = "a0000000-0000-4000-8000-000000000001";
|
const CLIENT_ID = "client-uuid-extended";
|
||||||
const PET_ID = "b0000000-0000-4000-8000-000000000002";
|
const PET_ID = "pet-uuid-extended";
|
||||||
|
|
||||||
let petRows: Record<string, unknown>[] = [];
|
let petRows: Record<string, unknown>[] = [];
|
||||||
let appointmentRows: Record<string, unknown>[] = [];
|
let appointmentRows: Record<string, unknown>[] = [];
|
||||||
@@ -163,10 +163,10 @@ vi.mock("../db", () => {
|
|||||||
}),
|
}),
|
||||||
pets,
|
pets,
|
||||||
appointments,
|
appointments,
|
||||||
and: (...conds: unknown[]) => conds,
|
and,
|
||||||
eq: (col: unknown, val: unknown) => ({ col, val }),
|
eq,
|
||||||
exists: (q: unknown) => q,
|
exists,
|
||||||
or: (...conds: unknown[]) => conds,
|
or,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
+133
-1
@@ -1,7 +1,7 @@
|
|||||||
import { Hono } from "hono";
|
import { Hono } from "hono";
|
||||||
import { zValidator } from "@hono/zod-validator";
|
import { zValidator } from "@hono/zod-validator";
|
||||||
import { z } from "zod/v3";
|
import { z } from "zod/v3";
|
||||||
import { and, eq, exists, getDb, or, pets, appointments } from "../db/index.js";
|
import { and, desc, eq, exists, getDb, groomingVisitLogs, or, pets, appointments, staff, services } from "../db/index.js";
|
||||||
import type { AppEnv } from "../middleware/rbac.js";
|
import type { AppEnv } from "../middleware/rbac.js";
|
||||||
import {
|
import {
|
||||||
getPresignedUploadUrl,
|
getPresignedUploadUrl,
|
||||||
@@ -282,3 +282,135 @@ petsRouter.get("/:petId/photo", async (c) => {
|
|||||||
const url = await getPresignedGetUrl(pet.photoKey);
|
const url = await getPresignedGetUrl(pet.photoKey);
|
||||||
return c.json({ url, photoKey: pet.photoKey, photoUploadedAt: pet.photoUploadedAt });
|
return c.json({ url, photoKey: pet.photoKey, photoUploadedAt: pet.photoUploadedAt });
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// ─── Profile Summary ───────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
async function groomerLinkageCheck(
|
||||||
|
db: ReturnType<typeof getDb>,
|
||||||
|
clientId: string,
|
||||||
|
staffRow: NonNullable<AppEnv["Variables"]["staff"]>
|
||||||
|
): Promise<boolean> {
|
||||||
|
const [linkage] = await db
|
||||||
|
.select({ id: appointments.id })
|
||||||
|
.from(appointments)
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(appointments.clientId, clientId),
|
||||||
|
or(
|
||||||
|
eq(appointments.staffId, staffRow.id),
|
||||||
|
eq(appointments.batherStaffId, staffRow.id)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.limit(1);
|
||||||
|
return !!linkage;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GET /:id/profile-summary
|
||||||
|
* Returns aggregated profile: basic pet fields + grooming history + visit stats + upcoming appointment.
|
||||||
|
* Groomer RBAC: same visibility rules as GET /:id.
|
||||||
|
*/
|
||||||
|
petsRouter.get("/:id/profile-summary", async (c) => {
|
||||||
|
const db = getDb();
|
||||||
|
const petId = c.req.param("id");
|
||||||
|
const staffRow = c.get("staff");
|
||||||
|
const isGroomer = staffRow?.role === "groomer";
|
||||||
|
|
||||||
|
const [row] = await db.select().from(pets).where(eq(pets.id, petId));
|
||||||
|
if (!row) return c.json({ error: "Not found" }, 404);
|
||||||
|
|
||||||
|
if (isGroomer) {
|
||||||
|
const hasLinkage = await groomerLinkageCheck(db, row.clientId, staffRow);
|
||||||
|
if (!hasLinkage) return c.json({ error: "Forbidden" }, 403);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Recent grooming history: last 10, with staff name join
|
||||||
|
const historyRows = await db
|
||||||
|
.select({
|
||||||
|
id: groomingVisitLogs.id,
|
||||||
|
petId: groomingVisitLogs.petId,
|
||||||
|
appointmentId: groomingVisitLogs.appointmentId,
|
||||||
|
staffId: groomingVisitLogs.staffId,
|
||||||
|
staffName: staff.name,
|
||||||
|
cutStyle: groomingVisitLogs.cutStyle,
|
||||||
|
productsUsed: groomingVisitLogs.productsUsed,
|
||||||
|
notes: groomingVisitLogs.notes,
|
||||||
|
groomedAt: groomingVisitLogs.groomedAt,
|
||||||
|
createdAt: groomingVisitLogs.createdAt,
|
||||||
|
})
|
||||||
|
.from(groomingVisitLogs)
|
||||||
|
.leftJoin(staff, eq(staff.id, groomingVisitLogs.staffId))
|
||||||
|
.where(eq(groomingVisitLogs.petId, petId))
|
||||||
|
.orderBy(desc(groomingVisitLogs.groomedAt))
|
||||||
|
.limit(10);
|
||||||
|
|
||||||
|
const recentGroomingHistory = historyRows.map((r) => ({
|
||||||
|
id: r.id,
|
||||||
|
petId: r.petId,
|
||||||
|
appointmentId: r.appointmentId,
|
||||||
|
staffId: r.staffId,
|
||||||
|
staffName: r.staffName,
|
||||||
|
cutStyle: r.cutStyle,
|
||||||
|
productsUsed: r.productsUsed,
|
||||||
|
notes: r.notes,
|
||||||
|
groomedAt: r.groomedAt?.toISOString() ?? null,
|
||||||
|
createdAt: r.createdAt?.toISOString() ?? null,
|
||||||
|
}));
|
||||||
|
|
||||||
|
const lastVisitDate = historyRows[0]?.groomedAt?.toISOString() ?? null;
|
||||||
|
|
||||||
|
// Completed appointment count for this pet
|
||||||
|
const countResult = await db
|
||||||
|
.select({ count: appointments.id })
|
||||||
|
.from(appointments)
|
||||||
|
.where(and(eq(appointments.petId, petId), eq(appointments.status, "completed")))
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
const visitCount = countResult.length;
|
||||||
|
|
||||||
|
// Upcoming appointment: next scheduled or confirmed
|
||||||
|
const [nextAppt] = await db
|
||||||
|
.select({
|
||||||
|
id: appointments.id,
|
||||||
|
serviceId: appointments.serviceId,
|
||||||
|
staffId: appointments.staffId,
|
||||||
|
startTime: appointments.startTime,
|
||||||
|
endTime: appointments.endTime,
|
||||||
|
status: appointments.status,
|
||||||
|
serviceName: services.name,
|
||||||
|
staffName: staff.name,
|
||||||
|
})
|
||||||
|
.from(appointments)
|
||||||
|
.leftJoin(services, eq(services.id, appointments.serviceId))
|
||||||
|
.leftJoin(staff, eq(staff.id, appointments.staffId))
|
||||||
|
.where(
|
||||||
|
and(
|
||||||
|
eq(appointments.petId, petId),
|
||||||
|
or(eq(appointments.status, "scheduled"), eq(appointments.status, "confirmed"))
|
||||||
|
)
|
||||||
|
)
|
||||||
|
.orderBy(appointments.startTime)
|
||||||
|
.limit(1);
|
||||||
|
|
||||||
|
const upcomingAppointment = nextAppt
|
||||||
|
? {
|
||||||
|
id: nextAppt.id,
|
||||||
|
serviceId: nextAppt.serviceId,
|
||||||
|
serviceName: nextAppt.serviceName,
|
||||||
|
staffId: nextAppt.staffId,
|
||||||
|
staffName: nextAppt.staffName,
|
||||||
|
startTime: nextAppt.startTime?.toISOString() ?? null,
|
||||||
|
endTime: nextAppt.endTime?.toISOString() ?? null,
|
||||||
|
status: nextAppt.status,
|
||||||
|
}
|
||||||
|
: null;
|
||||||
|
|
||||||
|
return c.json({
|
||||||
|
...row,
|
||||||
|
recentGroomingHistory,
|
||||||
|
lastVisitDate,
|
||||||
|
visitCount,
|
||||||
|
upcomingAppointment,
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|||||||
@@ -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");
|
|
||||||
@@ -119,7 +119,6 @@ export function buildService(overrides: Partial<ServiceRow> = {}): ServiceRow {
|
|||||||
description: "A grooming service",
|
description: "A grooming service",
|
||||||
basePriceCents: 6500,
|
basePriceCents: 6500,
|
||||||
durationMinutes: 60,
|
durationMinutes: 60,
|
||||||
defaultBufferMinutes: null,
|
|
||||||
active: true,
|
active: true,
|
||||||
createdAt: new Date("2025-01-01T00:00:00Z"),
|
createdAt: new Date("2025-01-01T00:00:00Z"),
|
||||||
updatedAt: new Date("2025-01-01T00:00:00Z"),
|
updatedAt: new Date("2025-01-01T00:00:00Z"),
|
||||||
|
|||||||
@@ -48,22 +48,6 @@ export const clientStatusEnum = pgEnum("client_status", [
|
|||||||
"disabled",
|
"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 ──────────────────────────────────────────────────────
|
// ─── Better-Auth Tables ──────────────────────────────────────────────────────
|
||||||
|
|
||||||
export const user = pgTable("user", {
|
export const user = pgTable("user", {
|
||||||
@@ -158,8 +142,8 @@ export const pets = pgTable(
|
|||||||
cutStyle: text("cut_style"),
|
cutStyle: text("cut_style"),
|
||||||
shampooPreference: text("shampoo_preference"),
|
shampooPreference: text("shampoo_preference"),
|
||||||
specialCareNotes: text("special_care_notes"),
|
specialCareNotes: text("special_care_notes"),
|
||||||
coatType: coatTypeEnum("coat_type"),
|
coatType: text("coat_type"),
|
||||||
petSizeCategory: petSizeCategoryEnum("pet_size_category"),
|
petSizeCategory: text("pet_size_category"),
|
||||||
customFields: jsonb("custom_fields").$type<Record<string, string>>().notNull().default({}),
|
customFields: jsonb("custom_fields").$type<Record<string, string>>().notNull().default({}),
|
||||||
photoKey: text("photo_key"),
|
photoKey: text("photo_key"),
|
||||||
photoUploadedAt: timestamp("photo_uploaded_at"),
|
photoUploadedAt: timestamp("photo_uploaded_at"),
|
||||||
@@ -176,34 +160,11 @@ export const services = pgTable("services", {
|
|||||||
description: text("description"),
|
description: text("description"),
|
||||||
basePriceCents: integer("base_price_cents").notNull(),
|
basePriceCents: integer("base_price_cents").notNull(),
|
||||||
durationMinutes: integer("duration_minutes").notNull(),
|
durationMinutes: integer("duration_minutes").notNull(),
|
||||||
defaultBufferMinutes: integer("default_buffer_minutes"),
|
|
||||||
active: boolean("active").notNull().default(true),
|
active: boolean("active").notNull().default(true),
|
||||||
createdAt: timestamp("created_at").notNull().defaultNow(),
|
createdAt: timestamp("created_at").notNull().defaultNow(),
|
||||||
updatedAt: timestamp("updated_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", {
|
export const staff = pgTable("staff", {
|
||||||
id: uuid("id").primaryKey().defaultRandom(),
|
id: uuid("id").primaryKey().defaultRandom(),
|
||||||
name: text("name").notNull(),
|
name: text("name").notNull(),
|
||||||
|
|||||||
@@ -225,3 +225,34 @@ export interface MedicalAlert {
|
|||||||
}
|
}
|
||||||
|
|
||||||
export type CoatType = "smooth" | "double" | "curly" | "wire" | "long" | "hairless";
|
export type CoatType = "smooth" | "double" | "curly" | "wire" | "long" | "hairless";
|
||||||
|
|
||||||
|
export interface GroomingHistoryEntry {
|
||||||
|
id: string;
|
||||||
|
petId: string;
|
||||||
|
appointmentId: string | null;
|
||||||
|
staffId: string | null;
|
||||||
|
staffName: string | null;
|
||||||
|
cutStyle: string | null;
|
||||||
|
productsUsed: string | null;
|
||||||
|
notes: string | null;
|
||||||
|
groomedAt: string;
|
||||||
|
createdAt: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface UpcomingAppointment {
|
||||||
|
id: string;
|
||||||
|
serviceId: string;
|
||||||
|
serviceName: string;
|
||||||
|
staffId: string | null;
|
||||||
|
staffName: string | null;
|
||||||
|
startTime: string;
|
||||||
|
endTime: string;
|
||||||
|
status: AppointmentStatus;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface PetProfileSummary extends Pet {
|
||||||
|
recentGroomingHistory: GroomingHistoryEntry[];
|
||||||
|
lastVisitDate: string | null;
|
||||||
|
visitCount: number;
|
||||||
|
upcomingAppointment: UpcomingAppointment | null;
|
||||||
|
}
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ import { impersonationRouter } from "./routes/impersonation.js";
|
|||||||
import { settingsRouter } from "./routes/settings.js";
|
import { settingsRouter } from "./routes/settings.js";
|
||||||
import { authProviderRouter } from "./routes/authProvider.js";
|
import { authProviderRouter } from "./routes/authProvider.js";
|
||||||
import { searchRouter } from "./routes/search.js";
|
import { searchRouter } from "./routes/search.js";
|
||||||
import { bufferRulesRouter } from "./routes/buffer-rules.js";
|
|
||||||
import { getObject } from "./lib/s3.js";
|
import { getObject } from "./lib/s3.js";
|
||||||
import { calendarRouter } from "./routes/calendar.js";
|
import { calendarRouter } from "./routes/calendar.js";
|
||||||
import { setupRouter } from "./routes/setup.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/auth-provider", authProviderRouter);
|
||||||
api.route("/admin/seed", adminSeedRouter);
|
api.route("/admin/seed", adminSeedRouter);
|
||||||
api.route("/search", searchRouter);
|
api.route("/search", searchRouter);
|
||||||
api.route("/buffer-rules", bufferRulesRouter);
|
|
||||||
|
|
||||||
const port = Number(process.env.PORT ?? 3000);
|
const port = Number(process.env.PORT ?? 3000);
|
||||||
await initAuth();
|
await initAuth();
|
||||||
|
|||||||
+2
-2
@@ -193,8 +193,8 @@ bookRouter.post(
|
|||||||
name: body.petName,
|
name: body.petName,
|
||||||
species: body.petSpecies,
|
species: body.petSpecies,
|
||||||
breed: body.petBreed ?? null,
|
breed: body.petBreed ?? null,
|
||||||
coatType: (body.petCoatType ?? null) as "smooth" | "double" | "wire" | "curly" | "long" | "hairless" | null,
|
coatType: body.petCoatType ?? null,
|
||||||
petSizeCategory: (body.petSizeCategory ?? null) as "small" | "medium" | "large" | "xlarge" | null,
|
petSizeCategory: body.petSizeCategory ?? null,
|
||||||
})
|
})
|
||||||
.returning();
|
.returning();
|
||||||
const pet = petInserted[0];
|
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", "xlarge"]).optional(),
|
|
||||||
coatType: z.enum(["smooth", "double", "wire", "curly", "long", "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(),
|
shampooPreference: z.string().max(500).optional(),
|
||||||
specialCareNotes: z.string().max(2000).optional(),
|
specialCareNotes: z.string().max(2000).optional(),
|
||||||
customFields: z.record(z.string(), z.string()).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(),
|
|
||||||
});
|
});
|
||||||
|
|
||||||
const updatePetSchema = createPetSchema.partial().omit({ clientId: true });
|
const updatePetSchema = createPetSchema.partial().omit({ clientId: true });
|
||||||
|
|||||||
@@ -10,7 +10,6 @@ const createServiceSchema = z.object({
|
|||||||
description: z.string().max(2000).optional(),
|
description: z.string().max(2000).optional(),
|
||||||
basePriceCents: z.number().int().positive(),
|
basePriceCents: z.number().int().positive(),
|
||||||
durationMinutes: z.number().int().positive().max(480),
|
durationMinutes: z.number().int().positive().max(480),
|
||||||
defaultBufferMinutes: z.number().int().min(0).optional(),
|
|
||||||
active: z.boolean().default(true),
|
active: z.boolean().default(true),
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user