From 046f0c6bd877561de6de116622f5fdae14e68e6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Minelli?= <michael@minelli.me> Date: Wed, 21 Feb 2024 21:22:05 +0100 Subject: [PATCH] Assignment => Corrige: include members --- .../Prisma/Extensions/AssignmentResultExtension.ts | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/ExpressAPI/src/helpers/Prisma/Extensions/AssignmentResultExtension.ts b/ExpressAPI/src/helpers/Prisma/Extensions/AssignmentResultExtension.ts index 56819c9..a5f8139 100644 --- a/ExpressAPI/src/helpers/Prisma/Extensions/AssignmentResultExtension.ts +++ b/ExpressAPI/src/helpers/Prisma/Extensions/AssignmentResultExtension.ts @@ -4,16 +4,21 @@ import db from '../../DatabaseHelper'; import LazyVal from '../../../shared/helpers/LazyVal'; -async function getCorrections(assignment: { name: string }): Promise<Array<Exercise> | undefined> { +async function getCorrections(assignment: { name: string }): Promise<Array<Partial<Exercise>> | undefined> { try { return await db.exercise.findMany({ - where: { + where : { assignmentName : assignment.name, correctionCommit: { not: Prisma.JsonNull } + }, + include: { + assignment: false, + members : true, + results : false } - }) as Array<Exercise> ?? undefined; + }) as Array<Partial<Exercise>> ?? undefined; } catch ( e ) { return undefined; } @@ -25,7 +30,7 @@ export default Prisma.defineExtension(client => { assignment: { corrections: { compute(assignment) { - return new LazyVal<Array<Exercise> | undefined>(() => { + return new LazyVal<Array<Partial<Exercise>> | undefined>(() => { return getCorrections(assignment); }); } -- GitLab