|
|
@ -237,12 +237,16 @@ public class UserService implements UserDetailsService {
|
|
|
|
return userMapper.userEntityToUserDto(user);
|
|
|
|
return userMapper.userEntityToUserDto(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
public User updateUserInformation(User user) {
|
|
|
|
|
|
|
|
return userRepository.save(user);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public UserDto updateUserInformation(User user, UserDto updateUser) {
|
|
|
|
public UserDto updateUserInformation(User user, UserDto updateUser) {
|
|
|
|
user.setFirstName(updateUser.getFirstName());
|
|
|
|
user.setFirstName(updateUser.getFirstName());
|
|
|
|
user.setLastName(updateUser.getLastName());
|
|
|
|
user.setLastName(updateUser.getLastName());
|
|
|
|
user.setEmail(updateUser.getEmail());
|
|
|
|
user.setEmail(updateUser.getEmail());
|
|
|
|
user.setLogin(updateUser.getLogin());
|
|
|
|
user.setLogin(updateUser.getLogin());
|
|
|
|
user = userRepository.save(user);
|
|
|
|
user = updateUserInformation(user);
|
|
|
|
log.debug("Updated Information for User: {}", user.getLogin());
|
|
|
|
log.debug("Updated Information for User: {}", user.getLogin());
|
|
|
|
return userMapper.userEntityToUserDto(user);
|
|
|
|
return userMapper.userEntityToUserDto(user);
|
|
|
|
}
|
|
|
|
}
|
|
|
|