Merge branch 'develop' into whitelist

src/main/java/com/softserveinc/dokazovi/controller/UserController.java

@@ -165,7 +165,7 @@ public ResponseEntity<UserDTO> getCurrentUser(@AuthenticationPrincipal UserPrinc
         if (userPrincipal == null) {
             return ResponseEntity.status(HttpStatus.UNAUTHORIZED).build();
         }
-        UserDTO userDTO = userService.findExpertById(userPrincipal.getId());
+        UserDTO userDTO = userService.findExpertByUserId(userPrincipal.getId());
         return ResponseEntity
                 .status((userDTO != null) ? HttpStatus.OK : HttpStatus.NOT_FOUND)
                 .body(userDTO);

src/main/java/com/softserveinc/dokazovi/service/UserService.java

@@ -25,6 +25,8 @@ public interface UserService {
 
     UserDTO findExpertById(Integer userId);
 
+    UserDTO findExpertByUserId(Integer userId);
+
     Page<UserDTO> findAllExperts(UserSearchCriteria userSearchCriteria, Pageable pageable);
 
 

src/main/java/com/softserveinc/dokazovi/service/impl/UserServiceImpl.java

@@ -109,6 +109,12 @@ public UserDTO findExpertById(Integer userId) {
 
     }
 
+    @Override
+    public UserDTO findExpertByUserId(Integer userId) {
+        return userMapper.toUserDTO(userRepository.findById(userId).orElseThrow(
+                () -> new EntityNotFoundException("User not found")));
+    }
+
     /**
      * Gets doctors by search criteria. For example, if directions, regions and user name fields are empty, the
      * findDoctorsProfiles method without parameters is called