From 5f3735ee68ff6335bb037566bb22318098fda388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arthur=20Greg=C3=B3rio?= Date: Mon, 23 Apr 2018 21:20:28 -0300 Subject: [PATCH] fix #13 --- .../library/domain/services/UserAccountService.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/main/java/br/eti/arthurgregorio/library/domain/services/UserAccountService.java b/src/main/java/br/eti/arthurgregorio/library/domain/services/UserAccountService.java index ec8df3a..89fa77c 100644 --- a/src/main/java/br/eti/arthurgregorio/library/domain/services/UserAccountService.java +++ b/src/main/java/br/eti/arthurgregorio/library/domain/services/UserAccountService.java @@ -91,12 +91,12 @@ public User save(User user) { public void update(User user) { // validate the email - final Optional emailOptional = this.userRepository + final Optional userOptional = this.userRepository .findOptionalByEmail(user.getEmail()); - if (emailOptional.isPresent()) { + if (userOptional.isPresent()) { - final User found = emailOptional.get(); + final User found = userOptional.get(); if (!found.getUsername().equals(user.getUsername())) { throw new BusinessLogicException("user.email-duplicated"); @@ -116,6 +116,8 @@ public void update(User user) { // crypt the user password user.setPassword(this.passwordEncoder.encryptPassword( user.getPassword())); + } else { + user.setPassword(userOptional.get().getPassword()); } }