mskobaro/TDMS
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

changes.

Browse Source
This commit is contained in:
Maksim Skobaro 2025-06-24 03:04:37 +03:00
parent 28fd5fb4ab
commit 75bb9f3d25
1 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
server/src/main/java/ru/mskobaro/tdms/business/service/ParticipantService.java
View File

@ -234,20 +234,6 @@ public class ParticipantService {
studentData = new StudentData(); 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) { if (participantSaveDTO.getStudentData().getCuratorId() != null) {
TeacherData teacherData = teacherDataRepository.findByIdThrow(participantSaveDTO.getStudentData().getCuratorId()); TeacherData teacherData = teacherDataRepository.findByIdThrow(participantSaveDTO.getStudentData().getCuratorId());
studentData.setCurator(teacherData); studentData.setCurator(teacherData);
@ -270,6 +256,21 @@ public class ParticipantService {
studentData = studentDataRepository.save(studentData); studentData = studentDataRepository.save(studentData);
studentData.setParticipant(participant); 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; return studentData;
} }