Merge branch 'staging' of https://github.com/AtCoder-NoviSteps/AtCoderNoviSteps into #2627

Author: KATO-Hiro

docs/dev-notes/2025-10-13/fix-n-plus-1-query-for-prisma/plan.md

@@ -41,8 +41,8 @@
     "@testing-library/jest-dom": "6.9.1",
     "@types/gtag.js": "0.0.20",
     "@types/jsdom": "21.1.7",
-    "@typescript-eslint/eslint-plugin": "8.45.0",
-    "@typescript-eslint/parser": "8.45.0",
+    "@typescript-eslint/eslint-plugin": "8.46.1",
+    "@typescript-eslint/parser": "8.46.1",
     "@vitest/coverage-v8": "3.2.4",
     "@vitest/ui": "3.2.4",
     "eslint": "9.37.0",
@@ -51,22 +51,22 @@
     "globals": "16.4.0",
     "husky": "9.1.7",
     "jsdom": "26.1.0",
-    "lint-staged": "16.2.3",
+    "lint-staged": "16.2.4",
     "nock": "14.0.10",
-    "pnpm": "10.18.0",
+    "pnpm": "10.18.3",
     "prettier": "3.6.2",
     "prettier-plugin-svelte": "3.4.0",
     "prettier-plugin-tailwindcss": "0.6.14",
     "prisma": "5.22.0",
     "super-sitemap": "1.0.5",
-    "svelte": "5.39.8",
+    "svelte": "5.40.0",
     "svelte-5-ui-lib": "0.12.2",
-    "svelte-check": "4.3.2",
+    "svelte-check": "4.3.3",
     "svelte-meta-tags": "4.4.1",
-    "sveltekit-superforms": "2.27.2",
+    "sveltekit-superforms": "2.27.3",
     "tslib": "2.8.1",
     "typescript": "5.9.3",
-    "vite": "7.1.9",
+    "vite": "7.1.10",
     "vitest": "3.2.4",
     "zod": "3.25.76"
   },
@@ -78,21 +78,21 @@
     "@prisma/client": "5.22.0",
     "@testing-library/svelte": "5.2.8",
     "@types/jest": "30.0.0",
-    "@types/node": "24.6.2",
+    "@types/node": "24.7.2",
     "autoprefixer": "10.4.21",
     "debug": "4.4.3",
     "embla-carousel-autoplay": "8.6.0",
     "embla-carousel-svelte": "8.6.0",
     "flowbite": "2.5.2",
     "lucia": "2.7.7",
-    "lucide-svelte": "^0.544.0",
+    "lucide-svelte": "^0.545.0",
     "p-queue": "^9.0.0",
     "playwright": "1.55.1",
     "prisma-erd-generator": "2.1.0",
     "svelte-eslint-parser": "1.3.3",
     "tailwind-merge": "2.6.0",
     "tailwindcss": "3.4.18",
-    "vercel": "48.2.0",
+    "vercel": "48.2.9",
     "xss": "1.0.15"
   },
   "packageManager": "[email protected]",

package.json

@@ -20,6 +20,37 @@ export async function getAnswers(user_id: string) {
   return answersMap;
 }
 
