improvings

Author: muriloalvesdev

src/main/java/br/com/developers/controller/user/UserController.java

@@ -38,7 +38,7 @@ public ResponseEntity<Object> registerUser(@Validated @RequestBody RegisterDTO r
   @PutMapping("/")
   @PreAuthorize("hasRole('ADMIN')")
   public ResponseEntity<Object> update(@Validated @RequestBody RegisterDTO registerData) {
-    User user = this.userService.updateUser(registerData);
+    User user = this.userService.update(registerData);
     return ResponseEntity.created(ServletUriComponentsBuilder.fromCurrentRequest().path("/{id}")
         .buildAndExpand(user.getId()).toUri()).build();
   }

src/main/java/br/com/developers/login/service/UserService.java

@@ -11,7 +11,7 @@ public interface UserService {
 
   AccessToken authenticateUser(LoginDTO loginDto);
 
-  User updateUser(RegisterDTO registerData);
+  User update(RegisterDTO registerData);
 
   void delete(LoginDTO loginDTO);
 

src/main/java/br/com/developers/login/service/impl/UserServiceImpl.java

@@ -31,7 +31,7 @@
 class UserServiceImpl implements UserService {
 
   private static final String ROLE_NOT_FOUND = "Fail! -> Cause: %s Role not found in database.";
-  private static final String USER_NOT_FOUND = "Fail! -> Cause: User not found with email [%s]";
+  private static final String USER_NOT_FOUND = "Fail! -> Cause: User not found with %s [%s]";
 
   private UserRepository userRepository;
   private RoleRepository roleRepository;
@@ -68,9 +68,10 @@ private Set<Role> getAllRoles(RegisterDTO registerData) {
   }
 
 
-  public User updateUser(RegisterDTO registerData) {
-    User user = this.userRepository.findByEmail(registerData.getEmail().toLowerCase()).orElseThrow(
-        () -> new UserNotFoundException(String.format(USER_NOT_FOUND, registerData.getEmail())));
+  public User update(RegisterDTO registerData) {
+    User user = this.userRepository.findByEmail(registerData.getEmail().toLowerCase())
+        .orElseThrow(() -> new UserNotFoundException(
+            String.format(USER_NOT_FOUND, "email", registerData.getEmail())));
     user.setFirstName(registerData.getName());
     user.setLastName(registerData.getLastName());
     user.setPassword(registerData.getPassword());
@@ -79,8 +80,9 @@ public User updateUser(RegisterDTO registerData) {
   }
 
   public void delete(LoginDTO loginDTO) {
-    User user = this.userRepository.findByEmail(loginDTO.getEmail().toLowerCase()).orElseThrow(
-        () -> new UserNotFoundException(String.format(USER_NOT_FOUND, loginDTO.getEmail())));
+    User user = this.userRepository.findByEmail(loginDTO.getEmail().toLowerCase())
+        .orElseThrow(() -> new UserNotFoundException(
+            String.format(USER_NOT_FOUND, "email", loginDTO.getEmail())));
     this.userRepository.delete(user);
   }
 
@@ -95,7 +97,7 @@ public AccessToken authenticateUser(LoginDTO loginDto) {
 
   public UserDTO find(String id) {
     User user = this.userRepository.findById(UUID.fromString(id))
-        .orElseThrow(() -> new UserNotFoundException(String.format(USER_NOT_FOUND, id)));
+        .orElseThrow(() -> new UserNotFoundException(String.format(USER_NOT_FOUND, "id", id)));
     return UserDTO.build(user);
   }
 }