Skip to content

Commit 4e59ca2

Browse files
committed
fix: refactor tests
1 parent 01390d2 commit 4e59ca2

File tree

6 files changed

+13
-11
lines changed

6 files changed

+13
-11
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,13 @@
1010
public interface UserRepository extends JpaRepository<UserEntity, UUID> {
1111
Optional<UserEntity> findByUsername(String username);
1212
Optional<UserEntity> findByEmail(String email);
13-
Page<UserEntity> countByNameContainingAndUsernameContainingAndEmailContaining(
13+
Page<UserEntity> countByNameContainingOrUsernameContainingOrEmailContaining(
1414
String name,
1515
String username,
1616
String email,
1717
Pageable pageable
1818
);
19-
Page<UserEntity> findAllByNameContainingAndUsernameContainingAndEmailContaining(
19+
Page<UserEntity> findAllByNameContainingOrUsernameContainingOrEmailContaining(
2020
String name,
2121
String username,
2222
String email,

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22

33
import com.joaov1ct0r.restful_api_users_java.modules.domain.services.BaseService;
44
import com.joaov1ct0r.restful_api_users_java.modules.users.dtos.CountAllUsersDTO;
5+
import com.joaov1ct0r.restful_api_users_java.modules.users.entities.UserEntity;
56
import com.joaov1ct0r.restful_api_users_java.modules.users.repositories.UserRepository;
67
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.data.domain.Page;
79
import org.springframework.data.domain.PageRequest;
810
import org.springframework.data.domain.Sort;
911
import org.springframework.stereotype.Service;
@@ -19,19 +21,19 @@ public long execute(CountAllUsersDTO query) {
1921
Sort sort = Sort.by(Sort.Direction.DESC, "createdAt");
2022
var page = PageRequest.of(query.getPage() - 1, query.getPerPage(), sort);
2123

22-
long users;
24+
Page<UserEntity> users;
2325

2426
if (isQuery) {
25-
users = this.userRepository.findAllByNameContainingAndUsernameContainingAndEmailContaining(
27+
users = this.userRepository.countByNameContainingOrUsernameContainingOrEmailContaining(
2628
query.getName(),
2729
query.getUsername(),
2830
query.getEmail(),
2931
page
30-
).stream().count();
32+
);
3133
} else {
32-
users = this.userRepository.findAll(page).stream().count();
34+
users = this.userRepository.findAll(page);
3335
}
3436

35-
return users;
37+
return users.stream().count();
3638
}
3739
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public List<UserDTO> execute(FindAllUsersDTO query) {
2727
Page<UserEntity> users;
2828

2929
if (isQuery) {
30-
users = this.userRepository.findAllByNameContainingAndUsernameContainingAndEmailContaining(
30+
users = this.userRepository.findAllByNameContainingOrUsernameContainingOrEmailContaining(
3131
query.getName(),
3232
query.getUsername(),
3333
query.getEmail(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void shouldBeAbleToCountAllUsers() {
4747
4848
);
4949
when(
50-
this.userRepository.countByNameContainingAndUsernameContainingAndEmailContaining(
50+
this.userRepository.countByNameContainingOrUsernameContainingOrEmailContaining(
5151
anyString(),
5252
anyString(),
5353
anyString(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void shouldBeAbleToGetAllUsers() {
4747
4848
);
4949
when(
50-
this.userRepository.findAllByNameContainingAndUsernameContainingAndEmailContaining(
50+
this.userRepository.findAllByNameContainingOrUsernameContainingOrEmailContaining(
5151
anyString(),
5252
anyString(),
5353
anyString(),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
public class TestUtils {
1414
public static MockMultipartFile stringToMMF(UserEntity user) {
15-
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());
15+
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());
1616
return new MockMultipartFile("user", "", "application/json", jsonData.getBytes());
1717
}
1818

0 commit comments

Comments
 (0)