DevFW-CICD/spring-petclinic
14
0
Fork 1
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-05-29 14:29:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move Visit to owner package (it's aggregate root)

Browse source
This commit is contained in:
Dave Syer 2022-01-05 09:32:03 +00:00
parent 58fe6298f8
commit 423a337543
5 changed files with 4 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/main/java/org/springframework/samples/petclinic/owner/Pet.java
View file

@ -32,7 +32,6 @@ import javax.persistence.Table;
import org.springframework.format.annotation.DateTimeFormat; import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.samples.petclinic.model.NamedEntity; import org.springframework.samples.petclinic.model.NamedEntity;
import org.springframework.samples.petclinic.visit.Visit;
/** /**
* Simple business object representing a pet. * Simple business object representing a pet.

2
src/main/java/org/springframework/samples/petclinic/owner/Visit.java
View file

@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and * See the License for the specific language governing permissions and
* limitations under the License. * limitations under the License.
*/ */
package org.springframework.samples.petclinic.visit; package org.springframework.samples.petclinic.owner;
import java.time.LocalDate; import java.time.LocalDate;

5
src/main/java/org/springframework/samples/petclinic/owner/VisitController.java
View file

@ -19,7 +19,6 @@ import java.util.Map;
import javax.validation.Valid; import javax.validation.Valid;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.validation.BindingResult; import org.springframework.validation.BindingResult;
import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.WebDataBinder;
@ -63,6 +62,7 @@ class VisitController {
Owner owner = this.owners.findById(ownerId); Owner owner = this.owners.findById(ownerId);
Pet pet = owner.getPet(petId); Pet pet = owner.getPet(petId);
model.put("pet", pet); model.put("pet", pet);
model.put("owner", owner);
Visit visit = new Visit(); Visit visit = new Visit();
pet.addVisit(visit); pet.addVisit(visit);
return visit; return visit;
@ -78,12 +78,11 @@ class VisitController {
// Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is // Spring MVC calls method loadPetWithVisit(...) before processNewVisitForm is
// called // called
@PostMapping("/owners/{ownerId}/pets/{petId}/visits/new") @PostMapping("/owners/{ownerId}/pets/{petId}/visits/new")
public String processNewVisitForm(@PathVariable("ownerId") int ownerId, @Valid Visit visit, BindingResult result) { public String processNewVisitForm(@ModelAttribute Owner owner, @Valid Visit visit, BindingResult result) {
if (result.hasErrors()) { if (result.hasErrors()) {
return "pets/createOrUpdateVisitForm"; return "pets/createOrUpdateVisitForm";
} }
else { else {
Owner owner = this.owners.findById(ownerId);
owner.getPet(visit.getPetId()).addVisit(visit); owner.getPet(visit.getPetId()).addVisit(visit);
this.owners.save(owner); this.owners.save(owner);
return "redirect:/owners/{ownerId}"; return "redirect:/owners/{ownerId}";

1
src/test/java/org/springframework/samples/petclinic/owner/OwnerControllerTests.java
View file

@ -46,7 +46,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.data.domain.Page; import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageImpl; import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable; import org.springframework.data.domain.Pageable;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.test.web.servlet.MockMvc; import org.springframework.test.web.servlet.MockMvc;
/** /**

2
src/test/java/org/springframework/samples/petclinic/service/ClinicServiceTests.java
View file

@ -33,9 +33,9 @@ import org.springframework.samples.petclinic.owner.Owner;
import org.springframework.samples.petclinic.owner.OwnerRepository; import org.springframework.samples.petclinic.owner.OwnerRepository;
import org.springframework.samples.petclinic.owner.Pet; import org.springframework.samples.petclinic.owner.Pet;
import org.springframework.samples.petclinic.owner.PetType; import org.springframework.samples.petclinic.owner.PetType;
import org.springframework.samples.petclinic.owner.Visit;
import org.springframework.samples.petclinic.vet.Vet; import org.springframework.samples.petclinic.vet.Vet;
import org.springframework.samples.petclinic.vet.VetRepository; import org.springframework.samples.petclinic.vet.VetRepository;
import org.springframework.samples.petclinic.visit.Visit;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;