ユーザーモデルのemailフィールドを必須に変更し、マイグレーションを追加しました (#550)

ttizze · Feb 5, 2025 · 83272ec · 83272ec
2 parents cdb19a1 + fd0f13b
commit 83272ec
Show file tree

Hide file tree

Showing 8 changed files with 23 additions and 1 deletion.
diff --git a/web/app/features/translate/lib/translate.server.test.ts b/web/app/features/translate/lib/translate.server.test.ts
@@ -28,6 +28,7 @@ describe("translate関数の単体テスト (Gemini呼び出しのみモック)"
 				handle: "testuser",
 				name: "testuser",
 				image: "testuser",
+				email: "[email protected]",
 			},
 		});
 		userId = user.id;

diff --git a/web/app/routes/$locale+/user.$handle+/index.test.tsx b/web/app/routes/$locale+/user.$handle+/index.test.tsx
@@ -23,6 +23,7 @@ describe("UserProfile", () => {
 				name: "Test User",
 				image: "https://example.com/image.jpg",
 				profile: "This is a test profile",
+				email: "[email protected]",
 				pages: {
 					create: [
 						{
@@ -72,6 +73,7 @@ describe("UserProfile", () => {
 				name: "Test User2",
 				image: "https://example.com/image2.jpg",
 				profile: "This is a test profile2",
+				email: "[email protected]",
 			},
 		});
 		testUser = createdUser;

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

diff --git a/web/app/routes/$locale+/user.$handle+/page+/$slug+/edit/utils/processHtmlContent.test.ts b/web/app/routes/$locale+/user.$handle+/page+/$slug+/edit/utils/processHtmlContent.test.ts
@@ -18,6 +18,7 @@ describe("processHtmlContent", () => {
 				handle: "htmltester",
 				name: "htmltester",
 				image: "htmltester",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -80,6 +81,7 @@ describe("processHtmlContent", () => {
 				handle: "htmleditor",
 				name: "htmleditor",
 				image: "htmleditor",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -175,6 +177,7 @@ describe("processHtmlContent", () => {
 				handle: "titleduplicateuser",
 				name: "titleduplicateuser",
 				image: "titleduplicateuser",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -253,6 +256,7 @@ describe("processHtmlContent", () => {
 				handle: "noedit",
 				name: "noedit",
 				image: "noedit",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -315,6 +319,7 @@ describe("processHtmlContent", () => {
 				handle: "imagetester",
 				name: "imagetester",
 				image: "imagetester",
+				email: "[email protected]",
 			},
 			update: {},
 		});

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

diff --git a/web/prisma/migrations/20250205084608_/migration.sql b/web/prisma/migrations/20250205084608_/migration.sql
@@ -0,0 +1,8 @@
+/*
+  Warnings:
+
+  - Made the column `email` on table `users` required. This step will fail if there are existing NULL values in that column.
+
+*/
+-- AlterTable
+ALTER TABLE "users" ALTER COLUMN "email" SET NOT NULL;
diff --git a/web/prisma/schema.prisma b/web/prisma/schema.prisma
@@ -10,7 +10,7 @@ datasource db {
 model User {
   id                             String                             @id @default(cuid())
   handle                         String                          @unique
-  email                          String?                          @unique
+  email                          String                          @unique
   name                           String
   image                          String
   profile                        String                          @default("")

diff --git a/web/scripts/processMarkdownContent.test.ts b/web/scripts/processMarkdownContent.test.ts
@@ -21,6 +21,7 @@ This is another test.
 				handle: "test",
 				name: "test",
 				image: "test",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -95,6 +96,7 @@ This is another line.
 				handle: "editor",
 				name: "editor",
 				image: "editor",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -210,6 +212,7 @@ new line
 				handle: "variety",
 				name: "variety",
 				image: "variety",
+				email: "[email protected]",
 			},
 			update: {},
 		});
@@ -281,6 +284,7 @@ new line
 				handle: "variety",
 				name: "variety",
 				image: "variety",
+				email: "[email protected]",
 			},
 			update: {},
 		});