From 75bb9f3d2578af448088560174d0c6f8019f8a58 Mon Sep 17 00:00:00 2001 From: Maksim Skobaro Date: Tue, 24 Jun 2025 03:04:37 +0300 Subject: [PATCH] changes. --- .../business/service/ParticipantService.java | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java b/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java index 61f785d..b3db1d4 100644 --- a/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java +++ b/server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java @@ -234,20 +234,6 @@ public class ParticipantService { studentData = new StudentData(); } - if (participantSaveDTO.getStudentData().getGroupId() != null) { - Group group = groupRepository.findByIdThrow(participantSaveDTO.getStudentData().getGroupId()); - studentData.setGroup(group); - if (!group.getStudents().contains(studentData)) - group.getStudents().add(studentData); - } else { - if (editMode) { - Group group = groupRepository.findByStudentsContaining(Collections.singletonList(studentData)); - if (group != null) - group.getStudents().remove(studentData); - } - studentData.setGroup(null); - } - if (participantSaveDTO.getStudentData().getCuratorId() != null) { TeacherData teacherData = teacherDataRepository.findByIdThrow(participantSaveDTO.getStudentData().getCuratorId()); studentData.setCurator(teacherData); @@ -270,6 +256,21 @@ public class ParticipantService { studentData = studentDataRepository.save(studentData); studentData.setParticipant(participant); + + if (participantSaveDTO.getStudentData().getGroupId() != null) { + Group group = groupRepository.findByIdThrow(participantSaveDTO.getStudentData().getGroupId()); + studentData.setGroup(group); + if (!group.getStudents().contains(studentData)) + group.getStudents().add(studentData); + } else { + if (editMode) { + Group group = groupRepository.findByStudentsContaining(Collections.singletonList(studentData)); + if (group != null) + group.getStudents().remove(studentData); + } + studentData.setGroup(null); + } + return studentData; }