apps/api/src/__tests__/portal.test.ts

@@ -143,6 +143,7 @@ vi.mock("@groombook/db", () => {
     messages,
     eq: vi.fn(),
     and: vi.fn(),
+    lt: vi.fn(),
     desc: vi.fn((col: unknown) => ({ _name: "desc", col })),
   };
 });

apps/api/src/routes/portal.ts

@@ -212,11 +212,12 @@ portalRouter.get("/conversation/messages", async (c) => {
 
   const [settings] = await db.select({ id: businessSettings.id }).from(businessSettings).limit(1);
   if (!settings) return c.json({ error: "Business not configured" }, 500);
+  const businessId = settings.id;
 
   const [conversation] = await db
     .select({ id: conversations.id })
     .from(conversations)
-    .where(eq(conversations.clientId, clientId))
+    .where(and(eq(conversations.clientId, clientId), eq(conversations.businessId, businessId)))
     .limit(1);
 
   if (!conversation) {