+/**
+ * Fetches task answers for a specific user and a list of selected task IDs.
+ *
+ * @param selectedTaskIds - An array of task IDs to filter the answers.
+ * @param userId - The ID of the user whose answers are to be fetched.
+ *
+ * @returns A promise that resolves to an array of TaskAnswer objects.
+ * @note conditions: task_id IN (...) AND user_id = userId
+ */
+export async function getAnswersWithSelectedTaskIds(
+  selectedTaskIds: string[],
+  userId: string,
+): Promise<Pick<TaskAnswer, 'task_id' | 'user_id' | 'status_id' | 'updated_at'>[]> {
+  if (!selectedTaskIds?.length) {
+    return [];
+  }
+
+  return await prisma.taskAnswer.findMany({
+    where: {
+      task_id: { in: selectedTaskIds },
+      user_id: userId,
+    },
+    select: {
+      task_id: true,
+      user_id: true,
+      status_id: true,
+      updated_at: true,
+    },
+  });
+}
+
 export async function getAnswersOrderedByUpdatedDesc(user_id: string): Promise<TaskAnswer[]> {
   const answers_from_db = await prisma.taskAnswer.findMany({
     where: {

pnpm-lock.yaml

@@ -5,7 +5,7 @@ import {
   getSubmissionStatusMapWithId,
   getSubmissionStatusMapWithName,
 } from '$lib/services/submission_status';
-import { getTasks, getTask } from '$lib/services/tasks';
+import { getTasks, getTasksWithSelectedTaskIds, getTask } from '$lib/services/tasks';
 import { getUser } from '$lib/services/users';
 import * as answer_crud from '$lib/services/answers';
 
@@ -19,7 +19,7 @@ import type { User } from '@prisma/client';
 import type { TaskAnswer } from '$lib/types/answer';
 import type { Task } from '$lib/types/task';
 import type { TaskResult, TaskResults, Tasks } from '$lib/types/task';
-import type { WorkBookTaskBase, WorkBookTasksBase } from '$lib/types/workbook';
+import type { WorkBookTasksBase } from '$lib/types/workbook';
 import type { FloatingMessages } from '$lib/types/floating_message';
 
 import { NOT_FOUND } from '$lib/constants/http-response-status-codes';
@@ -183,44 +183,90 @@ export async function getTaskResultsOnlyResultExists(
 }
 
 // Note: 個別の問題集を参照するときのみ使用する。
-// Why : 未回答の問題も含めて取得するため、データ総量を抑えるためにも問題集の一覧（ユーザの回答を含む）を参照するときは上記のメソッドを使用する。
+// Why : 未回答の問題も含めて取得するため、データ総量を抑えるためにも問題集の一覧(ユーザの回答を含む)を参照するときは上記のメソッドを使用する。
 export async function getTaskResultsByTaskId(
   workBookTasks: WorkBookTasksBase,
   userId: string,
 ): Promise<Map<string, TaskResult>> {
-  const taskResultsWithTaskId = workBookTasks.map((workBookTask: WorkBookTaskBase) =>
-    getTaskResultWithErrorHandling(workBookTask.taskId, userId).then((taskResult: TaskResult) => ({
-      taskId: workBookTask.taskId,
-      taskResult: taskResult,
-    })),
-  );
+  const startTime = Date.now();
+
+  // Step 1: Extract task IDs with type-safe filtering
+  const taskIds = workBookTasks
+    .map((workBookTask) => workBookTask.taskId)
+    .filter((id): id is string => id !== null && id !== undefined);
+
+  if (taskIds.length === 0) {
+    return new Map();
+  }
+
+  // Step 2 & 3: Bulk fetch all tasks and answers (2 query)
+  const tasks = await getTasksWithSelectedTaskIds(taskIds);
+  const answers = userId ? await answer_crud.getAnswersWithSelectedTaskIds(taskIds, userId) : [];
+
+  // Step 4: Create Maps for O(1) lookup
+  const tasksMap = new Map(tasks.map((task: Task) => [task.task_id, task]));
+  const answersMap = new Map(answers.map((answer) => [answer.task_id, answer]));
+  const taskResultsMap = new Map<string, TaskResult>();
+
+  // Step 5: Merge in memory using mergeTaskAndAnswer
+  for (const taskId of taskIds) {
+    const task = tasksMap.get(taskId);
+
+    if (!task) {
+      console.warn(`Not found task: ${taskId} in database`);
+      continue;
+    }
 
-  const taskResultsMap = (await Promise.all(taskResultsWithTaskId)).reduce(
-    (map, { taskId, taskResult }: { taskId: string; taskResult: TaskResult }) =>
-      map.set(taskId, taskResult),
-    new Map<string, TaskResult>(),
+    const answer = answersMap.get(taskId);
+    const taskResult = mergeTaskAndAnswer(task, userId, answer);
+
+    taskResultsMap.set(taskId, taskResult);
+  }
+
+  const duration = Date.now() - startTime;
+  console.log(
+    `[getTaskResultsByTaskId] Loaded ${taskIds.length} tasks in ${duration}ms (${answers.length} answers)`,
   );
 
   return taskResultsMap;
 }
 
-async function getTaskResultWithErrorHandling(taskId: string, userId: string): Promise<TaskResult> {
-  try {
-    return await getTaskResult(taskId, userId);
-  } catch (error) {
-    console.error(`Failed to get task result for taskId ${taskId}:`, error);
-    return await handleTaskResultError(taskId, userId);
+/**
+ * Merge task and answer to create TaskResult
+ * Extracted common logic from getTaskResult (excluding DB access)
+ *
+ * @param task - Task object from database
+ * @param userId - User ID for creating TaskResult
+ * @param answer - TaskAnswer object from database (can be null or undefined)
+ * @returns TaskResult with merged data
+ */
+function mergeTaskAndAnswer(
+  task: Task,
+  userId: string,
+  answer: TaskAnswer | null | undefined,
+): TaskResult {
+  const taskResult = createDefaultTaskResult(userId, task);
+
+  if (!answer) {
+    return taskResult;
   }
-}
 
-async function handleTaskResultError(taskId: string, userId: string): Promise<TaskResult> {
-  try {
-    const task: Tasks = await getTask(taskId);
-    return await createDefaultTaskResult(userId, task[0]);
-  } catch (innerError) {
-    console.error(`Failed to create a default task result for taskId ${taskId}:`, innerError);
-    throw new Error(`問題id: ${taskId} の作成に失敗しました。`);
+  const status = statusById.get(answer.status_id);
+
+  if (status) {
+    taskResult.status_id = status.id;
+    taskResult.status_name = status.status_name;
+    taskResult.submission_status_image_path = status.image_path;
+    taskResult.submission_status_label_name = status.label_name;
+    taskResult.is_ac = status.is_ac;
+    taskResult.user_id = userId;
+
+    if (answer.updated_at) {
+      taskResult.updated_at = answer.updated_at;
+    }
   }
+
+  return taskResult;
 }
 
 export function createDefaultTaskResult(userId: string, task: Task): TaskResult {
@@ -242,29 +288,17 @@ export function createDefaultTaskResult(userId: string, task: Task): TaskResult
   return taskResult;
 }
 
+// Note: This function will be deprecated in the future in favor of bulk operations (getTaskResultsByTaskId)
 export async function getTaskResult(slug: string, userId: string) {
   const task = await getTask(slug);
 
   if (!task || task.length === 0) {
     error(NOT_FOUND, `問題 ${slug} は見つかりませんでした。`);
   }
 
-  const taskResult = createDefaultTaskResult(userId, task[0]);
-  const taskanswer: TaskAnswer | null = await answer_crud.getAnswer(slug, userId);
-
-  if (!taskanswer) {
-    return taskResult;
-  }
-
-  const status = statusById.get(taskanswer.status_id);
-  taskResult.status_id = status.id;
-  taskResult.status_name = status.status_name;
-  taskResult.submission_status_image_path = status.image_path;
-  taskResult.submission_status_label_name = status.label_name;
-  taskResult.is_ac = status.is_ac;
-  taskResult.user_id = userId;
+  const taskAnswer: TaskAnswer | null = await answer_crud.getAnswer(slug, userId);
 
-  return taskResult;
+  return mergeTaskAndAnswer(task[0], userId, taskAnswer);
 }
 
 export async function updateTaskResult(taskId: string, submissionStatus: string, userId: string) {

src/lib/services/answers.ts

@@ -1,7 +1,7 @@
 import { default as db } from '$lib/server/database';
 import { classifyContest } from '$lib/utils/contest';
 import type { TaskGrade } from '$lib/types/task';
-import type { Task } from '$lib/types/task';
+import type { Task, Tasks } from '$lib/types/task';
 
 // See:
 // https://www.prisma.io/docs/concepts/components/prisma-client/filtering-and-sorting
@@ -11,6 +11,36 @@ export async function getTasks(): Promise<Task[]> {
   return tasks;
 }
 
+/**
+ * Fetches tasks with the specified task IDs.
+ * @param selectedTaskIds - An array of task IDs to filter the tasks.
+ *
+ * @returns A promise that resolves to an array of Task objects.
+ * @note conditions: { task_id: { in: taskIds } } for efficient filtering
+ */
+export async function getTasksWithSelectedTaskIds(
+  selectedTaskIds: string[],
+): Promise<Pick<Task, 'contest_id' | 'task_table_index' | 'task_id' | 'title' | 'grade'>[]> {
+  if (!selectedTaskIds?.length) {
+    return [];
+  }
+
+  const ids = Array.from(new Set(selectedTaskIds));
+
+  return await db.task.findMany({
+    where: {
+      task_id: { in: ids }, // SQL: WHERE task_id IN ('id1', 'id2', ...)
+    },
+    select: {
+      contest_id: true,
+      task_table_index: true,
+      task_id: true,
+      title: true,
+      grade: true,
+    },
+  });
+}
+
 export async function getTasksByTaskId(): Promise<Map<string, Task>> {
   const tasks = await db.task.findMany();
   const tasksMap = new Map();

src/lib/services/task_results.ts

@@ -2,4 +2,5 @@ export interface TaskAnswer {
   task_id: string;
   user_id: string;
   status_id: string;
+  updated_at: Date;
 }

src/lib/services/tasks.ts

@@ -9,12 +9,13 @@ const config = {
   preprocess: vitePreprocess(),
 
   kit: {
-    // adapter-auto only supports some environments, see https://kit.svelte.dev/docs/adapter-auto for a list.
-    // If your environment is not supported or you settled on a specific environment, switch out the adapter.
-    // See https://kit.svelte.dev/docs/adapters for more information about adapters.
+    // See:
+    // https://svelte.dev/docs/kit/adapter-vercel
     adapter: adapter({
-      // See: https://vercel.com/docs/edge-network/regions
+      runtime: 'nodejs22.x',
       regions: ['hnd1'], // Tokyo, Japan.
+      memory: 3008, // To avoid OOM errors on /workbooks/{slug}
+      maxDuration: 30,
     }),
     // See:
     // https://kit.svelte.dev/docs/configuration#alias