Pull Request branch dev-clone to main #1

Merged
gitea merged 429 commits from dev-clone into main 2024-12-23 09:31:34 +00:00
Showing only changes of commit 08e60c6f2f - Show all commits

View File

@ -587,11 +587,14 @@ const assessmentsRoute = new Hono<HonoEnv>()
async (c) => {
const optionData = c.req.valid("json");
// Cek apakah jawaban sudah ada berdasarkan assessmentId
// Cek apakah jawaban sudah ada berdasarkan assessmentId dan optionId
const existingAnswer = await db
.select()
.from(answers)
.where(eq(answers.assessmentId, optionData.assessmentId))
.where(
sql`answers.assessmentId = ${optionData.assessmentId}
AND answers.optionId = ${optionData.optionId}`
) // Asumsi optionId berkaitan dengan questionId
.limit(1);
let answer;
@ -599,8 +602,15 @@ const assessmentsRoute = new Hono<HonoEnv>()
// Update jika jawaban sudah ada
answer = await db
.update(answers)
.set({ optionId: optionData.optionId }) // Ubah ke pilihan baru
.where(eq(answers.assessmentId, optionData.assessmentId))
.set({
optionId: optionData.optionId, // Ubah ke pilihan baru
isFlagged: optionData.isFlagged ?? existingAnswer[0].isFlagged, // Pertahankan flag jika tidak diubah
filename: optionData.filename ?? existingAnswer[0].filename // Pertahankan filename jika tidak diubah
})
.where(
sql`answers.assessmentId = ${optionData.assessmentId}
AND answers.optionId = ${optionData.optionId}`
) // Tambahkan kondisi untuk questionId
.returning();
} else {
// Insert jika belum ada jawaban