tdpeuter/2025SELab2-project-Dwengo
tdpeuter/2025SELab2-project-Dwengo
1
Fork 0
Code Issues Releases 4 Packages 2 Wiki Activity

fix(backend): Fouten resulterend uit refactoring opgelost.

Browse source
This commit is contained in:
Gerald Schmittinger 2025-04-14 18:56:32 +02:00
parent 8c096ffa15
commit f4fda7db5d
3 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
backend/src/data/questions/question-repository.ts
View file

@ -5,6 +5,7 @@ import { Student } from '../../entities/users/student.entity.js';
import { LearningObject } from '../../entities/content/learning-object.entity.js'; import { LearningObject } from '../../entities/content/learning-object.entity.js';
import { Assignment } from '../../entities/assignments/assignment.entity.js'; import { Assignment } from '../../entities/assignments/assignment.entity.js';
import { Loaded } from '@mikro-orm/core'; import { Loaded } from '@mikro-orm/core';
import {Group} from "../../entities/assignments/group.entity";
export class QuestionRepository extends DwengoEntityRepository<Question> { export class QuestionRepository extends DwengoEntityRepository<Question> {
public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> { public async createQuestion(question: { loId: LearningObjectIdentifier; author: Student; content: string }): Promise<Question> {
@ -59,7 +60,7 @@ export class QuestionRepository extends DwengoEntityRepository<Question> {
public async findAllByAssignment(assignment: Assignment): Promise<Question[]> { public async findAllByAssignment(assignment: Assignment): Promise<Question[]> {
return this.find({ return this.find({
author: assignment.groups.flatMap((group) => group.members), author: assignment.groups.toArray<Group>().flatMap((group) => group.members),
learningObjectHruid: assignment.learningPathHruid, learningObjectHruid: assignment.learningPathHruid,
learningObjectLanguage: assignment.learningPathLanguage, learningObjectLanguage: assignment.learningPathLanguage,
}); });

2
backend/src/interfaces/submission.ts
View file

@ -17,7 +17,7 @@ export function mapToSubmissionDTO(submission: Submission): SubmissionDTO {
submissionNumber: submission.submissionNumber, submissionNumber: submission.submissionNumber,
submitter: mapToStudentDTO(submission.submitter), submitter: mapToStudentDTO(submission.submitter),
time: submission.submissionTime, time: submission.submissionTime,
group: submission.onBehalfOf ? mapToGroupDTO(submission.onBehalfOf) : undefined, group: submission.onBehalfOf ? mapToGroupDTO(submission.onBehalfOf, submission.onBehalfOf.assignment.within) : undefined,
content: submission.content, content: submission.content,
}; };
} }

4
backend/src/services/students.ts
View file

@ -98,10 +98,10 @@ export async function getStudentGroups(username: string, full: boolean): Promise
const groups = await groupRepository.findAllGroupsWithStudent(student); const groups = await groupRepository.findAllGroupsWithStudent(student);
if (full) { if (full) {
return groups.map(mapToGroupDTO); return groups.map(group => mapToGroupDTO(group, group.assignment.within));
} }
return groups.map(mapToGroupDTOId); return groups.map(group => mapToGroupDTOId(group, group.assignment.within));
} }
export async function getStudentSubmissions(username: string, full: boolean): Promise<SubmissionDTO[] | SubmissionDTOId[]> { export async function getStudentSubmissions(username: string, full: boolean): Promise<SubmissionDTO[] | SubmissionDTOId[]> {