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

fix(backend): Falende testen gerepareerd.

Browse source
This commit is contained in:
Gerald Schmittinger 2025-04-08 10:25:30 +02:00
parent 3c3a1d89c6
commit fc675710b4
7 changed files with 34 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

16
backend/src/interfaces/group.ts
View file

@ -1,7 +1,7 @@
import { Group } from '../entities/assignments/group.entity.js';
import {mapToAssignment, mapToAssignmentDTO} from './assignment.js';
import {mapToAssignment, mapToAssignmentDTO, mapToAssignmentDTOId} from './assignment.js';
import {mapToStudent, mapToStudentDTO} from './student.js';
import { GroupDTO } from '@dwengo-1/common/interfaces/group';
import {GroupDTO} from '@dwengo-1/common/interfaces/group';
import {getGroupRepository} from "../data/repositories";
import {AssignmentDTO} from "@dwengo-1/common/interfaces/assignment";
import {Class} from "../entities/classes/class.entity";
@ -13,7 +13,7 @@ export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
return getGroupRepository().create({
groupNumber: groupDto.groupNumber,
assignment: mapToAssignment(assignmentDto, clazz),
members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO))
members: groupDto.members!.map(studentDto => mapToStudent(studentDto as StudentDTO))
});
}
@ -26,6 +26,16 @@ export function mapToGroupDTO(group: Group): GroupDTO {
}
export function mapToGroupDTOId(group: Group): GroupDTO {
return {
assignment: mapToAssignmentDTOId(group.assignment),
groupNumber: group.groupNumber!,
};
}
/**
* Map to group DTO where other objects are only referenced by their id.
*/
export function mapToShallowGroupDTO(group: Group): GroupDTO {
return {
assignment: group.assignment.id!,
groupNumber: group.groupNumber!,

4
backend/src/interfaces/question.ts
View file

@ -2,7 +2,7 @@ import { Question } from '../entities/questions/question.entity.js';
import { mapToStudentDTO } from './student.js';
import { QuestionDTO, QuestionId } from '@dwengo-1/common/interfaces/question';
import { LearningObjectIdentifier } from '@dwengo-1/common/interfaces/learning-content';
import {mapToGroupDTO} from "./group";
import { mapToGroupDTOId } from "./group";
function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
return {
@ -22,7 +22,7 @@ export function mapToQuestionDTO(question: Question): QuestionDTO {
learningObjectIdentifier,
sequenceNumber: question.sequenceNumber!,
author: mapToStudentDTO(question.author),
inGroup: mapToGroupDTO(question.inGroup),
inGroup: mapToGroupDTOId(question.inGroup),
timestamp: question.timestamp.toISOString(),
content: question.content,
};