From d60200f8a7b66cc2dfbe8a1f78983a0a422c70d3 Mon Sep 17 00:00:00 2001 From: Chris Farhood Date: Thu, 14 May 2026 14:30:58 +0000 Subject: [PATCH] fix(GRO-1241): remove duplicate staffReadAt + add count mock MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Remove duplicate staffReadAt column in conversations table schema (merge conflict artifact — TS1117 duplicate definition) - Add count mock to conversations.test.ts mock @groombook/db export (PR switched from sql\`count(*)\` to Drizzle count() without updating mock) Co-Authored-By: Paperclip --- apps/api/src/__tests__/conversations.test.ts | 1 + packages/db/src/schema.ts | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/api/src/__tests__/conversations.test.ts b/apps/api/src/__tests__/conversations.test.ts index 1ee4ed7..962e303 100644 --- a/apps/api/src/__tests__/conversations.test.ts +++ b/apps/api/src/__tests__/conversations.test.ts @@ -169,6 +169,7 @@ vi.mock("@groombook/db", () => { lt: vi.fn((a, b) => ({ type: "lt", a, b })), sql: vi.fn(() => ({ __type: "sql" })), isNull: vi.fn((col) => ({ type: "isNull", col })), + count: vi.fn((col) => ({ type: "count", col })), }; }); diff --git a/packages/db/src/schema.ts b/packages/db/src/schema.ts index 8b1532d..ff7cb81 100644 --- a/packages/db/src/schema.ts +++ b/packages/db/src/schema.ts @@ -466,7 +466,6 @@ export const conversations = pgTable( staffReadAt: timestamp("staff_read_at"), createdAt: timestamp("created_at").notNull().defaultNow(), updatedAt: timestamp("updated_at").notNull().defaultNow(), - staffReadAt: timestamp("staff_read_at"), }, (t) => [ index("idx_conversations_business_id_last_message_at").on(