diff --git a/src/main/java/br/com/db/petcontrol/controller/PetsController.java b/src/main/java/br/com/db/petcontrol/controller/PetsController.java index ff110a8..a99d466 100644 --- a/src/main/java/br/com/db/petcontrol/controller/PetsController.java +++ b/src/main/java/br/com/db/petcontrol/controller/PetsController.java @@ -1,6 +1,8 @@ package br.com.db.petcontrol.controller; +import br.com.db.petcontrol.dto.request.PageableRequestDTO; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.media.Content; @@ -8,7 +10,9 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse; import io.swagger.v3.oas.annotations.tags.Tag; import jakarta.validation.Valid; +import org.springdoc.core.annotations.ParameterObject; import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -28,4 +32,13 @@ public interface PetsController { @ApiResponse(responseCode = "404", description = "Espécie não encontrada") @PostMapping ResponseEntity create(@Valid @RequestBody PetRequestDTO dto); + + @Operation(summary = "Buscar pets", description = "Retorna uma lista paginada de pets") + @ApiResponse( + responseCode = "200", + description = "Pagina com pets buscada com sucesso", + content = @Content(schema = @Schema(implementation = PageResponseDTO.class))) + @GetMapping + ResponseEntity> findAll( + @ParameterObject PageableRequestDTO pageable); } diff --git a/src/main/java/br/com/db/petcontrol/controller/impl/PetsControllerImpl.java b/src/main/java/br/com/db/petcontrol/controller/impl/PetsControllerImpl.java index 91ce7bb..46a2b29 100644 --- a/src/main/java/br/com/db/petcontrol/controller/impl/PetsControllerImpl.java +++ b/src/main/java/br/com/db/petcontrol/controller/impl/PetsControllerImpl.java @@ -1,7 +1,9 @@ package br.com.db.petcontrol.controller.impl; import br.com.db.petcontrol.controller.PetsController; +import br.com.db.petcontrol.dto.request.PageableRequestDTO; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.service.PetsService; import lombok.RequiredArgsConstructor; @@ -20,4 +22,10 @@ public ResponseEntity create(PetRequestDTO dto) { PetResponseDTO response = petsService.create(dto); return ResponseEntity.status(HttpStatus.CREATED).body(response); } + + @Override + public ResponseEntity> findAll(PageableRequestDTO pageable) { + PageResponseDTO response = petsService.findAll(pageable); + return ResponseEntity.status(HttpStatus.OK).body(response); + } } diff --git a/src/main/java/br/com/db/petcontrol/dto/request/PageableRequestDTO.java b/src/main/java/br/com/db/petcontrol/dto/request/PageableRequestDTO.java new file mode 100644 index 0000000..26d53d0 --- /dev/null +++ b/src/main/java/br/com/db/petcontrol/dto/request/PageableRequestDTO.java @@ -0,0 +1,20 @@ +package br.com.db.petcontrol.dto.request; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Builder; + +@Builder +@Schema(description = "Parâmetros de paginação") +public record PageableRequestDTO( + @Schema(description = "Número da página (começa em 0)", example = "0") Integer page, + @Schema(description = "Tamanho da página", example = "6") Integer size) { + public PageableRequestDTO { + if (page == null) { + page = 0; + } + + if (size == null) { + size = 6; + } + } +} diff --git a/src/main/java/br/com/db/petcontrol/dto/response/PageResponseDTO.java b/src/main/java/br/com/db/petcontrol/dto/response/PageResponseDTO.java new file mode 100644 index 0000000..15a1248 --- /dev/null +++ b/src/main/java/br/com/db/petcontrol/dto/response/PageResponseDTO.java @@ -0,0 +1,15 @@ +package br.com.db.petcontrol.dto.response; + +import io.swagger.v3.oas.annotations.media.Schema; +import java.util.List; +import lombok.Builder; + +@Builder +@Schema(description = "Resposta paginada contendo os elementos e metadados da página") +public record PageResponseDTO( + @Schema(description = "Conteúdo da página") List content, + @Schema(description = "Total de páginas disponíveis", example = "5") int totalPages, + @Schema(description = "Total de elementos disponíveis", example = "100") long totalElements, + @Schema(description = "Tamanho da página (quantidade de elementos por página)", example = "6") + int size, + @Schema(description = "Número da página atual", example = "0") int number) {} diff --git a/src/main/java/br/com/db/petcontrol/mapper/PageMapper.java b/src/main/java/br/com/db/petcontrol/mapper/PageMapper.java new file mode 100644 index 0000000..8f8243f --- /dev/null +++ b/src/main/java/br/com/db/petcontrol/mapper/PageMapper.java @@ -0,0 +1,26 @@ +package br.com.db.petcontrol.mapper; + +import br.com.db.petcontrol.dto.request.PageableRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; +import org.mapstruct.Mapper; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + +@Mapper(componentModel = "spring") +public interface PageMapper { + default PageResponseDTO toPageResponseDTO(Page page) { + return new PageResponseDTO<>( + page.getContent(), + page.getTotalPages(), + page.getTotalElements(), + page.getSize(), + page.getNumber()); + } + + default Pageable toPageable(PageableRequestDTO dto) { + Sort sort = Sort.by(Sort.Direction.ASC, "name"); + return PageRequest.of(dto.page(), dto.size(), sort); + } +} diff --git a/src/main/java/br/com/db/petcontrol/model/Pets.java b/src/main/java/br/com/db/petcontrol/model/Pets.java index 112e724..d5fe5f3 100644 --- a/src/main/java/br/com/db/petcontrol/model/Pets.java +++ b/src/main/java/br/com/db/petcontrol/model/Pets.java @@ -13,6 +13,7 @@ import jakarta.persistence.JoinTable; import jakarta.persistence.ManyToMany; import jakarta.persistence.ManyToOne; +import jakarta.persistence.OrderBy; import jakarta.persistence.Table; import java.util.List; import java.util.UUID; @@ -49,5 +50,6 @@ public class Pets { name = "tb_pet_tags", joinColumns = @JoinColumn(name = "pet_id"), inverseJoinColumns = @JoinColumn(name = "tag_id")) + @OrderBy("name ASC") private List tags; } diff --git a/src/main/java/br/com/db/petcontrol/repository/PetsRepository.java b/src/main/java/br/com/db/petcontrol/repository/PetsRepository.java index 9560256..240aa5c 100644 --- a/src/main/java/br/com/db/petcontrol/repository/PetsRepository.java +++ b/src/main/java/br/com/db/petcontrol/repository/PetsRepository.java @@ -2,8 +2,14 @@ import br.com.db.petcontrol.model.Pets; import java.util.UUID; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.EntityGraph; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.stereotype.Repository; @Repository -public interface PetsRepository extends JpaRepository {} +public interface PetsRepository extends JpaRepository { + @EntityGraph(attributePaths = {"species", "tags"}) + Page findAll(Pageable pageable); +} diff --git a/src/main/java/br/com/db/petcontrol/service/PetsService.java b/src/main/java/br/com/db/petcontrol/service/PetsService.java index 6707f41..d4d230a 100644 --- a/src/main/java/br/com/db/petcontrol/service/PetsService.java +++ b/src/main/java/br/com/db/petcontrol/service/PetsService.java @@ -1,8 +1,12 @@ package br.com.db.petcontrol.service; +import br.com.db.petcontrol.dto.request.PageableRequestDTO; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; public interface PetsService { PetResponseDTO create(PetRequestDTO dto); + + PageResponseDTO findAll(PageableRequestDTO pageable); } diff --git a/src/main/java/br/com/db/petcontrol/service/impl/PetsServiceImpl.java b/src/main/java/br/com/db/petcontrol/service/impl/PetsServiceImpl.java index 5f54df2..cbf189c 100644 --- a/src/main/java/br/com/db/petcontrol/service/impl/PetsServiceImpl.java +++ b/src/main/java/br/com/db/petcontrol/service/impl/PetsServiceImpl.java @@ -1,8 +1,11 @@ package br.com.db.petcontrol.service.impl; +import br.com.db.petcontrol.dto.request.PageableRequestDTO; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.exception.NotFoundException; +import br.com.db.petcontrol.mapper.PageMapper; import br.com.db.petcontrol.mapper.PetsMapper; import br.com.db.petcontrol.model.Pets; import br.com.db.petcontrol.model.Species; @@ -15,6 +18,7 @@ import java.util.List; import java.util.UUID; import lombok.RequiredArgsConstructor; +import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; @Service @@ -25,7 +29,9 @@ public class PetsServiceImpl implements PetsService { private final SpeciesRepository speciesRepository; private final TagsRepository tagRepository; private final PetsMapper petsMapper; + private final PageMapper pageMapper; + @Override public PetResponseDTO create(PetRequestDTO dto) { List errors = new ArrayList<>(); @@ -45,6 +51,13 @@ public PetResponseDTO create(PetRequestDTO dto) { return petsMapper.toResponse(savedPet); } + @Override + public PageResponseDTO findAll(PageableRequestDTO pageable) { + Page page = + petRepository.findAll(pageMapper.toPageable(pageable)).map(petsMapper::toResponse); + return pageMapper.toPageResponseDTO(page); + } + private List findTagsOrCollectErrors(List ids, List errors) { if (ids == null || ids.isEmpty()) { return List.of(); diff --git a/src/main/java/br/com/db/petcontrol/utils/JsonUtils.java b/src/main/java/br/com/db/petcontrol/utils/JsonUtils.java new file mode 100644 index 0000000..7d28a3d --- /dev/null +++ b/src/main/java/br/com/db/petcontrol/utils/JsonUtils.java @@ -0,0 +1,24 @@ +package br.com.db.petcontrol.utils; + +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; +import com.fasterxml.jackson.databind.SerializationFeature; +import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule; + +public class JsonUtils { + private static ObjectMapper objectMapper = + new ObjectMapper() + .registerModule(new JavaTimeModule()) + .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS); + + public static String convertToJson(Object object) { + try { + return objectMapper.writeValueAsString(object); + + } catch (JsonProcessingException e) { + throw new RuntimeException("Error converting to JSON", e); + } + } + + private JsonUtils() {} +} diff --git a/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java b/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java index f20eb17..538858d 100644 --- a/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java +++ b/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java @@ -4,22 +4,30 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.jsonPath; import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; import br.com.db.petcontrol.controller.impl.PetsControllerImpl; +import br.com.db.petcontrol.dto.request.PageableRequestDTO; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.enums.PetStatus; +import br.com.db.petcontrol.mocks.PageFixture; import br.com.db.petcontrol.mocks.PetsFixture; import br.com.db.petcontrol.service.PetsService; +import br.com.db.petcontrol.utils.JsonUtils; import com.fasterxml.jackson.databind.ObjectMapper; import java.util.List; import java.util.UUID; +import java.util.stream.Stream; import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; +import org.junit.jupiter.params.ParameterizedTest; +import org.junit.jupiter.params.provider.MethodSource; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; import org.springframework.http.MediaType; @@ -154,4 +162,28 @@ void shouldCallServiceWithCorrectArguments() throws Exception { verify(petsService).create(any(PetRequestDTO.class)); } } + + @Nested + class FindPetsTests { + @ParameterizedTest + @MethodSource("petsProviders") + void shouldReturnAllPetsWithCorrectPagination(List pets) throws Exception { + PageableRequestDTO pageable = PageFixture.pageableRequestDtoBuilder().build(); + PageResponseDTO page = PageFixture.pageResponseDtoBuilder(pets).build(); + + when(petsService.findAll(pageable)).thenReturn(page); + + mockMvc + .perform(get(PETS_URL).contentType(MediaType.APPLICATION_JSON)) + .andExpect(status().isOk()) + .andExpect(content().json(JsonUtils.convertToJson(page))); + } + + static Stream> petsProviders() { + return Stream.of( + List.of( + PetsFixture.responseDtoBuilder().build(), PetsFixture.responseDtoBuilder().build()), + List.of()); + } + } } diff --git a/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java b/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java index f2eadcd..2cb103a 100644 --- a/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java +++ b/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java @@ -1,11 +1,15 @@ package br.com.db.petcontrol.integration; +import static br.com.db.petcontrol.mocks.PageFixture.DEFAULT_PAGE; +import static br.com.db.petcontrol.mocks.PageFixture.DEFAULT_SIZE; import static org.assertj.core.api.Assertions.assertThat; import static org.junit.jupiter.api.Assertions.assertEquals; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.enums.PetStatus; +import br.com.db.petcontrol.model.Pets; import br.com.db.petcontrol.model.Species; import br.com.db.petcontrol.model.Tags; import br.com.db.petcontrol.repository.PetsRepository; @@ -20,6 +24,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; +import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; import org.springframework.test.context.ActiveProfiles; @@ -263,4 +269,93 @@ void shouldNotPersistPetWhenSpeciesDoesNotExist() { assertThat(petsRepository.findAll()).isEmpty(); } } + + @Nested + class FindPetsTests { + @Test + void shouldReturnAllPersistedPetsWithCorrectPagination() { + List names = List.of("Rex", "Luna"); + List pets = + names.stream() + .map( + name -> + Pets.builder() + .name(name) + .status(PetStatus.AVAILABLE) + .species(savedSpecies) + .tags(List.of()) + .build()) + .toList(); + + petsRepository.saveAll(pets); + + ResponseEntity> response = + restTemplate.exchange( + PETS_URL, + HttpMethod.GET, + null, + new ParameterizedTypeReference>() {}); + + List savedIds = pets.stream().map(Pets::getId).toList(); + + List responseIds = + response.getBody().content().stream().map(PetResponseDTO::id).toList(); + + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertThat(responseIds).containsExactlyInAnyOrderElementsOf(savedIds); + assertEquals(DEFAULT_SIZE, response.getBody().size()); + assertEquals(DEFAULT_PAGE, response.getBody().number()); + } + + @Test + void shouldReturnEmptyPageWhenNoPetsArePersisted() { + ResponseEntity> response = + restTemplate.exchange( + PETS_URL, + HttpMethod.GET, + null, + new ParameterizedTypeReference>() {}); + + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertThat(response.getBody().content()).isEmpty(); + assertEquals(DEFAULT_SIZE, response.getBody().size()); + assertEquals(DEFAULT_PAGE, response.getBody().number()); + } + + @Test + void shouldReturnSecondPageWithCorrectPagination() { + int numberPage = 1; + int sizePage = 3; + + List names = List.of("Rex", "Luna", "Max", "Mel"); + List pets = + names.stream() + .map( + name -> + Pets.builder() + .name(name) + .status(PetStatus.AVAILABLE) + .species(savedSpecies) + .tags(List.of()) + .build()) + .toList(); + + petsRepository.saveAll(pets); + + String url = PETS_URL + String.format("?page=%d&size=%d", numberPage, sizePage); + + ResponseEntity> response = + restTemplate.exchange( + url, + HttpMethod.GET, + null, + new ParameterizedTypeReference>() {}); + + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertEquals(names.size(), response.getBody().totalElements()); + assertEquals(numberPage, response.getBody().number()); + assertEquals(sizePage, response.getBody().size()); + assertThat(response.getBody().content()).hasSize(1); + } + } } diff --git a/src/test/java/br/com/db/petcontrol/mocks/PageFixture.java b/src/test/java/br/com/db/petcontrol/mocks/PageFixture.java new file mode 100644 index 0000000..c9f2ef5 --- /dev/null +++ b/src/test/java/br/com/db/petcontrol/mocks/PageFixture.java @@ -0,0 +1,39 @@ +package br.com.db.petcontrol.mocks; + +import br.com.db.petcontrol.dto.request.PageableRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; +import java.util.List; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.PageImpl; +import org.springframework.data.domain.PageRequest; +import org.springframework.data.domain.Pageable; +import org.springframework.data.domain.Sort; + +public class PageFixture { + + public static final Integer DEFAULT_PAGE = 0; + public static final Integer DEFAULT_SIZE = 6; + + private PageFixture() {} + + public static PageableRequestDTO.PageableRequestDTOBuilder pageableRequestDtoBuilder() { + return PageableRequestDTO.builder().page(DEFAULT_PAGE).size(DEFAULT_SIZE); + } + + public static PageResponseDTO.PageResponseDTOBuilder pageResponseDtoBuilder(List content) { + return PageResponseDTO.builder() + .content(content) + .totalPages(1) + .totalElements(content.size()) + .size(DEFAULT_SIZE) + .number(DEFAULT_PAGE); + } + + public static Pageable getPageableMock() { + return PageRequest.of(DEFAULT_PAGE, DEFAULT_SIZE, Sort.by("nome").ascending()); + } + + public static Page getPageMock(List conteudo) { + return new PageImpl<>(conteudo, getPageableMock(), conteudo.size()); + } +} diff --git a/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java b/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java index fb95874..0265c6e 100644 --- a/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java +++ b/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java @@ -1,7 +1,10 @@ package br.com.db.petcontrol.service; +import static br.com.db.petcontrol.mocks.PageFixture.DEFAULT_PAGE; +import static br.com.db.petcontrol.mocks.PageFixture.DEFAULT_SIZE; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatThrownBy; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.never; @@ -9,10 +12,13 @@ import static org.mockito.Mockito.when; import br.com.db.petcontrol.dto.request.PetRequestDTO; +import br.com.db.petcontrol.dto.response.PageResponseDTO; import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.enums.PetStatus; import br.com.db.petcontrol.exception.NotFoundException; +import br.com.db.petcontrol.mapper.PageMapper; import br.com.db.petcontrol.mapper.PetsMapper; +import br.com.db.petcontrol.mocks.PageFixture; import br.com.db.petcontrol.mocks.PetsFixture; import br.com.db.petcontrol.mocks.SpeciesFixture; import br.com.db.petcontrol.mocks.TagsFixture; @@ -30,10 +36,12 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; +import org.mapstruct.factory.Mappers; import org.mockito.Mock; import org.mockito.junit.jupiter.MockitoExtension; import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; +import org.springframework.data.domain.Pageable; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) @@ -42,13 +50,20 @@ class PetsServiceImplTest { @Mock private PetsRepository petRepository; @Mock private SpeciesRepository speciesRepository; @Mock private TagsRepository tagRepository; - @Mock private PetsMapper petsMapper; + + private PetsMapper petsMapper; + private PageMapper pageMapper; private PetsServiceImpl service; @BeforeEach void setUp() { - service = new PetsServiceImpl(petRepository, speciesRepository, tagRepository, petsMapper); + petsMapper = Mappers.getMapper(PetsMapper.class); + pageMapper = Mappers.getMapper(PageMapper.class); + + service = + new PetsServiceImpl( + petRepository, speciesRepository, tagRepository, petsMapper, pageMapper); } @Nested @@ -60,20 +75,15 @@ void shouldCreatePetSuccessfully() { Species species = SpeciesFixture.builder().id(speciesId).name("Cachorro").build(); PetRequestDTO dto = PetsFixture.requestDtoBuilder().specieId(speciesId).build(); Pets expectedPet = PetsFixture.builder().species(species).build(); - PetResponseDTO expectedResponse = - PetsFixture.responseDtoBuilder().species("Cachorro").build(); when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); when(tagRepository.findAllById(anyList())).thenReturn(List.of()); - when(petsMapper.toEntity(any(PetRequestDTO.class), any(Species.class), anyList())) - .thenReturn(expectedPet); when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(expectedPet); - when(petsMapper.toResponse(expectedPet)).thenReturn(expectedResponse); PetResponseDTO result = service.create(dto); assertThat(result).isNotNull(); - assertThat(result.name()).isEqualTo(expectedResponse.name()); + assertThat(result.name()).isEqualTo(expectedPet.getName()); assertThat(result.species()).isEqualTo("Cachorro"); } @@ -84,14 +94,10 @@ void shouldReturnPetWithCorrectId() { Species species = SpeciesFixture.builder().id(speciesId).build(); PetRequestDTO dto = PetsFixture.requestDtoBuilder().specieId(speciesId).build(); Pets expectedPet = PetsFixture.builder().id(petId).species(species).build(); - PetResponseDTO expectedResponse = PetsFixture.responseDtoBuilder().id(petId).build(); when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); when(tagRepository.findAllById(anyList())).thenReturn(List.of()); - when(petsMapper.toEntity(any(PetRequestDTO.class), any(Species.class), anyList())) - .thenReturn(expectedPet); when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(expectedPet); - when(petsMapper.toResponse(expectedPet)).thenReturn(expectedResponse); PetResponseDTO result = service.create(dto); @@ -110,7 +116,6 @@ void shouldThrowNotFoundExceptionWhenSpeciesDoesNotExist() { .hasMessageContaining("Species not found: " + nonExistentSpeciesId); verify(petRepository, never()).saveAndFlush(any()); - verify(petsMapper, never()).toEntity(any(), any(), anyList()); } @Test @@ -125,14 +130,10 @@ void shouldCreatePetWithTags() { PetRequestDTO dto = PetsFixture.requestDtoBuilder().specieId(speciesId).tagsIds(tagIds).build(); Pets expectedPet = PetsFixture.builder().species(species).tags(tags).build(); - PetResponseDTO expectedResponse = - PetsFixture.responseDtoBuilder().tags(List.of(tag1.getName(), tag2.getName())).build(); when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); when(tagRepository.findAllById(tagIds)).thenReturn(tags); - when(petsMapper.toEntity(dto, species, tags)).thenReturn(expectedPet); - when(petRepository.saveAndFlush(expectedPet)).thenReturn(expectedPet); - when(petsMapper.toResponse(expectedPet)).thenReturn(expectedResponse); + when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(expectedPet); PetResponseDTO result = service.create(dto); @@ -146,14 +147,10 @@ void shouldCreatePetWithEmptyTagsList() { PetRequestDTO dto = PetsFixture.requestDtoBuilder().specieId(speciesId).tagsIds(List.of()).build(); Pets expectedPet = PetsFixture.builder().species(species).tags(List.of()).build(); - PetResponseDTO expectedResponse = PetsFixture.responseDtoBuilder().tags(List.of()).build(); when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); when(tagRepository.findAllById(anyList())).thenReturn(List.of()); - when(petsMapper.toEntity(any(PetRequestDTO.class), any(Species.class), anyList())) - .thenReturn(expectedPet); when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(expectedPet); - when(petsMapper.toResponse(expectedPet)).thenReturn(expectedResponse); PetResponseDTO result = service.create(dto); @@ -167,65 +164,27 @@ void shouldCreatePetWithCorrectStatus() { PetRequestDTO dto = PetsFixture.requestDtoBuilder().specieId(speciesId).status(PetStatus.AVAILABLE).build(); Pets expectedPet = PetsFixture.builder().species(species).status(PetStatus.AVAILABLE).build(); - PetResponseDTO expectedResponse = - PetsFixture.responseDtoBuilder().status(PetStatus.AVAILABLE).build(); when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); when(tagRepository.findAllById(anyList())).thenReturn(List.of()); - when(petsMapper.toEntity(any(PetRequestDTO.class), any(Species.class), anyList())) - .thenReturn(expectedPet); when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(expectedPet); - when(petsMapper.toResponse(expectedPet)).thenReturn(expectedResponse); PetResponseDTO result = service.create(dto); assertThat(result.status()).isEqualTo(PetStatus.AVAILABLE); } - @Test - void shouldCallAllRepositoriesWithCorrectArguments() { - UUID speciesId = UUID.randomUUID(); - Tags tag = TagsFixture.builder().build(); - List tagIds = List.of(tag.getId()); - List tags = List.of(tag); - - Species species = SpeciesFixture.builder().id(speciesId).build(); - PetRequestDTO dto = - PetsFixture.requestDtoBuilder().specieId(speciesId).tagsIds(tagIds).build(); - Pets expectedPet = PetsFixture.builder().build(); - PetResponseDTO expectedResponse = PetsFixture.responseDtoBuilder().build(); - - when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); - when(tagRepository.findAllById(tagIds)).thenReturn(tags); - when(petsMapper.toEntity(dto, species, tags)).thenReturn(expectedPet); - when(petRepository.saveAndFlush(expectedPet)).thenReturn(expectedPet); - when(petsMapper.toResponse(expectedPet)).thenReturn(expectedResponse); - - service.create(dto); - - verify(speciesRepository).findById(speciesId); - verify(tagRepository).findAllById(tagIds); - verify(petsMapper).toEntity(dto, species, tags); - verify(petRepository).saveAndFlush(expectedPet); - verify(petsMapper).toResponse(expectedPet); - } - @Test void shouldReturnExactPetReturnedByRepository() { UUID speciesId = UUID.randomUUID(); UUID persistedId = UUID.randomUUID(); Species species = SpeciesFixture.builder().id(speciesId).build(); PetRequestDTO dto = PetsFixture.requestDtoBuilder().specieId(speciesId).build(); - Pets mappedPet = PetsFixture.builder().build(); Pets persistedPet = PetsFixture.builder().id(persistedId).species(species).build(); - PetResponseDTO expectedResponse = PetsFixture.responseDtoBuilder().id(persistedId).build(); when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); when(tagRepository.findAllById(anyList())).thenReturn(List.of()); - when(petsMapper.toEntity(any(PetRequestDTO.class), any(Species.class), anyList())) - .thenReturn(mappedPet); when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(persistedPet); - when(petsMapper.toResponse(persistedPet)).thenReturn(expectedResponse); PetResponseDTO result = service.create(dto); @@ -279,4 +238,38 @@ void shouldThrowNotFoundExceptionWhenAllTagsDoNotExist() { verify(petRepository, never()).saveAndFlush(any()); } } + + @Nested + class FindPetsTests { + @Test + void shouldReturnPaginatedListOfPets() { + List pets = + List.of(PetsFixture.builder().build(), PetsFixture.builder().name("Lily").build()); + + when(petRepository.findAll(any(Pageable.class))).thenReturn(PageFixture.getPageMock(pets)); + + PageResponseDTO response = + service.findAll(PageFixture.pageableRequestDtoBuilder().build()); + + List petIds = pets.stream().map(Pets::getId).toList(); + List responseIds = response.content().stream().map(PetResponseDTO::id).toList(); + + assertThat(responseIds).containsExactlyInAnyOrderElementsOf(petIds); + assertEquals(DEFAULT_SIZE, response.size()); + assertEquals(DEFAULT_PAGE, response.number()); + } + + @Test + void shouldReturnEmptyPageWhenNoPetsFound() { + when(petRepository.findAll(any(Pageable.class))) + .thenReturn(PageFixture.getPageMock(List.of())); + + PageResponseDTO response = + service.findAll(PageFixture.pageableRequestDtoBuilder().build()); + + assertThat(response.content()).isEmpty(); + assertEquals(DEFAULT_SIZE, response.size()); + assertEquals(DEFAULT_PAGE, response.number()); + } + } }