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

fix: strange merge conflict

Browse source
This commit is contained in:
Adriaan Jacquet 2025-04-06 22:41:25 +02:00
commit aa1de9bfa3
12 changed files with 64 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backend/src/services/groups.ts
View file

@ -28,7 +28,7 @@ export async function fetchGroup(classId: string, assignmentNumber: number, grou
throw new NotFoundException('Could not find group');
}
return group;
return group;
}
export async function getGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
@ -52,7 +52,7 @@ export async function putGroup(
export async function deleteGroup(classId: string, assignmentNumber: number, groupNumber: number): Promise<GroupDTO> {
const group = await fetchGroup(classId, assignmentNumber, groupNumber);
const assignment = await fetchAssignment(classId, assignmentNumber);
const groupRepository = getGroupRepository();
await groupRepository.deleteByAssignmentAndGroupNumber(assignment, groupNumber);
@ -60,8 +60,8 @@ export async function deleteGroup(classId: string, assignmentNumber: number, gro
}
export async function getExistingGroupFromGroupDTO(groupData: GroupDTO) {
const classId = typeof(groupData.class) === 'string' ? groupData.class : groupData.class.id;
const assignmentNumber = typeof(groupData.assignment) === 'number' ? groupData.assignment : groupData.assignment.id;
const classId = typeof groupData.class === 'string' ? groupData.class : groupData.class.id;
const assignmentNumber = typeof groupData.assignment === 'number' ? groupData.assignment : groupData.assignment.id;
const groupNumber = groupData.groupNumber;
return await fetchGroup(classId, assignmentNumber, groupNumber);