ユーザーモデルからemailフィールドを削除し、userEmailモデルを追加して関連するテストを更新しました。 (#526)

ttizze · Jan 19, 2025 · c7d41b7 · c7d41b7
2 parents 0137a1b + 78f9179
commit c7d41b7
Show file tree

Hide file tree

Showing 11 changed files with 159 additions and 91 deletions.
diff --git a/web/app/features/translate/functions/mutations.server.ts b/web/app/features/translate/functions/mutations.server.ts
@@ -2,17 +2,20 @@ import { prisma } from "~/utils/prisma";
 
 export async function getOrCreateAIUser(name: string): Promise<number> {
 	const user = await prisma.user.upsert({
-		where: { email: `${name}@ai.com` },
+		where: { userName: name },
 		update: {},
 		create: {
-			email: `${name}@ai.com`,
-			isAI: true,
-			icon: "",
 			userName: name,
 			displayName: name,
+			isAI: true,
+			icon: "",
+			userEmail: {
+				create: {
+					email: `${name}@ai.com`,
+				},
+			},
 		},
 	});
-
 	return user.id;
 }
 

diff --git a/web/app/features/translate/lib/translate.server.test.ts b/web/app/features/translate/lib/translate.server.test.ts
@@ -24,7 +24,6 @@ describe("translate関数テスト (geminiのみモック)", () => {
 		const user = await prisma.user.create({
 			data: {
 				userName: "testuser",
-				email: "[email protected]",
 				displayName: "testuser",
 				icon: "testuser",
 			},

diff --git a/web/app/routes/$locale+/user.$userName+/index.test.tsx b/web/app/routes/$locale+/user.$userName+/index.test.tsx
@@ -21,7 +21,6 @@ describe("UserProfile", () => {
 			data: {
 				userName: "testuser",
 				displayName: "Test User",
-				email: "[email protected]",
 				icon: "https://example.com/icon.jpg",
 				profile: "This is a test profile",
 				pages: {
@@ -71,7 +70,6 @@ describe("UserProfile", () => {
 			data: {
 				userName: "testuser2",
 				displayName: "Test User2",
-				email: "[email protected]",
 				icon: "https://example.com/icon2.jpg",
 				profile: "This is a test profile2",
 			},

diff --git a/web/app/routes/$locale+/user.$userName+/page+/$slug+/edit/_edit.test.tsx b/web/app/routes/$locale+/user.$userName+/page+/$slug+/edit/_edit.test.tsx
@@ -55,7 +55,6 @@ describe("EditPage", () => {
 			data: {
 				userName: "testuser",
 				displayName: "Test User",
-				email: "[email protected]",
 				icon: "https://example.com/icon.jpg",
 				profile: "This is a test profile",
 				pages: {

diff --git a/web/app/routes/$locale+/user.$userName+/page+/$slug+/edit/utils/processHtmlContent.test.ts b/web/app/routes/$locale+/user.$userName+/page+/$slug+/edit/utils/processHtmlContent.test.ts
@@ -16,7 +16,6 @@ describe("processHtmlContent", () => {
 			create: {
 				id: 10,
 				userName: "htmltester",
-				email: "[email protected]",
 				displayName: "htmltester",
 				icon: "htmltester",
 			},
@@ -86,7 +85,6 @@ describe("processHtmlContent", () => {
 			create: {
 				id: 11,
 				userName: "htmleditor",
-				email: "[email protected]",
 				displayName: "htmleditor",
 				icon: "htmleditor",
 			},
@@ -182,7 +180,6 @@ describe("processHtmlContent", () => {
 			create: {
 				id: 12,
 				userName: "titleduplicateuser",
-				email: "[email protected]",
 				displayName: "titleduplicateuser",
 				icon: "titleduplicateuser",
 			},
@@ -268,7 +265,6 @@ describe("processHtmlContent", () => {
 			create: {
 				id: 13,
 				userName: "noedit",
-				email: "[email protected]",
 				displayName: "noedit",
 				icon: "noedit",
 			},
@@ -345,7 +341,6 @@ describe("processHtmlContent", () => {
 			create: {
 				id: 14,
 				userName: "imagetester",
-				email: "[email protected]",
 				displayName: "imagetester",
 				icon: "imagetester",
 			},

diff --git a/web/app/routes/resources+/functions/mutations.server.test.ts b/web/app/routes/resources+/functions/mutations.server.test.ts
@@ -12,7 +12,6 @@ describe("toggleLike 実際のDB統合テスト", () => {
 			data: {
 				userName: "testuser",
 				displayName: "Test User",
-				email: "[email protected]",
 				icon: "https://example.com/icon.jpg",
 				profile: "This is a test profile",
 				pages: {

diff --git a/web/app/utils/auth.server.ts b/web/app/utils/auth.server.ts
@@ -31,10 +31,11 @@ const formStrategy = new FormStrategy(async ({ form }) => {
 		throw new AuthorizationError("Email and password are required");
 	}
 
-	const existingUser = await prisma.user.findUnique({
+	const existingUserEmail = await prisma.userEmail.findUnique({
 		where: { email: String(email) },
-		include: { credential: true },
+		include: { user: { include: { credential: true } } },
 	});
+	const existingUser = existingUserEmail?.user;
 	if (
 		!existingUser ||
 		!existingUser.credential?.password ||
@@ -62,16 +63,22 @@ const googleStrategy = new GoogleStrategy<User>(
 		callbackURL: `${process.env.CLIENT_URL}/api/auth/callback/google`,
 	},
 	async ({ profile }) => {
-		const user = await prisma.user.findUnique({
+		const userEmail = await prisma.userEmail.findUnique({
 			where: { email: profile.emails[0].value },
+			include: { user: true },
 		});
+		const user = userEmail?.user;
 		if (user) {
 			return user;
 		}
 
 		const newUser = await prisma.user.create({
 			data: {
-				email: profile.emails[0].value || "",
+				userEmail: {
+					create: {
+						email: profile.emails[0].value || "",
+					},
+				},
 				userName: generateTemporaryUserName(),
 				displayName: profile.displayName || "New User",
 				icon: profile.photos[0].value || "",
@@ -91,17 +98,23 @@ const magicLinkStrategy = new EmailLinkStrategy(
 		sessionMagicLinkKey: "auth:magicLink",
 	},
 	async ({ email, form, magicLinkVerify }) => {
-		const user = await prisma.user.findUnique({
+		const userEmail = await prisma.userEmail.findUnique({
 			where: { email: String(email) },
+			include: { user: true },
 		});
+		const user = userEmail?.user;
 
 		if (user) {
 			return user;
 		}
 
 		const newUser = await prisma.user.create({
 			data: {
-				email: String(email),
+				userEmail: {
+					create: {
+						email: String(email),
+					},
+				},
 				icon: `${process.env.CLIENT_URL}/avatar.png`,
 				userName: generateTemporaryUserName(),
 				displayName: String(email).split("@")[0],

diff --git a/web/prisma/migrations/20250119135311_/migration.sql b/web/prisma/migrations/20250119135311_/migration.sql
@@ -0,0 +1,42 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `email` on the `users` table. All the data in the column will be lost.
+
+*/
+
+
+CREATE TABLE "user_emails" (
+    "id" SERIAL NOT NULL,
+    "email" TEXT NOT NULL,
+    "user_id" INTEGER NOT NULL,
+
+    CONSTRAINT "user_emails_pkey" PRIMARY KEY ("id")
+);
+
+INSERT INTO "user_emails" ("email", "user_id")
+  SELECT "email", "id"
+  FROM "users"
+  WHERE "email" IS NOT NULL;
+
+-- DropIndex
+DROP INDEX "users_email_idx";
+
+-- DropIndex
+DROP INDEX "users_email_key";
+
+-- AlterTable
+ALTER TABLE "users" DROP COLUMN "email";
+
+-- CreateTable
+-- CreateIndex
+CREATE UNIQUE INDEX "user_emails_email_key" ON "user_emails"("email");
+
+-- CreateIndex
+CREATE UNIQUE INDEX "user_emails_user_id_key" ON "user_emails"("user_id");
+
+-- CreateIndex
+CREATE INDEX "user_emails_user_id_idx" ON "user_emails"("user_id");
+
+-- AddForeignKey
+ALTER TABLE "user_emails" ADD CONSTRAINT "user_emails_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;