feat(backend): Functionaliteit toegevoegd om alle submissions zichtbaar voor een bepaalde leerling of leerkracht op te vragen.

This commit is contained in:
Gerald Schmittinger 2025-04-07 19:23:46 +02:00
parent 03fa7c7b14
commit 9135b9c5b0
9 changed files with 338 additions and 156 deletions

View file

@ -6,6 +6,19 @@ export class AssignmentRepository extends DwengoEntityRepository<Assignment> {
public async findByClassAndId(within: Class, id: number): Promise<Assignment | null> {
return this.findOne({ within: within, id: id });
}
public async findAllByResponsibleTeacher(teacherUsername: string): Promise<Assignment[]> {
return this.findAll({
where: {
within: {
teachers: {
$some: {
username: teacherUsername
}
}
}
}
});
}
public async findAllAssignmentsInClass(within: Class): Promise<Assignment[]> {
return this.findAll({ where: { within: within } });
}

View file

@ -3,6 +3,7 @@ import { Group } from '../../entities/assignments/group.entity.js';
import { Submission } from '../../entities/assignments/submission.entity.js';
import { LearningObjectIdentifier } from '../../entities/content/learning-object-identifier.js';
import { Student } from '../../entities/users/student.entity.js';
import {Assignment} from "../../entities/assignments/assignment.entity";
export class SubmissionRepository extends DwengoEntityRepository<Submission> {
public async findSubmissionByLearningObjectAndSubmissionNumber(
@ -50,6 +51,30 @@ export class SubmissionRepository extends DwengoEntityRepository<Submission> {
);
}
public async findAllSubmissionsForAllGroupsOfStudent(studentUsername: string): Promise<Submission[]> {
return this.findAll({
where: {
onBehalfOf: {
members: {
$some: {
username: studentUsername
}
},
}
}
});
}
public async findAllSubmissionsForAssignment(assignment: Assignment): Promise<Submission[]> {
return this.findAll({
where: {
onBehalfOf: {
assignment
}
}
});
}
public async findAllSubmissionsForStudent(student: Student): Promise<Submission[]> {
return this.find(
{ submitter: student },

View file

@ -1,4 +1,4 @@
import { Entity, ManyToMany, ManyToOne, PrimaryKey } from '@mikro-orm/core';
import {Collection, Entity, ManyToMany, ManyToOne, PrimaryKey} from '@mikro-orm/core';
import { Assignment } from './assignment.entity.js';
import { Student } from '../users/student.entity.js';
import { GroupRepository } from '../../data/assignments/group-repository.js';
@ -19,5 +19,5 @@ export class Group {
@ManyToMany({
entity: () => Student,
})
members!: Student[];
members!: Collection<Student>;
}

View file

@ -31,6 +31,13 @@ describe('AssignmentRepository', () => {
expect(assignments[0].title).toBe('tool');
});
it('should find all by username of the responsible teacher', async () => {
const result = await assignmentRepository.findAllByResponsibleTeacher("FooFighters")
const resultIds = result.map(it => it.id).sort();
expect(resultIds).toEqual([1, 3, 4]);
});
it('should not find removed assignment', async () => {
const class_ = await classRepository.findById('id01');
await assignmentRepository.deleteByClassAndId(class_!, 3);

View file

@ -1,6 +1,6 @@
import { beforeAll, describe, expect, it } from 'vitest';
import { setupTestApp } from '../../setup-tests';
import { SubmissionRepository } from '../../../src/data/assignments/submission-repository';
import {beforeAll, describe, expect, it} from 'vitest';
import {setupTestApp} from '../../setup-tests';
import {SubmissionRepository} from '../../../src/data/assignments/submission-repository';
import {
getAssignmentRepository,
getClassRepository,
@ -8,12 +8,32 @@ import {
getStudentRepository,
getSubmissionRepository,
} from '../../../src/data/repositories';
import { LearningObjectIdentifier } from '../../../src/entities/content/learning-object-identifier';
import { Language } from '@dwengo-1/common/util/language';
import { StudentRepository } from '../../../src/data/users/student-repository';
import { GroupRepository } from '../../../src/data/assignments/group-repository';
import { AssignmentRepository } from '../../../src/data/assignments/assignment-repository';
import { ClassRepository } from '../../../src/data/classes/class-repository';
import {LearningObjectIdentifier} from '../../../src/entities/content/learning-object-identifier';
import {Language} from '@dwengo-1/common/util/language';
import {StudentRepository} from '../../../src/data/users/student-repository';
import {GroupRepository} from '../../../src/data/assignments/group-repository';
import {AssignmentRepository} from '../../../src/data/assignments/assignment-repository';
import {ClassRepository} from '../../../src/data/classes/class-repository';
import {Submission} from "../../../src/entities/assignments/submission.entity";
export function checkSubmissionsForStudentNoordkaap(result: Submission[]) {
sortSubmissions(result);
expect(result[0].learningObjectHruid).toBe("id01");
expect(result[0].submissionNumber).toBe(2);
expect(result[1].learningObjectHruid).toBe("id02");
expect(result[1].submissionNumber).toBe(1);
expect(result[2].learningObjectHruid).toBe("id02");
expect(result[2].submissionNumber).toBe(2);
expect(result[3].learningObjectHruid).toBe("id03");
expect(result[3].submissionNumber).toBe(1);
expect(result[4].learningObjectHruid).toBe("id03");
expect(result[4].submissionNumber).toBe(2);
}
describe('SubmissionRepository', () => {
let submissionRepository: SubmissionRepository;
@ -59,6 +79,42 @@ describe('SubmissionRepository', () => {
expect(submission?.submissionTime.getDate()).toBe(25);
});
it('should find all submissions for all groups of a student', async () => {
const result = await submissionRepository.findAllSubmissionsForAllGroupsOfStudent("Noordkaap");
expect(result.length).toBe(5);
checkSubmissionsForStudentNoordkaap(result);
});
it('should find all submissions for a certain assignment', async () => {
const clazz = await classRepository.findById('id01');
const assignment = await assignmentRepository.findByClassAndId(clazz!, 1);
const result = await submissionRepository.findAllSubmissionsForAssignment(assignment!);
sortSubmissions(result);
expect(result).toHaveLength(5);
expect(result[0].learningObjectHruid).toBe("id01");
expect(result[0].submissionNumber).toBe(1);
expect(result[1].learningObjectHruid).toBe("id02");
expect(result[1].submissionNumber).toBe(1);
expect(result[2].learningObjectHruid).toBe("id02");
expect(result[2].submissionNumber).toBe(2);
expect(result[3].learningObjectHruid).toBe("id03");
expect(result[3].submissionNumber).toBe(1);
expect(result[4].learningObjectHruid).toBe("id03");
expect(result[4].submissionNumber).toBe(2);
// But not submission7 (id01, submission number: 3), since it was submitted for an assignment
sortSubmissions(result);
});
it('should not find a deleted submission', async () => {
const id = new LearningObjectIdentifier('id01', Language.English, 1);
await submissionRepository.deleteSubmissionByLearningObjectAndSubmissionNumber(id, 1);
@ -68,3 +124,11 @@ describe('SubmissionRepository', () => {
expect(submission).toBeNull();
});
});
function sortSubmissions(submissions: Submission[]) {
submissions.sort((a, b) => {
if (a.learningObjectHruid < b.learningObjectHruid) return -1;
if (a.learningObjectHruid > b.learningObjectHruid) return 1;
return a.submissionNumber! - b.submissionNumber!;
});
}

View file

@ -34,5 +34,15 @@ export function makeTestAssignemnts(em: EntityManager, classes: Class[]): Assign
groups: [],
});
return [assignment01, assignment02, assignment03];
const assignment04 = em.create(Assignment, {
within: classes[0],
id: 4,
title: 'another assignment',
description: 'with a description',
learningPathHruid: 'id01',
learningPathLanguage: Language.English,
groups: [],
});
return [assignment01, assignment02, assignment03, assignment04];
}

View file

@ -28,5 +28,11 @@ export function makeTestGroups(em: EntityManager, students: Student[], assignmen
members: students.slice(3, 4),
});
return [group01, group02, group03, group04];
const group05 = em.create(Group, {
assignment: assignments[3],
groupNumber: 1,
members: students.slice(0, 2),
});
return [group01, group02, group03, group04, group05];
}

View file

@ -60,5 +60,27 @@ export function makeTestSubmissions(em: EntityManager, students: Student[], grou
content: '',
});
return [submission01, submission02, submission03, submission04, submission05];
const submission06 = em.create(Submission, {
learningObjectHruid: 'id01',
learningObjectLanguage: Language.English,
learningObjectVersion: 1,
submissionNumber: 2,
submitter: students[1],
submissionTime: new Date(2025, 2, 25),
onBehalfOf: groups[4],
content: '',
});
const submission07 = em.create(Submission, {
learningObjectHruid: 'id01',
learningObjectLanguage: Language.English,
learningObjectVersion: 1,
submissionNumber: 3,
submitter: students[3],
submissionTime: new Date(2025, 3, 25),
onBehalfOf: groups[3],
content: '',
});
return [submission01, submission02, submission03, submission04, submission05, submission06, submission07];
}

319
package-lock.json generated
View file

@ -72,6 +72,133 @@
"vitest": "^3.0.6"
}
},
"backend/node_modules/@mikro-orm/cli": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/cli/-/cli-6.4.9.tgz",
"integrity": "sha512-LQzVsmar/0DoJkPGyz3OpB8pa9BCQtvYreEC71h0O+RcizppJjgBQNTkj5tJd2Iqvh4hSaMv6qTv0l5UK6F2Vw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@jercle/yargonaut": "1.1.5",
"@mikro-orm/core": "6.4.9",
"@mikro-orm/knex": "6.4.9",
"fs-extra": "11.3.0",
"tsconfig-paths": "4.2.0",
"yargs": "17.7.2"
},
"bin": {
"mikro-orm": "cli",
"mikro-orm-esm": "esm"
},
"engines": {
"node": ">= 18.12.0"
}
},
"backend/node_modules/@mikro-orm/core": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/core/-/core-6.4.9.tgz",
"integrity": "sha512-osB2TbvSH4ZL1s62LCBQFAnxPqLycX5fakPHOoztudixqfbVD5QQydeGizJXMMh2zKP6vRCwIJy3MeSuFxPjHg==",
"license": "MIT",
"dependencies": {
"dataloader": "2.2.3",
"dotenv": "16.4.7",
"esprima": "4.0.1",
"fs-extra": "11.3.0",
"globby": "11.1.0",
"mikro-orm": "6.4.9",
"reflect-metadata": "0.2.2"
},
"engines": {
"node": ">= 18.12.0"
},
"funding": {
"url": "https://github.com/sponsors/b4nan"
}
},
"backend/node_modules/@mikro-orm/knex": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/knex/-/knex-6.4.9.tgz",
"integrity": "sha512-iGXJfe/TziVOQsWuxMIqkOpurysWzQA6kj3+FDtOkHJAijZhqhjSBnfUVHHY/JzU9o0M0rgLrDVJFry/uEaJEA==",
"license": "MIT",
"dependencies": {
"fs-extra": "11.3.0",
"knex": "3.1.0",
"sqlstring": "2.3.3"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0",
"better-sqlite3": "*",
"libsql": "*",
"mariadb": "*"
},
"peerDependenciesMeta": {
"better-sqlite3": {
"optional": true
},
"libsql": {
"optional": true
},
"mariadb": {
"optional": true
}
}
},
"backend/node_modules/@mikro-orm/postgresql": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/postgresql/-/postgresql-6.4.9.tgz",
"integrity": "sha512-ZdVVFAL/TSbzpEmChGdH0oUpy2KiHLjNIeItZHRQgInn1X9p0qx28VVDR78p8qgRGkQ3LquxGTkvmWI0w7qi3A==",
"license": "MIT",
"dependencies": {
"@mikro-orm/knex": "6.4.9",
"pg": "8.13.3",
"postgres-array": "3.0.4",
"postgres-date": "2.1.0",
"postgres-interval": "4.0.2"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
}
},
"backend/node_modules/@mikro-orm/reflection": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/reflection/-/reflection-6.4.9.tgz",
"integrity": "sha512-fgY7yLrcZm3J/8dv9reUC4PQo7C2muImU31jmzz1SxmNKPJFDJl7OzcDZlM5NOisXzsWUBrcNdCyuQiWViVc3A==",
"license": "MIT",
"dependencies": {
"globby": "11.1.0",
"ts-morph": "25.0.1"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
}
},
"backend/node_modules/@mikro-orm/sqlite": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/sqlite/-/sqlite-6.4.9.tgz",
"integrity": "sha512-O7Jy/5DrTWpJI/3qkhRJHl+OcECx1N625LHDODAAauOK3+MJB/bj80TrvQhe6d/CHZMmvxZ7m2GzaL1NulKxRw==",
"license": "MIT",
"dependencies": {
"@mikro-orm/knex": "6.4.9",
"fs-extra": "11.3.0",
"sqlite3": "5.1.7",
"sqlstring-sqlite": "0.1.1"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
}
},
"backend/node_modules/globals": {
"version": "15.15.0",
"resolved": "https://registry.npmjs.org/globals/-/globals-15.15.0.tgz",
@ -85,6 +212,48 @@
"url": "https://github.com/sponsors/sindresorhus"
}
},
"backend/node_modules/mikro-orm": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/mikro-orm/-/mikro-orm-6.4.9.tgz",
"integrity": "sha512-XwVrWNT4NNwS6kHIKFNDfvy8L1eWcBBEHeTVzFFYcnb2ummATaLxqeVkNEmKA68jmdtfQdUmWBqGdbcIPwtL2Q==",
"license": "MIT",
"engines": {
"node": ">= 18.12.0"
}
},
"backend/node_modules/pg": {
"version": "8.13.3",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.13.3.tgz",
"integrity": "sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==",
"license": "MIT",
"dependencies": {
"pg-connection-string": "^2.7.0",
"pg-pool": "^3.7.1",
"pg-protocol": "^1.7.1",
"pg-types": "^2.1.0",
"pgpass": "1.x"
},
"engines": {
"node": ">= 8.0.0"
},
"optionalDependencies": {
"pg-cloudflare": "^1.1.1"
},
"peerDependencies": {
"pg-native": ">=3.0.1"
},
"peerDependenciesMeta": {
"pg-native": {
"optional": true
}
}
},
"backend/node_modules/pg-connection-string": {
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
"integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==",
"license": "MIT"
},
"common": {
"name": "@dwengo-1/common",
"version": "0.1.1"
@ -1816,133 +1985,6 @@
"jsep": "^0.4.0||^1.0.0"
}
},
"node_modules/@mikro-orm/cli": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/cli/-/cli-6.4.9.tgz",
"integrity": "sha512-LQzVsmar/0DoJkPGyz3OpB8pa9BCQtvYreEC71h0O+RcizppJjgBQNTkj5tJd2Iqvh4hSaMv6qTv0l5UK6F2Vw==",
"dev": true,
"license": "MIT",
"dependencies": {
"@jercle/yargonaut": "1.1.5",
"@mikro-orm/core": "6.4.9",
"@mikro-orm/knex": "6.4.9",
"fs-extra": "11.3.0",
"tsconfig-paths": "4.2.0",
"yargs": "17.7.2"
},
"bin": {
"mikro-orm": "cli",
"mikro-orm-esm": "esm"
},
"engines": {
"node": ">= 18.12.0"
}
},
"node_modules/@mikro-orm/core": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/core/-/core-6.4.9.tgz",
"integrity": "sha512-osB2TbvSH4ZL1s62LCBQFAnxPqLycX5fakPHOoztudixqfbVD5QQydeGizJXMMh2zKP6vRCwIJy3MeSuFxPjHg==",
"license": "MIT",
"dependencies": {
"dataloader": "2.2.3",
"dotenv": "16.4.7",
"esprima": "4.0.1",
"fs-extra": "11.3.0",
"globby": "11.1.0",
"mikro-orm": "6.4.9",
"reflect-metadata": "0.2.2"
},
"engines": {
"node": ">= 18.12.0"
},
"funding": {
"url": "https://github.com/sponsors/b4nan"
}
},
"node_modules/@mikro-orm/knex": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/knex/-/knex-6.4.9.tgz",
"integrity": "sha512-iGXJfe/TziVOQsWuxMIqkOpurysWzQA6kj3+FDtOkHJAijZhqhjSBnfUVHHY/JzU9o0M0rgLrDVJFry/uEaJEA==",
"license": "MIT",
"dependencies": {
"fs-extra": "11.3.0",
"knex": "3.1.0",
"sqlstring": "2.3.3"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0",
"better-sqlite3": "*",
"libsql": "*",
"mariadb": "*"
},
"peerDependenciesMeta": {
"better-sqlite3": {
"optional": true
},
"libsql": {
"optional": true
},
"mariadb": {
"optional": true
}
}
},
"node_modules/@mikro-orm/postgresql": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/postgresql/-/postgresql-6.4.9.tgz",
"integrity": "sha512-ZdVVFAL/TSbzpEmChGdH0oUpy2KiHLjNIeItZHRQgInn1X9p0qx28VVDR78p8qgRGkQ3LquxGTkvmWI0w7qi3A==",
"license": "MIT",
"dependencies": {
"@mikro-orm/knex": "6.4.9",
"pg": "8.13.3",
"postgres-array": "3.0.4",
"postgres-date": "2.1.0",
"postgres-interval": "4.0.2"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
}
},
"node_modules/@mikro-orm/reflection": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/reflection/-/reflection-6.4.9.tgz",
"integrity": "sha512-fgY7yLrcZm3J/8dv9reUC4PQo7C2muImU31jmzz1SxmNKPJFDJl7OzcDZlM5NOisXzsWUBrcNdCyuQiWViVc3A==",
"license": "MIT",
"dependencies": {
"globby": "11.1.0",
"ts-morph": "25.0.1"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
}
},
"node_modules/@mikro-orm/sqlite": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/@mikro-orm/sqlite/-/sqlite-6.4.9.tgz",
"integrity": "sha512-O7Jy/5DrTWpJI/3qkhRJHl+OcECx1N625LHDODAAauOK3+MJB/bj80TrvQhe6d/CHZMmvxZ7m2GzaL1NulKxRw==",
"license": "MIT",
"dependencies": {
"@mikro-orm/knex": "6.4.9",
"fs-extra": "11.3.0",
"sqlite3": "5.1.7",
"sqlstring-sqlite": "0.1.1"
},
"engines": {
"node": ">= 18.12.0"
},
"peerDependencies": {
"@mikro-orm/core": "^6.0.0"
}
},
"node_modules/@napi-rs/snappy-android-arm-eabi": {
"version": "7.2.2",
"resolved": "https://registry.npmjs.org/@napi-rs/snappy-android-arm-eabi/-/snappy-android-arm-eabi-7.2.2.tgz",
@ -7849,15 +7891,6 @@
"node": ">=8.6"
}
},
"node_modules/mikro-orm": {
"version": "6.4.9",
"resolved": "https://registry.npmjs.org/mikro-orm/-/mikro-orm-6.4.9.tgz",
"integrity": "sha512-XwVrWNT4NNwS6kHIKFNDfvy8L1eWcBBEHeTVzFFYcnb2ummATaLxqeVkNEmKA68jmdtfQdUmWBqGdbcIPwtL2Q==",
"license": "MIT",
"engines": {
"node": ">= 18.12.0"
}
},
"node_modules/mime-db": {
"version": "1.54.0",
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz",
@ -8649,14 +8682,15 @@
"license": "MIT"
},
"node_modules/pg": {
"version": "8.13.3",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.13.3.tgz",
"integrity": "sha512-P6tPt9jXbL9HVu/SSRERNYaYG++MjnscnegFh9pPHihfoBSujsrka0hyuymMzeJKFWrcG8wvCKy8rCe8e5nDUQ==",
"version": "8.14.1",
"resolved": "https://registry.npmjs.org/pg/-/pg-8.14.1.tgz",
"integrity": "sha512-0TdbqfjwIun9Fm/r89oB7RFQ0bLgduAhiIqIXOsyKoiC/L54DbuAAzIEN/9Op0f1Po9X7iCPXGoa/Ah+2aI8Xw==",
"license": "MIT",
"peer": true,
"dependencies": {
"pg-connection-string": "^2.7.0",
"pg-pool": "^3.7.1",
"pg-protocol": "^1.7.1",
"pg-pool": "^3.8.0",
"pg-protocol": "^1.8.0",
"pg-types": "^2.1.0",
"pgpass": "1.x"
},
@ -8762,7 +8796,8 @@
"version": "2.7.0",
"resolved": "https://registry.npmjs.org/pg-connection-string/-/pg-connection-string-2.7.0.tgz",
"integrity": "sha512-PI2W9mv53rXJQEOb8xNR8lH7Hr+EKa6oJa38zsK0S/ky2er16ios1wLKhZyxzD7jUReiWokc9WK5nxSnC7W1TA==",
"license": "MIT"
"license": "MIT",
"peer": true
},
"node_modules/pgpass": {
"version": "1.0.5",