From b69ce5f3c7219ccbf2e8b244977fe0ca32faf71e Mon Sep 17 00:00:00 2001
From: tomolld <tomoki2757@gmail.com>
Date: Sun, 19 Jan 2025 22:29:43 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=83=A2?=
 =?UTF-8?q?=E3=83=87=E3=83=AB=E3=81=AEcontent=E3=83=95=E3=82=A3=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E3=83=89=E3=82=92text=E3=83=95=E3=82=A3=E3=83=BC?=
 =?UTF-8?q?=E3=83=AB=E3=83=89=E3=81=AB=E5=A4=89=E6=9B=B4=E3=81=97=E3=80=81?=
 =?UTF-8?q?=E9=96=A2=E9=80=A3=E3=81=99=E3=82=8B=E3=82=B3=E3=83=B3=E3=83=9D?=
 =?UTF-8?q?=E3=83=BC=E3=83=8D=E3=83=B3=E3=83=88=E3=81=A8=E3=83=86=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=82=92=E6=9B=B4=E6=96=B0=E3=81=97=E3=81=BE=E3=81=97?=
 =?UTF-8?q?=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources+/comment/components/CommentForm.tsx      | 10 ++++------
 .../resources+/comment/components/CommentList.tsx      |  2 +-
 web/app/routes/resources+/comment/route.test.tsx       | 10 +++++-----
 web/app/routes/resources+/comment/route.tsx            |  4 ++--
 4 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/web/app/routes/resources+/comment/components/CommentForm.tsx b/web/app/routes/resources+/comment/components/CommentForm.tsx
index 9619c218..f0d7678d 100644
--- a/web/app/routes/resources+/comment/components/CommentForm.tsx
+++ b/web/app/routes/resources+/comment/components/CommentForm.tsx
@@ -21,7 +21,7 @@ export function CommentForm({
 		shouldValidate: "onInput",
 		defaultValue: {
 			pageId: pageId,
-			content: "",
+			text: "",
 		},
 	});
 
@@ -36,7 +36,7 @@ export function CommentForm({
 				<input type="hidden" name="pageId" value={pageId} />
 				<input type="hidden" name="intent" value="create" />
 				<Textarea
-					{...getTextareaProps(fields.content)}
+					{...getTextareaProps(fields.text)}
 					placeholder="comment"
 					className={`min-h-[100px] ${!currentUserName && "bg-muted"}`}
 					disabled={!currentUserName}
@@ -52,10 +52,8 @@ export function CommentForm({
 					{fetcher.state !== "idle" ? "posting" : "post"}
 				</Button>
 			</fetcher.Form>
-			{fields.content.errors && (
-				<p className="text-sm text-red-500">
-					{fields.content.errors?.join(", ")}
-				</p>
+			{fields.text.errors && (
+				<p className="text-sm text-red-500">{fields.text.errors?.join(", ")}</p>
 			)}
 		</>
 	);
diff --git a/web/app/routes/resources+/comment/components/CommentList.tsx b/web/app/routes/resources+/comment/components/CommentList.tsx
index 9b73daba..e7a21d12 100644
--- a/web/app/routes/resources+/comment/components/CommentList.tsx
+++ b/web/app/routes/resources+/comment/components/CommentList.tsx
@@ -72,7 +72,7 @@ export function CommentList({
 							</div>
 						</div>
 					</div>
-					<div className="mt-2 whitespace-pre-wrap">{comment.content}</div>
+					<div className="mt-2 whitespace-pre-wrap">{comment.text}</div>
 				</div>
 			))}
 		</div>
diff --git a/web/app/routes/resources+/comment/route.test.tsx b/web/app/routes/resources+/comment/route.test.tsx
index 4eef8b26..de4bc857 100644
--- a/web/app/routes/resources+/comment/route.test.tsx
+++ b/web/app/routes/resources+/comment/route.test.tsx
@@ -36,7 +36,7 @@ describe("resource+/comment/route.ts action", () => {
 		// prisma.create の返り値モック
 		const mockComment = {
 			id: 1,
-			content: "Hello",
+			text: "Hello",
 			pageId: 1,
 			userId: 123,
 			createdAt: new Date(),
@@ -52,7 +52,7 @@ describe("resource+/comment/route.ts action", () => {
 		const formData = new FormData();
 		formData.append("intent", "create");
 		formData.append("pageId", "1");
-		formData.append("content", "Hello");
+		formData.append("text", "Hello");
 
 		const request = new Request("http://test.com/comment", {
 			method: "POST",
@@ -64,7 +64,7 @@ describe("resource+/comment/route.ts action", () => {
 		// 正しい引数で create が呼ばれたか
 		expect(prisma.comment.create).toHaveBeenCalledWith({
 			data: {
-				content: "Hello",
+				text: "Hello",
 				pageId: 1,
 				userId: 123,
 			},
@@ -129,7 +129,7 @@ describe("resource+/comment/route.ts action", () => {
 		vi.mocked(prisma.comment.findUnique).mockResolvedValueOnce({
 			id: 10,
 			userId: 999,
-			content: "Hello",
+			text: "Hello",
 			pageId: 1,
 			createdAt: new Date(),
 			updatedAt: new Date(),
@@ -171,7 +171,7 @@ describe("resource+/comment/route.ts action", () => {
 		vi.mocked(prisma.comment.findUnique).mockResolvedValueOnce({
 			id: 10,
 			userId: 123,
-			content: "Hello",
+			text: "Hello",
 			pageId: 1,
 			createdAt: new Date(),
 			updatedAt: new Date(),
diff --git a/web/app/routes/resources+/comment/route.tsx b/web/app/routes/resources+/comment/route.tsx
index f8eddce3..ed8f1fa6 100644
--- a/web/app/routes/resources+/comment/route.tsx
+++ b/web/app/routes/resources+/comment/route.tsx
@@ -6,7 +6,7 @@ import { prisma } from "~/utils/prisma";
 
 export const createCommentSchema = z.object({
 	pageId: z.number(),
-	content: z.string().min(1, "Comment cannot be empty"),
+	text: z.string().min(1, "Comment cannot be empty"),
 	intent: z.literal("create"),
 });
 
@@ -38,7 +38,7 @@ export async function action({ request }: ActionFunctionArgs) {
 		case "create": {
 			const comment = await prisma.comment.create({
 				data: {
-					content: submission.value.content,
+					text: submission.value.text,
 					pageId: submission.value.pageId,
 					userId: currentUser.id,
 				},