データベースにsectionテーブル追加

Author: na-trium-144

app/actions/chatActions.ts

@@ -170,7 +170,7 @@ export async function askAI(params: ChatParams): Promise<ChatResult> {
       targetSectionId = introSectionId(path);
     }
     const responseMessage = text.split(/-{3,}/)[1].trim();
-    const newChat = await addChat(targetSectionId, [
+    const newChat = await addChat(path, targetSectionId, [
       { role: "user", content: userQuestion },
       { role: "ai", content: responseMessage },
     ]);

app/lib/chatHistory.ts

@@ -3,8 +3,8 @@
 import { headers } from "next/headers";
 import { getAuthServer } from "./auth";
 import { getDrizzle } from "./drizzle";
-import { chat, message } from "@/schema/chat";
-import { and, asc, eq } from "drizzle-orm";
+import { chat, message, section } from "@/schema/chat";
+import { and, asc, eq, exists } from "drizzle-orm";
 import { Auth } from "better-auth";
 import { revalidateTag, unstable_cacheLife } from "next/cache";
 import { isCloudflare } from "./detectCloudflare";
@@ -54,6 +54,7 @@ export async function initContext(ctx?: Partial<Context>): Promise<Context> {
 }
 
 export async function addChat(
+  path: PagePath,
   sectionId: SectionId,
   messages: CreateChatMessage[],
   context?: Partial<Context>
@@ -81,17 +82,21 @@ export async function addChat(
     )
     .returning();
 
-  revalidateTag(cacheKeyForPage({}, userId));
+  revalidateTag(cacheKeyForPage(path, userId));
   if (isCloudflare()) {
     const cache = await caches.open("chatHistory");
     console.log(
-      `deleting cache for chatHistory/getChat for user ${userId} and docs ${lang}/${page}`
+      `deleting cache for chatHistory/getChat for user ${userId} and docs ${path.lang}/${path.page}`
     );
-    await cache.delete(cacheKeyForPage({}, userId));
+    await cache.delete(cacheKeyForPage(path, userId));
   }
 
   return {
     ...newChat,
+    section: {
+      sectionId,
+      pagePath: `${path.lang}/${path.page}`,
+    },
     messages: chatMessages,
   };
 }
@@ -108,8 +113,17 @@ export async function getChat(
   }
 
   const chats = await drizzle.query.chat.findMany({
-    where: and(eq(chat.userId, userId), eq(chat.docsId, docsId)),
+    where: and(
+      eq(chat.userId, userId),
+      exists(
+        drizzle
+          .select()
+          .from(section)
+          .where(eq(section.pagePath, `${path.lang}/${path.page}`))
+      )
+    ),
     with: {
+      section: true,
       messages: {
         orderBy: [asc(message.createdAt)],
       },

app/schema/chat.ts

@@ -4,11 +4,15 @@ import { pgTable, text, timestamp, uuid } from "drizzle-orm/pg-core";
 export const chat = pgTable("chat", {
   chatId: uuid("chatId").primaryKey().defaultRandom(),
   userId: text("userId").notNull(),
-  docsId: text("docsId").notNull(),
   sectionId: text("sectionId").notNull(),
   createdAt: timestamp("createdAt").notNull().defaultNow(),
 });
 
+export const section = pgTable("section", {
+  sectionId: text("sectionId").primaryKey().notNull(),
+  pagePath: text("pagePath").notNull(),
+});
+
 export const message = pgTable("message", {
   id: uuid("id").primaryKey().defaultRandom(),
   chatId: uuid("chatId").notNull(),
@@ -17,8 +21,16 @@ export const message = pgTable("message", {
   createdAt: timestamp("createdAt").notNull().defaultNow(),
 });
 
-export const chatRelations = relations(chat, ({ many }) => ({
+export const chatRelations = relations(chat, ({ many, one }) => ({
   messages: many(message),
+  section: one(section, {
+    fields: [chat.sectionId],
+    references: [section.sectionId],
+  }),
+}));
+
+export const sectionRelations = relations(chat, ({ many }) => ({
+  chat: many(chat),
 }));
 
 export const messageRelations = relations(message, ({ one }) => ({

drizzle/0003_thin_ben_grimm.sql

@@ -0,0 +1,6 @@
+CREATE TABLE "section" (
+	"sectionId" text PRIMARY KEY NOT NULL,
+	"pagePath" text NOT NULL
+);
+--> statement-breakpoint
+ALTER TABLE "chat" DROP COLUMN "docsId";