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

Merge remote-tracking branch 'origin/feat/service-layer' into feat/service-layer

Browse source
This commit is contained in:
Gabriellvl 2025-03-13 15:30:23 +01:00
commit 911e17771f
8 changed files with 85 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -17,7 +17,7 @@ export interface AssignmentDTO {
export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO {
return {
id: assignment.id!,
class: assignment.within.classId,
class: assignment.within.classId!,
title: assignment.title,
description: assignment.description,
learningPath: assignment.learningPathHruid,
@ -29,7 +29,7 @@ export function mapToAssignmentDTOId(assignment: Assignment): AssignmentDTO {
export function mapToAssignmentDTO(assignment: Assignment): AssignmentDTO {
return {
id: assignment.id!,
class: assignment.within.classId,
class: assignment.within.classId!,
title: assignment.title,
description: assignment.description,
learningPath: assignment.learningPathHruid,

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

@ -1,4 +1,7 @@
import { Collection } from '@mikro-orm/core';
import { Class } from '../entities/classes/class.entity.js';
import { Student } from '../entities/users/student.entity.js';
import { Teacher } from '../entities/users/teacher.entity.js';
export interface ClassDTO {
id: string;
@ -16,7 +19,7 @@ export interface ClassDTO {
export function mapToClassDTO(cls: Class): ClassDTO {
return {
id: cls.classId,
id: cls.classId!,
displayName: cls.displayName,
teachers: cls.teachers.map((teacher) => {
return teacher.username;
@ -27,3 +30,16 @@ export function mapToClassDTO(cls: Class): ClassDTO {
joinRequests: [], // TODO
};
}
export function mapToClass(
classData: ClassDTO,
students: Collection<Student>,
teachers: Collection<Teacher>
): Class {
const cls = new Class();
cls.displayName = classData.displayName;
cls.students = students;
cls.teachers = teachers;
return cls;
}

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

@ -18,7 +18,7 @@ export function mapToGroupDTO(group: Group): GroupDTO {
export function mapToGroupDTOId(group: Group): GroupDTO {
return {
assignment: group.assignment.id,
assignment: group.assignment.id!,
groupNumber: group.groupNumber,
members: group.members.map((member) => {
return member.username;