From 8504dd2d84411161ffc64b740b9be11fa43ae2d2 Mon Sep 17 00:00:00 2001 From: Maksim Skobaro Date: Tue, 24 Jun 2025 04:12:04 +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 275468b..819997d 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 @@ -119,24 +119,25 @@ public class ParticipantService { С уважением, администрация. """.formatted(participant.getFullName(), participant.getUser().getUsername(), participantSaveDTO.getUserData().getPassword())); + } - if (studentData != null) { - studentData.setParticipant(saved); + if (studentData != null) { + studentData.setParticipant(saved); + } + + if (studentData != null && studentData.getGroup() != null) { + List defenses = entityManager.createQuery("select distinct d from Defense d inner join fetch d.groups g where g.id = :id", Defense.class) + .setParameter("id", studentData.getGroup().getId()) + .getResultList(); + Defense defense = null; + if (defenses != null && !defenses.isEmpty()) { + defense = defenses.get(0); } - - if (studentData != null && studentData.getGroup() != null) { - List defenses = entityManager.createQuery("select distinct d from Defense d inner join fetch d.groups g where g.id = :id", Defense.class) - .setParameter("id", studentData.getGroup().getId()) - .getResultList(); - Defense defense = null; - if (defenses != null && !defenses.isEmpty()) { - defense = defenses.get(0); - } - if (defense != null && defense.isStateShouldBeProcessed(Defense.Status.TOPIC_CHOOSING)) { - taskService.checkAndCreateTopicChoosingTasksAndSendEmail(Collections.singletonList(studentData), defense); - } + if (defense != null && defense.isStateShouldBeProcessed(Defense.Status.TOPIC_CHOOSING)) { + taskService.checkAndCreateTopicChoosingTasksAndSendEmail(Collections.singletonList(studentData), defense); } } + log.info("Participant saved: {}", saved.getFullName()); }