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 56266a9..275468b 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 @@ -101,7 +101,13 @@ public class ParticipantService { Participant saved = participantRepository.save(participant); - log.info("Participant saved: {}", saved.getFullName()); + + boolean credentialsChanged = persistUserData(participantSaveDTO, saved, editMode, participant); + + if (credentialsChanged) { + log.info("User {} changed credentials, logging out", saved.getUser().getUsername()); + authenticationService.logout(saved.getUser().getUsername()); + } if (!editMode && participantSaveDTO.getUserData() != null) { emailService.sendEmail(saved.getEmail(), "Вам была создана учетная запись в системе поддержки ВКР", """ @@ -131,13 +137,7 @@ public class ParticipantService { } } } - - boolean credentialsChanged = persistUserData(participantSaveDTO, saved, editMode, participant); - - if (credentialsChanged) { - log.info("User {} changed credentials, logging out", saved.getUser().getUsername()); - authenticationService.logout(saved.getUser().getUsername()); - } + log.info("Participant saved: {}", saved.getFullName()); } private List persistRoles(ParticipantSaveDTO participantSaveDTO, Participant existingParticipant, boolean editMode, User callerUser, Participant participant) {