gitea/amati
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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
Conversation 0 Commits 429 Files Changed 142 +7 -7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f3eaf16df8 - Show all commits

10
apps/backend/src/routes/assessments/route.ts
View File

@ -393,6 +393,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
.select({
id: answers.id,
assessmentId: answers.assessmentId,
questionId: options.questionId,
optionId: answers.optionId,
isFlagged: answers.isFlagged,
filename: answers.filename,
@ -400,6 +401,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
fullCount: totalCountQuery,
})
.from(answers)
.leftJoin(options, eq(answers.optionId, options.id))
.where(
and(
eq(answers.assessmentId, assessmentId), // Filter by assessmentId
@ -435,21 +437,19 @@ const assessmentsRoute = new Hono<HonoEnv>()
async (c) => {
const assessmentId = c.req.param("assessmentId"); // Retrieve assessmentId from the URL
// if (!assessmentId) {
// return c.json({ error: "assessmentId is required" }, 400);
// }
// Query to retrieve answers for the specific assessmentId
// Query to retrieve answers for the specific assessmentId, including the associated questionId
const result = await db
.select({
id: answers.id,
assessmentId: answers.assessmentId,
questionId: options.questionId, // Get the questionId from the options table
optionId: answers.optionId,
isFlagged: answers.isFlagged,
filename: answers.filename,
validationInformation: answers.validationInformation,
})
.from(answers)
.leftJoin(options, eq(answers.optionId, options.id)) // Join with the options table
.where(eq(answers.assessmentId, assessmentId)); // Filter by assessmentId
return c.json({