Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions src/main/java/br/com/db/petcontrol/controller/PetsController.java
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
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;
import io.swagger.v3.oas.annotations.media.Schema;
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;
Expand All @@ -28,4 +32,13 @@ public interface PetsController {
@ApiResponse(responseCode = "404", description = "Espécie não encontrada")
@PostMapping
ResponseEntity<PetResponseDTO> 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<PageResponseDTO<PetResponseDTO>> findAll(
@ParameterObject PageableRequestDTO pageable);
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -20,4 +22,10 @@ public ResponseEntity<PetResponseDTO> create(PetRequestDTO dto) {
PetResponseDTO response = petsService.create(dto);
return ResponseEntity.status(HttpStatus.CREATED).body(response);
}

@Override
public ResponseEntity<PageResponseDTO<PetResponseDTO>> findAll(PageableRequestDTO pageable) {
PageResponseDTO<PetResponseDTO> response = petsService.findAll(pageable);
return ResponseEntity.status(HttpStatus.OK).body(response);
}
}
Original file line number Diff line number Diff line change
@@ -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;
}
}
}
Original file line number Diff line number Diff line change
@@ -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<T>(
@Schema(description = "Conteúdo da página") List<T> 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) {}
26 changes: 26 additions & 0 deletions src/main/java/br/com/db/petcontrol/mapper/PageMapper.java
Original file line number Diff line number Diff line change
@@ -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 <T> PageResponseDTO<T> toPageResponseDTO(Page<T> 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);
}
}
2 changes: 2 additions & 0 deletions src/main/java/br/com/db/petcontrol/model/Pets.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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> tags;
}
Original file line number Diff line number Diff line change
Expand Up @@ -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<Pets, UUID> {}
public interface PetsRepository extends JpaRepository<Pets, UUID> {
@EntityGraph(attributePaths = {"species", "tags"})
Page<Pets> findAll(Pageable pageable);
}
4 changes: 4 additions & 0 deletions src/main/java/br/com/db/petcontrol/service/PetsService.java
Original file line number Diff line number Diff line change
@@ -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<PetResponseDTO> findAll(PageableRequestDTO pageable);
}
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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
Expand All @@ -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<String> errors = new ArrayList<>();

Expand All @@ -45,6 +51,13 @@ public PetResponseDTO create(PetRequestDTO dto) {
return petsMapper.toResponse(savedPet);
}

@Override
public PageResponseDTO<PetResponseDTO> findAll(PageableRequestDTO pageable) {
Page<PetResponseDTO> page =
petRepository.findAll(pageMapper.toPageable(pageable)).map(petsMapper::toResponse);
return pageMapper.toPageResponseDTO(page);
}

private List<Tags> findTagsOrCollectErrors(List<UUID> ids, List<String> errors) {
if (ids == null || ids.isEmpty()) {
return List.of();
Expand Down
24 changes: 24 additions & 0 deletions src/main/java/br/com/db/petcontrol/utils/JsonUtils.java
Original file line number Diff line number Diff line change
@@ -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() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -154,4 +162,28 @@ void shouldCallServiceWithCorrectArguments() throws Exception {
verify(petsService).create(any(PetRequestDTO.class));
}
}

@Nested
class FindPetsTests {
@ParameterizedTest
@MethodSource("petsProviders")
void shouldReturnAllPetsWithCorrectPagination(List<PetResponseDTO> 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<List<PetResponseDTO>> petsProviders() {
return Stream.of(
List.of(
PetsFixture.responseDtoBuilder().build(), PetsFixture.responseDtoBuilder().build()),
List.of());
}
}
}
Loading
Loading