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

fix(backend): Verdere door de aanpassingen veroorzaakte compilatiefouten opgelost

Browse source
This commit is contained in:
Gerald Schmittinger 2025-04-07 00:44:20 +02:00
parent f9b83bc4af
commit b1df95da63
7 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,21 @@
import { Group } from '../entities/assignments/group.entity.js';
import { mapToAssignmentDTO } from './assignment.js';
import { mapToStudentDTO } from './student.js';
import {mapToAssignment, mapToAssignmentDTO} from './assignment.js';
import {mapToStudent, mapToStudentDTO} from './student.js';
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";
import {StudentDTO} from "@dwengo-1/common/interfaces/student";
export function mapToGroup(groupDto: GroupDTO, clazz: Class): Group {
const assignmentDto = groupDto.assignment as AssignmentDTO;
return getGroupRepository().create({
groupNumber: groupDto.groupNumber,
assignment: mapToAssignment(assignmentDto, clazz!),
members: groupDto.members.map(studentDto => mapToStudent(studentDto as StudentDTO))
});
}
export function mapToGroupDTO(group: Group): GroupDTO {
return {

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

@ -2,6 +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";
function getLearningObjectIdentifier(question: Question): LearningObjectIdentifier {
return {
@ -21,6 +22,7 @@ export function mapToQuestionDTO(question: Question): QuestionDTO {
learningObjectIdentifier,
sequenceNumber: question.sequenceNumber!,
author: mapToStudentDTO(question.author),
inGroup: mapToGroupDTO(question.inGroup),
timestamp: question.timestamp.toISOString(),
content: question.content,
};
@ -31,6 +33,7 @@ export function mapToQuestionDTOId(question: Question): QuestionId {
return {
learningObjectIdentifier,
inGroup: mapToGroupDTO(question.inGroup),
sequenceNumber: question.sequenceNumber!,
};
}

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

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