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

update: revision for endpoint get average score aspect and grouping sub aspect, revision permission access for assessments

Browse Source
This commit is contained in:
falendikategar 2024-10-17 09:20:58 +07:00
parent 9b71ecbef3
commit a799769af2
2 changed files with 65 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/backend/src/data/permissions.ts
View File

@ -83,13 +83,16 @@ const permissionsData = [
{ {
code: "assessmentResult.create", code: "assessmentResult.create",
}, },
{ {
code: "assessmentRequest.read", code: "assessmentRequest.read",
}, },
{ {
code: "assessmentRequest.create", code: "assessmentRequest.create",
}, },
{ {
code: "assessments.readAspect",
},
{
code: "assessments.readAssessmentScore", code: "assessments.readAssessmentScore",
}, },
{ {

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

@ -45,7 +45,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
// Get all aspects // Get all aspects
.get( .get(
"/aspect", "/aspect",
// checkPermission("managementAspect.readAll"), checkPermission("assessments.readAspect"),
requestValidator( requestValidator(
"query", "query",
z.object({ z.object({
@ -172,7 +172,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
// Get data for current Assessment Score from submitted options By Assessment Id // Get data for current Assessment Score from submitted options By Assessment Id
.get( .get(
"/getCurrentAssessmentScore", "/getCurrentAssessmentScore",
// checkPermission("assessments.readAssessmentScore"), checkPermission("assessments.readAssessmentScore"),
requestValidator( requestValidator(
"query", "query",
z.object({ z.object({
@ -599,7 +599,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
// Get data for One Sub Aspect average score By Sub Aspect Id and Assessment Id // Get data for One Sub Aspect average score By Sub Aspect Id and Assessment Id
.get( .get(
'/average-score/sub-aspects/:subAspectId/assessments/:assessmentId', '/average-score/sub-aspects/:subAspectId/assessments/:assessmentId',
// checkPermission("assessments.readAssessmentScore"), checkPermission("assessments.readAssessmentScore"),
async (c) => { async (c) => {
const { subAspectId, assessmentId } = c.req.param(); const { subAspectId, assessmentId } = c.req.param();
@ -630,7 +630,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
// Get data for All Sub Aspects average score By Assessment Id // Get data for All Sub Aspects average score By Assessment Id
.get( .get(
'/average-score/sub-aspects/assessments/:assessmentId', '/average-score/sub-aspects/assessments/:assessmentId',
// checkPermission("assessments.readAssessmentScore"), checkPermission("assessments.readAssessmentScore"),
async (c) => { async (c) => {
const { assessmentId } = c.req.param(); const { assessmentId } = c.req.param();
@ -664,7 +664,7 @@ const assessmentsRoute = new Hono<HonoEnv>()
// Get data for One Aspect average score By Aspect Id and Assessment Id // Get data for One Aspect average score By Aspect Id and Assessment Id
.get( .get(
"/average-score/aspects/:aspectId/assessments/:assessmentId", "/average-score/aspects/:aspectId/assessments/:assessmentId",
// checkPermission("assessments.readAverageAspect"), checkPermission("assessments.readAssessmentScore"),
async (c) => { async (c) => {
const { aspectId, assessmentId } = c.req.param(); const { aspectId, assessmentId } = c.req.param();
@ -693,36 +693,63 @@ const assessmentsRoute = new Hono<HonoEnv>()
} }
) )
// Get data for All Aspects average score By Assessment Id // Get data for Aspects average score and all related Sub Aspects average score By Assessment Id
.get( .get(
'/average-score/aspects/assessments/:assessmentId', '/average-score/aspects/assessments/:assessmentId',
// checkPermission("assessments.readAssessmentScore"), checkPermission("assessments.readAssessmentScore"),
async (c) => { async (c) => {
const { assessmentId } = c.req.param(); const { assessmentId } = c.req.param();
const averageScores = await db // Query untuk mendapatkan average score per aspect
.select({ const aspectScores = await db
AspectId: aspects.id, .select({
AspectName: aspects.name, aspectId: aspects.id,
average: sql`AVG(options.score)` aspectName: aspects.name,
}) averageScore: sql`AVG(options.score)`,
.from(answers) })
.innerJoin(options, eq(answers.optionId, options.id)) .from(answers)
.innerJoin(questions, eq(options.questionId, questions.id)) .innerJoin(options, eq(answers.optionId, options.id))
.innerJoin(subAspects, eq(questions.subAspectId, subAspects.id)) .innerJoin(questions, eq(options.questionId, questions.id))
.innerJoin(aspects, eq(subAspects.aspectId, aspects.id)) .innerJoin(subAspects, eq(questions.subAspectId, subAspects.id))
.innerJoin(assessments, eq(answers.assessmentId, assessments.id)) .innerJoin(aspects, eq(subAspects.aspectId, aspects.id))
.where(eq(assessments.id, assessmentId)) .innerJoin(assessments, eq(answers.assessmentId, assessments.id))
.groupBy(aspects.id); .where(eq(assessments.id, assessmentId))
.groupBy(aspects.id);
return c.json({
assessmentId, // Query untuk mendapatkan average score per sub-aspect
aspects: averageScores.map(score => ({ const subAspectScores = await db
AspectId: score.AspectId, .select({
AspectName: score.AspectName, aspectId: subAspects.aspectId,
averageScore: score.average subAspectId: subAspects.id,
})) subAspectName: subAspects.name,
}); averageScore: sql`AVG(options.score)`,
})
.from(answers)
.innerJoin(options, eq(answers.optionId, options.id))
.innerJoin(questions, eq(options.questionId, questions.id))
.innerJoin(subAspects, eq(questions.subAspectId, subAspects.id))
.innerJoin(assessments, eq(answers.assessmentId, assessments.id))
.where(eq(assessments.id, assessmentId))
.groupBy(subAspects.id);
// Menggabungkan sub-aspects ke dalam masing-masing aspect
const aspectsWithSubAspects = aspectScores.map((aspect) => ({
aspectId: aspect.aspectId,
aspectName: aspect.aspectName,
averageScore: aspect.averageScore,
subAspects: subAspectScores
.filter((sub) => sub.aspectId === aspect.aspectId)
.map((sub) => ({
subAspectId: sub.subAspectId,
subAspectName: sub.subAspectName,
averageScore: sub.averageScore,
})),
}));
return c.json({
assessmentId,
aspects: aspectsWithSubAspects,
});
} }
) )