diff --git a/ExpressAPI/src/helpers/Prisma/Extensions/AssignmentResultExtension.ts b/ExpressAPI/src/helpers/Prisma/Extensions/AssignmentResultExtension.ts index 56819c91d853807036d4848fd6b9fbefcc128792..a5f813993c56c3d5c4824854231a2a6486cddd3b 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); }); }