From 79d6c90e450ab00e7581dc438922646973ba8e45 Mon Sep 17 00:00:00 2001 From: Rachel Pizane Date: Wed, 6 May 2026 15:59:24 -0300 Subject: [PATCH 1/3] =?UTF-8?q?[PETCONTROL-004]=20feat:=20implementar=20ed?= =?UTF-8?q?i=C3=A7=C3=A3o=20do=20pet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../petcontrol/controller/PetsController.java | 58 ++++++++++++++- .../controller/impl/PetsControllerImpl.java | 6 ++ .../petcontrol/dto/request/PetRequestDTO.java | 14 +++- .../com/db/petcontrol/mapper/PetsMapper.java | 6 ++ .../java/br/com/db/petcontrol/model/Pets.java | 2 + .../db/petcontrol/service/PetsService.java | 2 + .../service/impl/PetsServiceImpl.java | 71 ++++++++++++++----- 7 files changed, 137 insertions(+), 22 deletions(-) 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 252844f..62c017a 100644 --- a/src/main/java/br/com/db/petcontrol/controller/PetsController.java +++ b/src/main/java/br/com/db/petcontrol/controller/PetsController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -33,10 +34,63 @@ public interface PetsController { @Content( mediaType = "application/json", schema = @Schema(implementation = PetResponseDTO.class))) - @ApiResponse(responseCode = "404", description = "Espécie não encontrada") + @ApiResponse( + responseCode = "400", + description = "Dados inválidos", + content = + @Content( + schema = @Schema(implementation = ErrorResponseDTO.class), + examples = + @ExampleObject( + name = "Dados inválidos", + value = + "{\"messages\": [\"Pet name must not be blank\", \"Specie ID must not be null\"]}"))) + @ApiResponse( + responseCode = "404", + description = "Espécie ou Tags não encontradas", + content = + @Content( + schema = @Schema(implementation = ErrorResponseDTO.class), + examples = + @ExampleObject( + name = "Não encontrado", + value = "{\"messages\": [\"Specie not found\"]}"))) @PostMapping ResponseEntity create(@Valid @RequestBody PetRequestDTO dto); + @Operation(summary = "Atualizar pet", description = "Atualiza um pet no sistema") + @ApiResponse( + responseCode = "200", + description = "Pet atualizado com sucesso", + content = + @Content( + mediaType = "application/json", + schema = @Schema(implementation = PetResponseDTO.class))) + @ApiResponse( + responseCode = "400", + description = "Dados inválidos", + content = + @Content( + schema = @Schema(implementation = ErrorResponseDTO.class), + examples = + @ExampleObject( + name = "Dados inválidos", + value = + "{\"messages\": [\"Pet name must not be blank\", \"Specie ID must not be null\"]}"))) + @ApiResponse( + responseCode = "404", + description = "Pet não encontrado", + content = + @Content( + schema = @Schema(implementation = ErrorResponseDTO.class), + examples = + @ExampleObject( + name = "Não encontrado", + value = "{\"messages\": [\"Pet not found\"]}"))) + @PutMapping("/{id}") + ResponseEntity update( + @PathVariable UUID id, @Valid @RequestBody PetRequestDTO dto); + @Operation(summary = "Buscar pets", description = "Retorna uma lista paginada de pets") @ApiResponse( responseCode = "200", @@ -46,7 +100,7 @@ public interface PetsController { ResponseEntity> findAll( @ParameterObject PageableRequestDTO pageable); - @Operation(summary = "Buscar um pet", description = "Busca um pet pelo seu id") + @Operation(summary = "Buscar pet", description = "Busca um pet pelo seu id") @ApiResponse( responseCode = "200", description = "Pet buscado com sucesso", 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 9514dad..1a18576 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 @@ -24,6 +24,12 @@ public ResponseEntity create(PetRequestDTO dto) { return ResponseEntity.status(HttpStatus.CREATED).body(response); } + @Override + public ResponseEntity update(UUID id, PetRequestDTO dto) { + PetResponseDTO response = petsService.update(id, dto); + return ResponseEntity.status(HttpStatus.OK).body(response); + } + @Override public ResponseEntity> findAll(PageableRequestDTO pageable) { PageResponseDTO response = petsService.findAll(pageable); diff --git a/src/main/java/br/com/db/petcontrol/dto/request/PetRequestDTO.java b/src/main/java/br/com/db/petcontrol/dto/request/PetRequestDTO.java index ec12377..bd3f295 100644 --- a/src/main/java/br/com/db/petcontrol/dto/request/PetRequestDTO.java +++ b/src/main/java/br/com/db/petcontrol/dto/request/PetRequestDTO.java @@ -4,17 +4,25 @@ import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Pattern; +import jakarta.validation.constraints.Size; import java.util.List; import java.util.UUID; import lombok.Builder; @Builder public record PetRequestDTO( - @NotBlank @Schema(description = "Nome do pet", example = "Lily") String name, - @NotNull + @Pattern(regexp = "^[\\p{L}\\s]+$", message = "The name must contain only letters and spaces") + @NotBlank(message = "Pet name must not be blank") + @Size(max = 20, message = "Pet name must be at most 20 characters long") + @Schema(description = "Nome do pet", example = "Lily") + String name, + @NotNull(message = "Specie ID must not be null") @Schema(description = "ID da espécie", example = "dd3af030-9823-40ff-bc6e-4de9eae55894") UUID specieId, - @NotNull @Schema(description = "Status do pet", example = "AVAILABLE") PetStatus status, + @NotNull(message = "Pet status must not be null") + @Schema(description = "Status do pet", example = "AVAILABLE") + PetStatus status, @Schema( description = "IDs das tags do pet", example = diff --git a/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java b/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java index 0ef61fb..42794de 100644 --- a/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java +++ b/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java @@ -8,6 +8,7 @@ import java.util.List; import org.mapstruct.Mapper; import org.mapstruct.Mapping; +import org.mapstruct.MappingTarget; @Mapper(componentModel = "spring") public interface PetsMapper { @@ -17,6 +18,11 @@ public interface PetsMapper { @Mapping(target = "status", source = "dto.status") Pets toEntity(PetRequestDTO dto, Species species, List tags); + @Mapping(target = "id", ignore = true) + @Mapping(target = "species", ignore = true) + @Mapping(target = "tags", ignore = true) + void toUpdateEntity(PetRequestDTO dto, @MappingTarget Pets pet); + @Mapping(target = "species", source = "species.name") @Mapping(target = "tags", source = "tags") PetResponseDTO toResponse(Pets pet); 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 d5fe5f3..8307a72 100644 --- a/src/main/java/br/com/db/petcontrol/model/Pets.java +++ b/src/main/java/br/com/db/petcontrol/model/Pets.java @@ -21,10 +21,12 @@ import lombok.Builder; import lombok.Getter; import lombok.NoArgsConstructor; +import lombok.Setter; @Entity @Table(name = "tb_pets") @Getter +@Setter @NoArgsConstructor @AllArgsConstructor @Builder 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 0fefe0b..a655779 100644 --- a/src/main/java/br/com/db/petcontrol/service/PetsService.java +++ b/src/main/java/br/com/db/petcontrol/service/PetsService.java @@ -9,6 +9,8 @@ public interface PetsService { PetResponseDTO create(PetRequestDTO dto); + PetResponseDTO update(UUID id, PetRequestDTO dto); + PageResponseDTO findAll(PageableRequestDTO pageable); PetResponseDTO find(UUID id); 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 da5aa39..1b726b4 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 @@ -16,10 +16,12 @@ import br.com.db.petcontrol.service.PetsService; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.UUID; import lombok.RequiredArgsConstructor; import org.springframework.data.domain.Page; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service @RequiredArgsConstructor @@ -35,22 +37,34 @@ public class PetsServiceImpl implements PetsService { public PetResponseDTO create(PetRequestDTO dto) { List errors = new ArrayList<>(); - Species species = speciesRepository.findById(dto.specieId()).orElse(null); - if (species == null) { - errors.add("Species not found: " + dto.specieId()); - } - + Species species = findSpeciesOrCollectErrors(dto.specieId(), errors); List tags = findTagsOrCollectErrors(dto.tagsIds(), errors); - if (!errors.isEmpty()) { - throw new NotFoundException(errors); - } + throwingNotFoundException(errors); Pets pet = petsMapper.toEntity(dto, species, tags); Pets savedPet = petRepository.saveAndFlush(pet); return petsMapper.toResponse(savedPet); } + @Override + @Transactional + public PetResponseDTO update(UUID id, PetRequestDTO dto) { + List errors = new ArrayList<>(); + + Pets pet = findPet(id); + Species species = findSpeciesOrCollectErrors(dto.specieId(), errors); + List tags = findTagsOrCollectErrors(dto.tagsIds(), errors); + + throwingNotFoundException(errors); + + petsMapper.toUpdateEntity(dto, pet); + updateRelationship(pet, species, tags); + + Pets updatedPet = petRepository.saveAndFlush(pet); + return petsMapper.toResponse(updatedPet); + } + @Override public PageResponseDTO findAll(PageableRequestDTO pageable) { Page page = @@ -60,28 +74,51 @@ public PageResponseDTO findAll(PageableRequestDTO pageable) { @Override public PetResponseDTO find(UUID id) { - return petRepository - .findById(id) - .map(petsMapper::toResponse) - .orElseThrow(() -> new NotFoundException("Pet not found")); + return petsMapper.toResponse(findPet(id)); + } + + private void updateRelationship(Pets pet, Species species, List tags) { + pet.setSpecies(species); + + pet.getTags().clear(); + pet.getTags().addAll(tags); + } + + private void throwingNotFoundException(List errors) { + if (!errors.isEmpty()) { + throw new NotFoundException(errors); + } + } + + private Species findSpeciesOrCollectErrors(UUID specieId, List errors) { + Species species = speciesRepository.findById(specieId).orElse(null); + + if (Objects.isNull(species)) { + errors.add("Species not found: " + specieId); + } + + return species; } private List findTagsOrCollectErrors(List ids, List errors) { - if (ids == null || ids.isEmpty()) { + if (Objects.isNull(ids) || ids.isEmpty()) { return List.of(); } List foundTags = tagRepository.findAllById(ids); if (foundTags.size() != ids.size()) { - List notFoundIds = - ids.stream() - .filter(id -> foundTags.stream().noneMatch(tag -> tag.getId().equals(id))) - .toList(); + List foundIds = foundTags.stream().map(Tags::getId).toList(); + + List notFoundIds = ids.stream().filter(id -> !foundIds.contains(id)).toList(); errors.add("Tags not found: " + notFoundIds); } return foundTags; } + + private Pets findPet(UUID id) { + return petRepository.findById(id).orElseThrow(() -> new NotFoundException("Pet not found")); + } } From 7079807c45acfcf57483dad62a3ecc742b7e9eb2 Mon Sep 17 00:00:00 2001 From: Rachel Pizane Date: Wed, 6 May 2026 16:44:53 -0300 Subject: [PATCH 2/3] =?UTF-8?q?[PETCONTROL-004]=20test:=20implementar=20te?= =?UTF-8?q?stes=20de=20integra=C3=A7=C3=A3o=20e=20unit=C3=A1rios=20para=20?= =?UTF-8?q?edi=C3=A7=C3=A3o=20do=20pet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PetsControllerTest.java | 76 +++++++++++++ .../integration/PetsIntegrationTest.java | 36 +++++++ .../service/PetsServiceImplTest.java | 101 ++++++++++++++++++ 3 files changed, 213 insertions(+) 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 9e29fb3..3e57d9b 100644 --- a/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java +++ b/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java @@ -1,11 +1,13 @@ package br.com.db.petcontrol.controller; +import static org.hamcrest.Matchers.greaterThan; import static org.hamcrest.Matchers.hasSize; 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.request.MockMvcRequestBuilders.put; 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; @@ -227,4 +229,78 @@ void shouldReturnBadRequestWhenIdIsInvalid() throws Exception { .andExpect(jsonPath("$.messages[0]").value(expectedMessage)); } } + + @Nested + class UpdatePetTests { + + @Test + void shouldUpdatePetSuccessfully() throws Exception { + UUID petId = UUID.randomUUID(); + + PetRequestDTO request = + PetsFixture.requestDtoBuilder().name("Rex").status(PetStatus.AVAILABLE).build(); + + PetResponseDTO response = + PetsFixture.responseDtoBuilder() + .id(petId) + .name("Rex Atualizado") + .status(PetStatus.ADOPTED) + .species("Cachorro") + .tags(List.of("Vacinado")) + .build(); + + when(petsService.update(petId, request)).thenReturn(response); + + mockMvc + .perform( + put(PET_ID_URL, petId) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtils.convertToJson(request))) + .andExpect(status().isOk()) + .andExpect(content().json(JsonUtils.convertToJson(response))); + + verify(petsService).update(petId, request); + } + + @Test + void shouldReturnNotFoundWhenUpdatingNonexistentPet() throws Exception { + UUID invalidId = UUID.randomUUID(); + PetRequestDTO request = PetsFixture.requestDtoBuilder().build(); + String errorMessage = "Pet not found"; + + when(petsService.update(invalidId, request)).thenThrow(new NotFoundException(errorMessage)); + + mockMvc + .perform( + put(PET_ID_URL, invalidId) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtils.convertToJson(request))) + .andExpect(status().isNotFound()) + .andExpect(jsonPath("$.messages[0]").value(errorMessage)); + } + + @ParameterizedTest + @MethodSource("invalidPetRequestsProvider") + void shouldReturnBadRequestForInvalidRequest(PetRequestDTO invalidRequest) throws Exception { + UUID petId = UUID.randomUUID(); + + mockMvc + .perform( + put(PET_ID_URL, petId) + .contentType(MediaType.APPLICATION_JSON) + .content(JsonUtils.convertToJson(invalidRequest))) + .andExpect(status().isBadRequest()) + .andExpect(jsonPath("$.messages.length()").value(greaterThan(0))); + } + + static Stream invalidPetRequestsProvider() { + return Stream.of( + PetsFixture.requestDtoBuilder().name(null).build(), + PetsFixture.requestDtoBuilder().name("a".repeat(21)).build(), + PetsFixture.requestDtoBuilder().name("Rex@#%$!").build(), + PetsFixture.requestDtoBuilder().name("Rex123").build(), + PetsFixture.requestDtoBuilder().specieId(null).build(), + PetsFixture.requestDtoBuilder().status(null).build()); + } + } } 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 c52dd72..94b72d0 100644 --- a/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java +++ b/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java @@ -10,6 +10,7 @@ import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.enums.PetStatus; import br.com.db.petcontrol.mocks.PetsFixture; +import br.com.db.petcontrol.mocks.TagsFixture; import br.com.db.petcontrol.model.Pets; import br.com.db.petcontrol.model.Species; import br.com.db.petcontrol.model.Tags; @@ -26,6 +27,7 @@ import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.core.ParameterizedTypeReference; +import org.springframework.http.HttpEntity; import org.springframework.http.HttpMethod; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -361,6 +363,40 @@ void shouldReturnPetByIdSuccessfully() { } } + @Nested + class UpdatePetTests { + @Test + void shouldUpdatePetSuccessfully() { + Pets pet = builderWithoutId().name("Rex").status(PetStatus.AVAILABLE).build(); + Pets savedPet = petsRepository.save(pet); + + Tags tag = tagsRepository.save(TagsFixture.builder().id(null).build()); + + PetRequestDTO updateRequest = + PetRequestDTO.builder() + .name("Rex Atualizado") + .specieId(savedSpecies.getId()) + .status(PetStatus.ADOPTED) + .tagsIds(List.of(tag.getId())) + .build(); + + HttpEntity requestEntity = new HttpEntity<>(updateRequest); + + ResponseEntity response = + restTemplate.exchange( + PET_ID_URL, HttpMethod.PUT, requestEntity, PetResponseDTO.class, savedPet.getId()); + + PetResponseDTO updatedPet = response.getBody(); + + assertEquals(HttpStatus.OK, response.getStatusCode()); + assertThat(updatedPet.name()).isEqualTo(updateRequest.name()); + assertThat(updatedPet.status()).isEqualTo(updateRequest.status()); + assertThat(updatedPet.species()).isEqualTo(savedSpecies.getName()); + assertThat(updatedPet.tags()).hasSize(1); + assertThat(updatedPet.tags().getFirst()).isEqualTo(tag.getName()); + } + } + public Pets.PetsBuilder builderWithoutId() { return PetsFixture.builder().id(null).species(savedSpecies); } 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 6ae2a34..6c26c27 100644 --- a/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java +++ b/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java @@ -8,6 +8,7 @@ import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.Mockito.never; +import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; @@ -298,4 +299,104 @@ void shouldThrowNotFoundExceptionWhenPetDoesNotExist() { .hasMessageContaining("Pet not found"); } } + + @Nested + class UpdatePetTests { + @Test + void shouldUpdatePetSuccessfully() { + UUID petId = UUID.randomUUID(); + UUID speciesId = UUID.randomUUID(); + Tags tag = TagsFixture.builder().build(); + List tags = List.of(tag); + + Pets existingPet = PetsFixture.builder().id(petId).build(); + Species species = SpeciesFixture.builder().id(speciesId).name("Cachorro").build(); + + PetRequestDTO updateRequest = + PetsFixture.requestDtoBuilder() + .name("Rex Atualizado") + .specieId(speciesId) + .status(PetStatus.ADOPTED) + .tagsIds(List.of(tag.getId())) + .build(); + + Pets updatedPet = + PetsFixture.builder() + .id(petId) + .name("Rex Atualizado") + .species(species) + .status(PetStatus.ADOPTED) + .tags(tags) + .build(); + + when(petRepository.findById(petId)).thenReturn(Optional.of(existingPet)); + when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); + when(tagRepository.findAllById(List.of(tag.getId()))).thenReturn(tags); + when(petRepository.saveAndFlush(any(Pets.class))).thenReturn(updatedPet); + + PetResponseDTO response = service.update(petId, updateRequest); + + assertThat(response.id()).isEqualTo(petId); + assertThat(response.name()).isEqualTo(updateRequest.name()); + assertThat(response.status()).isEqualTo(updateRequest.status()); + assertThat(response.species()).isEqualTo(species.getName()); + assertThat(response.tags()).containsExactly(tag.getName()); + + verify(petRepository, times(1)).saveAndFlush(any(Pets.class)); + } + + @Test + void shouldThrowNotFoundExceptionWhenPetDoesNotExist() { + UUID petId = UUID.randomUUID(); + PetRequestDTO updateRequest = PetsFixture.requestDtoBuilder().build(); + + when(petRepository.findById(petId)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> service.update(petId, updateRequest)) + .isInstanceOf(NotFoundException.class) + .hasMessageContaining("Pet not found"); + + verify(petRepository, never()).saveAndFlush(any()); + } + + @Test + void shouldThrowNotFoundExceptionWhenSpeciesDoesNotExist() { + UUID petId = UUID.randomUUID(); + UUID speciesId = UUID.randomUUID(); + + Pets existingPet = PetsFixture.builder().id(petId).build(); + PetRequestDTO updateRequest = PetsFixture.requestDtoBuilder().specieId(speciesId).build(); + + when(petRepository.findById(petId)).thenReturn(Optional.of(existingPet)); + when(speciesRepository.findById(speciesId)).thenReturn(Optional.empty()); + + assertThatThrownBy(() -> service.update(petId, updateRequest)) + .isInstanceOf(NotFoundException.class) + .hasMessageContaining("Species not found"); + + verify(petRepository, never()).saveAndFlush(any()); + } + + @Test + void shouldThrowNotFoundExceptionWhenTagDoesNotExist() { + UUID petId = UUID.randomUUID(); + UUID speciesId = UUID.randomUUID(); + UUID tagId = UUID.randomUUID(); + + Pets existingPet = PetsFixture.builder().id(petId).build(); + Species species = SpeciesFixture.builder().id(speciesId).build(); + PetRequestDTO updateRequest = + PetsFixture.requestDtoBuilder().specieId(speciesId).tagsIds(List.of(tagId)).build(); + + when(petRepository.findById(petId)).thenReturn(Optional.of(existingPet)); + when(speciesRepository.findById(speciesId)).thenReturn(Optional.of(species)); + when(tagRepository.findAllById(List.of(tagId))).thenReturn(List.of()); + + assertThatThrownBy(() -> service.update(petId, updateRequest)) + .isInstanceOf(NotFoundException.class) + .hasMessageContaining("Tags not found"); + + verify(petRepository, never()).saveAndFlush(any()); + } + } } From a5c270aa209c5a358624d72932ea1f3604704f8d Mon Sep 17 00:00:00 2001 From: Rachel Pizane Date: Wed, 6 May 2026 19:46:28 -0300 Subject: [PATCH 3/3] [PETCONTROL-004] refactor: refatorar contrato do PetResponseDTO.java --- .../dto/response/PetResponseDTO.java | 5 ++--- .../com/db/petcontrol/mapper/PetsMapper.java | 13 +++---------- .../com/db/petcontrol/mapper/TagsMapper.java | 3 +++ .../controller/PetsControllerTest.java | 9 +++++---- .../integration/PetsIntegrationTest.java | 8 ++++---- .../com/db/petcontrol/mocks/PetsFixture.java | 5 +++-- .../service/PetsServiceImplTest.java | 18 ++++++++++++++---- 7 files changed, 34 insertions(+), 27 deletions(-) diff --git a/src/main/java/br/com/db/petcontrol/dto/response/PetResponseDTO.java b/src/main/java/br/com/db/petcontrol/dto/response/PetResponseDTO.java index b28fdef..a251179 100644 --- a/src/main/java/br/com/db/petcontrol/dto/response/PetResponseDTO.java +++ b/src/main/java/br/com/db/petcontrol/dto/response/PetResponseDTO.java @@ -14,6 +14,5 @@ public record PetResponseDTO( UUID id, @Schema(description = "Nome do pet", example = "Lily") String name, @Schema(description = "Status do pet", example = "AVAILABLE") PetStatus status, - @Schema(description = "Espécie do pet", example = "Gato") String species, - @Schema(description = "Tags do pet", example = "[\"castrado\", \"vacinado\"]") - List tags) {} + @Schema(description = "Espécie do pet") SpeciesResponseDTO species, + @Schema(description = "Tags do pet") List tags) {} diff --git a/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java b/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java index 42794de..283111c 100644 --- a/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java +++ b/src/main/java/br/com/db/petcontrol/mapper/PetsMapper.java @@ -10,7 +10,9 @@ import org.mapstruct.Mapping; import org.mapstruct.MappingTarget; -@Mapper(componentModel = "spring") +@Mapper( + componentModel = "spring", + uses = {SpeciesMapper.class, TagsMapper.class}) public interface PetsMapper { @Mapping(target = "id", ignore = true) @@ -23,14 +25,5 @@ public interface PetsMapper { @Mapping(target = "tags", ignore = true) void toUpdateEntity(PetRequestDTO dto, @MappingTarget Pets pet); - @Mapping(target = "species", source = "species.name") - @Mapping(target = "tags", source = "tags") PetResponseDTO toResponse(Pets pet); - - default List map(List tags) { - if (tags == null) { - return null; - } - return tags.stream().map(Tags::getName).toList(); - } } diff --git a/src/main/java/br/com/db/petcontrol/mapper/TagsMapper.java b/src/main/java/br/com/db/petcontrol/mapper/TagsMapper.java index 20d9834..c7720a8 100644 --- a/src/main/java/br/com/db/petcontrol/mapper/TagsMapper.java +++ b/src/main/java/br/com/db/petcontrol/mapper/TagsMapper.java @@ -2,10 +2,13 @@ import br.com.db.petcontrol.dto.response.TagsResponseDTO; import br.com.db.petcontrol.model.Tags; +import java.util.List; import org.mapstruct.Mapper; @Mapper(componentModel = "spring") public interface TagsMapper { TagsResponseDTO toDTO(Tags tags); + + List toDTOList(List tags); } 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 3e57d9b..2d7a20c 100644 --- a/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java +++ b/src/test/java/br/com/db/petcontrol/controller/PetsControllerTest.java @@ -17,10 +17,12 @@ 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.dto.response.SpeciesResponseDTO; import br.com.db.petcontrol.enums.PetStatus; import br.com.db.petcontrol.exception.NotFoundException; 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.service.PetsService; import br.com.db.petcontrol.utils.JsonUtils; import com.fasterxml.jackson.databind.ObjectMapper; @@ -120,7 +122,8 @@ void shouldReturnPetWithCorrectStatusInResponse() throws Exception { @Test void shouldReturnPetWithCorrectSpeciesInResponse() throws Exception { PetRequestDTO request = PetsFixture.requestDtoBuilder().build(); - PetResponseDTO response = PetsFixture.responseDtoBuilder().species("Gato").build(); + SpeciesResponseDTO speciesResponse = SpeciesFixture.dtoBuilder().name("Gato").build(); + PetResponseDTO response = PetsFixture.responseDtoBuilder().species(speciesResponse).build(); when(petsService.create(any(PetRequestDTO.class))).thenReturn(response); @@ -130,7 +133,7 @@ void shouldReturnPetWithCorrectSpeciesInResponse() throws Exception { .contentType(MediaType.APPLICATION_JSON) .content(objectMapper.writeValueAsString(request))) .andExpect(status().isCreated()) - .andExpect(jsonPath("$.species").value("Gato")); + .andExpect(jsonPath("$.species.name").value("Gato")); } @Test @@ -245,8 +248,6 @@ void shouldUpdatePetSuccessfully() throws Exception { .id(petId) .name("Rex Atualizado") .status(PetStatus.ADOPTED) - .species("Cachorro") - .tags(List.of("Vacinado")) .build(); when(petsService.update(petId, request)).thenReturn(response); 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 94b72d0..693d27e 100644 --- a/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java +++ b/src/test/java/br/com/db/petcontrol/integration/PetsIntegrationTest.java @@ -147,7 +147,7 @@ void shouldReturnPetWithCorrectSpecies() { restTemplate.postForEntity(PETS_URL, request, PetResponseDTO.class); assertEquals(HttpStatus.CREATED, response.getStatusCode()); - assertThat(response.getBody().species()).isEqualTo("Cachorro"); + assertThat(response.getBody().species().name()).isEqualTo("Cachorro"); } @Test @@ -357,7 +357,7 @@ void shouldReturnPetByIdSuccessfully() { assertEquals(HttpStatus.OK, response.getStatusCode()); assertThat(currentPet.id()).isEqualTo(savedPet.getId()); assertThat(currentPet.name()).isEqualTo(savedPet.getName()); - assertThat(currentPet.species()).isEqualTo(savedPet.getSpecies().getName()); + assertThat(currentPet.species().name()).isEqualTo(savedPet.getSpecies().getName()); assertThat(currentPet.status()).isEqualTo(savedPet.getStatus()); assertThat(currentPet.tags()).isEmpty(); } @@ -391,9 +391,9 @@ void shouldUpdatePetSuccessfully() { assertEquals(HttpStatus.OK, response.getStatusCode()); assertThat(updatedPet.name()).isEqualTo(updateRequest.name()); assertThat(updatedPet.status()).isEqualTo(updateRequest.status()); - assertThat(updatedPet.species()).isEqualTo(savedSpecies.getName()); + assertThat(updatedPet.species().name()).isEqualTo(savedSpecies.getName()); assertThat(updatedPet.tags()).hasSize(1); - assertThat(updatedPet.tags().getFirst()).isEqualTo(tag.getName()); + assertThat(updatedPet.tags().getFirst().name()).isEqualTo(tag.getName()); } } diff --git a/src/test/java/br/com/db/petcontrol/mocks/PetsFixture.java b/src/test/java/br/com/db/petcontrol/mocks/PetsFixture.java index fddcae1..3aaa58f 100644 --- a/src/test/java/br/com/db/petcontrol/mocks/PetsFixture.java +++ b/src/test/java/br/com/db/petcontrol/mocks/PetsFixture.java @@ -4,6 +4,7 @@ import br.com.db.petcontrol.dto.response.PetResponseDTO; import br.com.db.petcontrol.enums.PetStatus; import br.com.db.petcontrol.model.Pets; +import java.util.ArrayList; import java.util.List; import java.util.UUID; @@ -20,7 +21,7 @@ public static Pets.PetsBuilder builder() { .name(DEFAULT_NAME) .status(DEFAULT_STATUS) .species(SpeciesFixture.builder().build()) - .tags(List.of()); + .tags(new ArrayList<>()); } public static PetRequestDTO.PetRequestDTOBuilder requestDtoBuilder() { @@ -36,7 +37,7 @@ public static PetResponseDTO.PetResponseDTOBuilder responseDtoBuilder() { .id(UUID.randomUUID()) .name(DEFAULT_NAME) .status(DEFAULT_STATUS) - .species("Cachorro") + .species(SpeciesFixture.dtoBuilder().build()) .tags(List.of()); } } 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 6c26c27..dd596ff 100644 --- a/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java +++ b/src/test/java/br/com/db/petcontrol/service/PetsServiceImplTest.java @@ -19,6 +19,8 @@ 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.mapper.SpeciesMapper; +import br.com.db.petcontrol.mapper.TagsMapper; import br.com.db.petcontrol.mocks.PageFixture; import br.com.db.petcontrol.mocks.PetsFixture; import br.com.db.petcontrol.mocks.SpeciesFixture; @@ -43,6 +45,7 @@ import org.mockito.junit.jupiter.MockitoSettings; import org.mockito.quality.Strictness; import org.springframework.data.domain.Pageable; +import org.springframework.test.util.ReflectionTestUtils; @ExtendWith(MockitoExtension.class) @MockitoSettings(strictness = Strictness.LENIENT) @@ -53,14 +56,21 @@ class PetsServiceImplTest { @Mock private TagsRepository tagRepository; private PetsMapper petsMapper; + private SpeciesMapper speciesMapper; + private TagsMapper tagsMapper; private PageMapper pageMapper; private PetsServiceImpl service; @BeforeEach void setUp() { - petsMapper = Mappers.getMapper(PetsMapper.class); pageMapper = Mappers.getMapper(PageMapper.class); + petsMapper = Mappers.getMapper(PetsMapper.class); + speciesMapper = Mappers.getMapper(SpeciesMapper.class); + tagsMapper = Mappers.getMapper(TagsMapper.class); + + ReflectionTestUtils.setField(petsMapper, "speciesMapper", speciesMapper); + ReflectionTestUtils.setField(petsMapper, "tagsMapper", tagsMapper); service = new PetsServiceImpl( @@ -85,7 +95,7 @@ void shouldCreatePetSuccessfully() { assertThat(result).isNotNull(); assertThat(result.name()).isEqualTo(expectedPet.getName()); - assertThat(result.species()).isEqualTo("Cachorro"); + assertThat(result.species().name()).isEqualTo("Cachorro"); } @Test @@ -339,8 +349,8 @@ void shouldUpdatePetSuccessfully() { assertThat(response.id()).isEqualTo(petId); assertThat(response.name()).isEqualTo(updateRequest.name()); assertThat(response.status()).isEqualTo(updateRequest.status()); - assertThat(response.species()).isEqualTo(species.getName()); - assertThat(response.tags()).containsExactly(tag.getName()); + assertThat(response.species().name()).isEqualTo(species.getName()); + assertThat(response.tags()).hasSameSizeAs(tags); verify(petRepository, times(1)).saveAndFlush(any(Pets.class)); }