Merge pull request #1209 from AtCoder-NoviSteps/#1202

🐛 Fixed bug that caused updates to fail due to unique constraint violations (#1202)

Author: KATO-Hiro

src/lib/actions/update_task_result.ts

@@ -26,7 +26,7 @@ export const updateTaskResult = async (
 
     await crud.updateTaskResult(taskId, submissionStatus, userId);
   } catch (error) {
-    console.log('Failed to update task result: ', error);
+    console.error('Failed to update task result: ', error);
     return fail(BAD_REQUEST);
   }
 };

src/lib/services/answers.ts

@@ -1,18 +1,5 @@
-//import { answers } from '$lib/server/sample_data';
-//import taskAnswerSchema from '$lib/server/taskanswer';
-
-//server/databaseのインポートでは保存がうまくいかず。
-//import { PrismaClient } from '@prisma/client';
-//import {defineTaskAnswerFactory } from '../../../prisma/.fabbrica';
-// import { PrismaClient } from '@prisma/client';
-// prisma.taskAnswer.createが実行できれば、defineTaskAnswerFactoryをインポートしなくて済むはずです。
-// また、initializeは、内部メソッドを直接インポートすることで対処できそうです。
-
 import { initialize } from '@quramy/prisma-fabbrica/lib/internal';
-//import { initialize, defineTaskAnswerFactory } from '../../__generated__/fabbrica';
 
-//import { default as prisma } from '$lib/server/database';
-//const prisma = new PrismaClient();
 import { default as prisma } from '$lib/server/database';
 import type { TaskAnswer } from '@prisma/client';
 import { sha256 } from '$lib/utils/hash';
@@ -64,7 +51,6 @@ export async function getAnswer(task_id: string, user_id: string) {
   return answers_from_db[0];
 }
 
-// TODO: createAnswer()
 export async function createAnswer(task_id: string, user_id: string, status_id: string) {
   const id = await sha256(task_id + user_id);
   const taskanswerInput: TaskAnswer = {
@@ -76,13 +62,42 @@ export async function createAnswer(task_id: string, user_id: string, status_id:
     updated_at: new Date(),
   };
 
-  //const taskAnswerFactory = defineTaskAnswerFactory();
   const taskAnswer = await prisma.taskAnswer.create({
     data: taskanswerInput,
   });
 
   return taskAnswer;
 }
 
+export async function upsertAnswer(taskId: string, userId: string, statusId: string) {
+  try {
+    const id = await sha256(taskId + userId);
+    const newAnswer = {
+      id: id,
+      task_id: taskId,
+      user_id: userId,
+      status_id: statusId,
+      created_at: new Date(),
+      updated_at: new Date(),
+    };
+
+    await prisma.taskAnswer.upsert({
+      where: {
+        task_id_user_id: { task_id: taskId, user_id: userId },
+      },
+      update: {
+        status_id: statusId,
+      },
+      create: newAnswer, // await createAnswer(taskId, userId, statusId)とすると、一意制約違反(P2002)が発生するため
+    });
+  } catch (error) {
+    console.error(
+      `Failed to update answer with taskId ${taskId}, userId ${userId}, statusId: ${statusId}:`,
+      error,
+    );
+    throw error;
+  }
+}
+
 // TODO: updateAnswer()
 // TODO: deleteAnswer()

src/lib/services/task_results.ts

@@ -1,13 +1,16 @@
 import { error } from '@sveltejs/kit';
+
+import { default as db } from '$lib/server/database';
 import { getTasks, getTask } from '$lib/services/tasks';
-import * as answer_crud from './answers';
-import type { TaskResult, TaskResults, Tasks } from '$lib/types/task';
+import * as answer_crud from '$lib/services/answers';
+
+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 { NOT_FOUND } from '$lib/constants/http-response-status-codes';
-import { default as db } from '$lib/server/database';
 import { getSubmissionStatusMapWithId, getSubmissionStatusMapWithName } from './submission_status';
-import type { TaskAnswer } from '../types/answer';
 
 // DBから取得した問題一覧とログインしているユーザの回答を紐付けしたデータ保持
 const statusById = await getSubmissionStatusMapWithId();
@@ -170,29 +173,19 @@ export async function getTaskResult(slug: string, userId: string) {
   return taskResult;
 }
 
-export async function updateTaskResult(slug: string, submissionStatus: string, userId: string) {
-  const taskResult: TaskResult | null = await getTaskResult(slug, userId);
-
-  if (taskResult) {
-    const status_id = statusByName.get(submissionStatus).id;
+export async function updateTaskResult(taskId: string, submissionStatus: string, userId: string) {
+  const taskResult: TaskResult | null = await getTaskResult(taskId, userId);
 
-    const registeredTaskAnswer = await db.taskAnswer.findMany({
-      where: { task_id: slug, user_id: userId },
-    });
+  if (!taskResult) {
+    console.error(`Failed to get task result for taskId ${taskId} and userId ${userId}`);
+    return;
+  }
 
-    if (registeredTaskAnswer.length == 0) {
-      await answer_crud.createAnswer(slug, userId, status_id);
-    }
+  const statusId = statusByName.get(submissionStatus).id;
 
-    await db.taskAnswer.update({
-      where: {
-        task_id_user_id: { task_id: slug, user_id: userId },
-      },
-      data: {
-        status_id: status_id,
-      },
-    });
-  }
+  await db.$transaction(async () => {
+    await answer_crud.upsertAnswer(taskId, userId, statusId);
+  });
 }
 
 export async function getTasksWithTagIds(