fix: refactor tests

Author: joaov1ct0r

src/main/java/com/joaov1ct0r/restful_api_users_java/modules/users/repositories/UserRepository.java

@@ -10,13 +10,13 @@
 public interface UserRepository extends JpaRepository<UserEntity, UUID> {
     Optional<UserEntity> findByUsername(String username);
     Optional<UserEntity> findByEmail(String email);
-    Page<UserEntity> countByNameContainingAndUsernameContainingAndEmailContaining(
+    Page<UserEntity> countByNameContainingOrUsernameContainingOrEmailContaining(
             String name,
             String username,
             String email,
             Pageable pageable
     );
-    Page<UserEntity> findAllByNameContainingAndUsernameContainingAndEmailContaining(
+    Page<UserEntity> findAllByNameContainingOrUsernameContainingOrEmailContaining(
             String name,
             String username,
             String email,

src/main/java/com/joaov1ct0r/restful_api_users_java/modules/users/services/CountAllUsersService.java

@@ -2,8 +2,10 @@
 
 import com.joaov1ct0r.restful_api_users_java.modules.domain.services.BaseService;
 import com.joaov1ct0r.restful_api_users_java.modules.users.dtos.CountAllUsersDTO;
+import com.joaov1ct0r.restful_api_users_java.modules.users.entities.UserEntity;
 import com.joaov1ct0r.restful_api_users_java.modules.users.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.stereotype.Service;
@@ -19,19 +21,19 @@ public long execute(CountAllUsersDTO query) {
         Sort sort = Sort.by(Sort.Direction.DESC, "createdAt");
         var page = PageRequest.of(query.getPage() - 1, query.getPerPage(), sort);
 
-        long users;
+        Page<UserEntity> users;
 
         if (isQuery) {
-            users = this.userRepository.findAllByNameContainingAndUsernameContainingAndEmailContaining(
+            users = this.userRepository.countByNameContainingOrUsernameContainingOrEmailContaining(
                     query.getName(),
                     query.getUsername(),
                     query.getEmail(),
                     page
-            ).stream().count();
+            );
         } else {
-            users = this.userRepository.findAll(page).stream().count();
+            users = this.userRepository.findAll(page);
         }
 
-        return users;
+        return users.stream().count();
     }
 }

src/main/java/com/joaov1ct0r/restful_api_users_java/modules/users/services/FindAllUsersService.java

@@ -27,7 +27,7 @@ public List<UserDTO> execute(FindAllUsersDTO query) {
         Page<UserEntity> users;
 
         if (isQuery) {
-            users = this.userRepository.findAllByNameContainingAndUsernameContainingAndEmailContaining(
+            users = this.userRepository.findAllByNameContainingOrUsernameContainingOrEmailContaining(
                     query.getName(),
                     query.getUsername(),
                     query.getEmail(),

src/test/java/com/joaov1ct0r/restful_api_users_java/modules/users/services/CountAllUsersServiceTest.java

@@ -47,7 +47,7 @@ public void shouldBeAbleToCountAllUsers() {
                 "[email protected]"
         );
         when(
-                this.userRepository.countByNameContainingAndUsernameContainingAndEmailContaining(
+                this.userRepository.countByNameContainingOrUsernameContainingOrEmailContaining(
                         anyString(),
                         anyString(),
                         anyString(),

src/test/java/com/joaov1ct0r/restful_api_users_java/modules/users/services/FindAllUsersServiceTest.java

@@ -47,7 +47,7 @@ public void shouldBeAbleToGetAllUsers() {
                 "[email protected]"
         );
         when(
-                this.userRepository.findAllByNameContainingAndUsernameContainingAndEmailContaining(
+                this.userRepository.findAllByNameContainingOrUsernameContainingOrEmailContaining(
                         anyString(),
                         anyString(),
                         anyString(),

src/test/java/com/joaov1ct0r/restful_api_users_java/modules/utils/TestUtils.java

@@ -12,7 +12,7 @@
 
 public class TestUtils {
     public static MockMultipartFile stringToMMF(UserEntity user) {
-        String jsonData = String.format("{\"name\":\"%s\", \"email\":\"%s\", \"username\": \"%s\", \"password\": \"%s\", \"id\": \"%s\", \"photoUrl\": \"%s\", \"createdAt\": \"%s\", \"updatedAt\": \"%s\", \"userWhoUpdatedId\": \"%s\"}", user.getName(), user.getEmail(), user.getUsername(), user.getPassword(), user.getId(), user.getPhotoUrl(), user.getCreatedAt(), user.getUpdatedAt());
+        String jsonData = String.format("{\"name\":\"%s\", \"email\":\"%s\", \"username\": \"%s\", \"password\": \"%s\", \"id\": \"%s\", \"photoUrl\": \"%s\", \"createdAt\": \"%s\", \"updatedAt\": \"%s\"}", user.getName(), user.getEmail(), user.getUsername(), user.getPassword(), user.getId(), user.getPhotoUrl(), user.getCreatedAt(), user.getUpdatedAt());
         return new MockMultipartFile("user", "", "application/json", jsonData.getBytes());
     }