fix+feat: error bij het toevegoen van groups na het aanmaken van een assignment gefixt, group & assignment DTO Id toegevoegd
This commit is contained in:
parent
0ceb6761d7
commit
e3fc4b72a7
8 changed files with 53 additions and 50 deletions
|
@ -3,22 +3,25 @@ import { Class } from '../entities/classes/class.entity.js';
|
|||
import {mapToAssignmentDTOId} from './assignment.js';
|
||||
import { mapToClassDTO } from './class.js';
|
||||
import { mapToStudentDTO } from './student.js';
|
||||
import { GroupDTO } from '@dwengo-1/common/interfaces/group';
|
||||
import { GroupDTO, GroupDTOId } from '@dwengo-1/common/interfaces/group';
|
||||
|
||||
export function mapToGroupDTO(group: Group, cls: Class): GroupDTO {
|
||||
return {
|
||||
class: mapToClassDTO(cls),
|
||||
assignment: mapToAssignmentDTOId(group.assignment),
|
||||
groupNumber: group.groupNumber!,
|
||||
members: group.members.map(mapToStudentDTO),
|
||||
};
|
||||
}
|
||||
|
||||
export function mapToGroupDTOId(group: Group, cls: Class): GroupDTO {
|
||||
export function mapToGroupDTO(group: Group, cls: Class, options?: { expandStudents: boolean }): GroupDTO {
|
||||
return {
|
||||
class: cls.classId!,
|
||||
assignment: group.assignment.id!,
|
||||
groupNumber: group.groupNumber!,
|
||||
members:
|
||||
options?.expandStudents
|
||||
? group.members.map(mapToStudentDTO)
|
||||
: group.members.map((student) => student.username)
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
export function mapToGroupDTOId(group: Group, cls: Class): GroupDTOId {
|
||||
return {
|
||||
class: cls.classId!,
|
||||
assignment: group.assignment.id!,
|
||||
groupNumber: group.groupNumber!,
|
||||
members: group.members.map((member) => member.username),
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue