DevFW-CICD/spring-petclinic
16
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-22 07:15:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

PetDTO fix loop in equal testing for OwnerDTO attribute

Browse source
This commit is contained in:
PEDSF 2020-10-19 18:18:03 +02:00
parent c6b54da5df
commit f7f07f42dd
7 changed files with 25 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/org/springframework/samples/petclinic/controller/PetController.java
View file

@ -110,7 +110,7 @@ class PetController {
@PostMapping(CommonEndPoint.PETS_ID_EDIT)
public String processUpdateForm(@ModelAttribute(CommonAttribute.PET) @Valid PetDTO pet, BindingResult result,
OwnerDTO owner, ModelMap model) {
@ModelAttribute(CommonAttribute.OWNER) OwnerDTO owner, ModelMap model) {
if (result.hasErrors()) {
pet.setOwner(owner);
model.put(CommonAttribute.PET, pet);

2
src/main/java/org/springframework/samples/petclinic/controller/VisitController.java
View file

@ -80,7 +80,7 @@ class VisitController {
// Spring MVC calls method loadPetWithVisit(...) before initNewVisitForm is called
@GetMapping(CommonEndPoint.VISITS_NEW)
public String initNewVisitForm(@PathVariable("petId") int petId, Map<String, Object> model) {
return CommonView.PET_CREATE_OR_UPDATE;
return CommonView.VISIT_CREATE_OR_UPDATE;
}
// Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is called

2
src/main/java/org/springframework/samples/petclinic/dto/OwnerDTO.java
View file

@ -86,7 +86,7 @@ public class OwnerDTO extends PersonDTO {
public void addPet(PetDTO pet) {
if (!this.getPets().contains(pet)) {
if (pet.isNew() || this.getPets() == null || !this.getPets().contains(pet)) {
getPetsInternal().add(pet);
}
pet.setOwner(this);

4
src/main/java/org/springframework/samples/petclinic/dto/PetDTO.java
View file

@ -90,6 +90,8 @@ public class PetDTO extends NamedDTO {
return true;
if (!(o instanceof PetDTO))
return false;
if (!super.equals(o))
return false;
PetDTO petDTO = (PetDTO) o;
@ -97,7 +99,7 @@ public class PetDTO extends NamedDTO {
return false;
if (!getType().equals(petDTO.getType()))
return false;
if (!getOwner().getId().equals(petDTO.getOwner().getId()))
if (getOwner() != null ? !getOwner().getId().equals(petDTO.getOwner().getId()) : petDTO.getOwner() != null)
return false;
return getVisits() != null ? getVisits().equals(petDTO.getVisits()) : petDTO.getVisits() == null;
}

8
src/main/java/org/springframework/samples/petclinic/repository/PetRepository.java
View file

@ -15,7 +15,6 @@
*/
package org.springframework.samples.petclinic.repository;
import java.util.Collection;
import java.util.List;
import org.springframework.data.jpa.repository.Query;
@ -53,6 +52,13 @@ public interface PetRepository extends Repository<Pet, Integer> {
*/
Pet findById(Integer id);
/**
* Retrieve all {@link Pet}d from the data store by owner id.
* @param id the id of owner to search for
* @return a Collection of {@link Pet}s
*/
List<Pet> findByOwnerId(Integer id);
/**
* Retrieve all {@link Pet}s from the data store
* @return a Collection of {@link Pet}s (or an empty Collection if none

22
src/main/java/org/springframework/samples/petclinic/service/PetService.java
View file

@ -50,7 +50,7 @@ public class PetService implements BaseService<Pet, PetDTO> {
dto.getVisits().forEach(visitDTO -> pet.addVisit(visitService.dtoToEntity(visitDTO)));
dto.getOwner().getPets().forEach(petDTO -> {
if (petDTO.getId().equals(dto.getId())) {
if (dto.getId() == null || petDTO.getId().equals(dto.getId())) {
owner.addPet(pet);
}
else {
@ -72,18 +72,14 @@ public class PetService implements BaseService<Pet, PetDTO> {
PetDTO petDTO = modelMapper.map(entity, PetDTO.class);
OwnerDTO ownerDTO = modelMapper.map(entity.getOwner(), OwnerDTO.class);
petRepository.findByOwnerId(ownerDTO.getId()).forEach(pet -> {
PetDTO otherPetDTO = modelMapper.map(pet, PetDTO.class);
otherPetDTO.setOwner(ownerDTO);
ownerDTO.addPet(otherPetDTO);
});
entity.getVisits().forEach(visit -> petDTO.addVisit(visitService.entityToDTO(visit)));
entity.getOwner().getPets().forEach(pet -> {
if (pet.getId().equals(entity.getId())) {
ownerDTO.addPet(petDTO);
}
else {
PetDTO otherPetDTO = modelMapper.map(pet, PetDTO.class);
otherPetDTO.setOwner(ownerDTO);
ownerDTO.addPet(otherPetDTO);
}
});
petDTO.setOwner(ownerDTO);
return petDTO;
}
@ -125,6 +121,10 @@ public class PetService implements BaseService<Pet, PetDTO> {
petRepository.save(dtoToEntity(petDTO));
}
public List<PetDTO> findByOwnerId(int id) {
return entitiesToDTOS(petRepository.findByOwnerId(id));
}
public List<PetTypeDTO> findPetTypes() {
List<PetType> petTypes = petRepository.findPetTypes();

2
src/test/java/org/springframework/samples/petclinic/controller/VisitControllerTests.java
View file

@ -65,7 +65,7 @@ class VisitControllerTests {
@Tag("initNewVisitForm")
void testInitNewVisitForm() throws Exception {
mockMvc.perform(get(CommonEndPoint.VISITS_NEW, TEST_PET_ID)).andExpect(status().isOk())
.andExpect(view().name(CommonView.PET_CREATE_OR_UPDATE));
.andExpect(view().name(CommonView.VISIT_CREATE_OR_UPDATE));
}
@Test