Patrick.Sy/spring-petclinic
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-petclinic.git synced 2025-07-25 01:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move VetController logic into the application layer

Browse source
This commit is contained in:
Ismail Ismailov 2023-04-27 14:29:19 +02:00
parent e1b9a6a18e
commit f360094b99
3 changed files with 45 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/main/java/org/springframework/samples/petclinic/application/VetService.java Normal file
View file

@ -0,0 +1,29 @@
package org.springframework.samples.petclinic.application;
import java.util.Collection;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.VetRepository;
import org.springframework.stereotype.Service;
@Service
public class VetService {
private final VetRepository vetRepository;
public VetService(VetRepository vetRepository) {
this.vetRepository = vetRepository;
}
public Page<Vet> getVetPage(int page, int pageSize) {
Pageable pageable = PageRequest.of(page - 1, pageSize);
return this.vetRepository.findAll(pageable);
}
public Collection<Vet> getVets() {
return this.vetRepository.findAll();
}
}

16
src/main/java/org/springframework/samples/petclinic/infrastructure/controller/VetController.java
View file

@ -15,13 +15,12 @@
*/
package org.springframework.samples.petclinic.infrastructure.controller;
import java.util.Collection;
import java.util.List;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.samples.petclinic.application.VetService;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.VetRepository;
import org.springframework.samples.petclinic.infrastructure.view.Vets;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
@ -38,10 +37,10 @@ import org.springframework.web.bind.annotation.ResponseBody;
@Controller
class VetController {
private final VetRepository vetRepository;
private final VetService vetService;
public VetController(VetRepository clinicService) {
this.vetRepository = clinicService;
public VetController(VetService vetService) {
this.vetService = vetService;
}
@GetMapping("/vets.html")
@ -66,8 +65,7 @@ class VetController {
private Page<Vet> findPaginated(int page) {
int pageSize = 5;
Pageable pageable = PageRequest.of(page - 1, pageSize);
return vetRepository.findAll(pageable);
return vetService.getVetPage(page, pageSize);
}
@GetMapping({ "/vets" })
@ -75,7 +73,7 @@ class VetController {
// Here we are returning an object of type 'Vets' rather than a collection of Vet
// objects so it is simpler for JSon/Object mapping
Vets vets = new Vets();
vets.getVetList().addAll(this.vetRepository.findAll());
vets.getVetList().addAll(vetService.getVets());
return vets;
}

14
src/test/java/org/springframework/samples/petclinic/infrastructure/controller/VetControllerTests.java
View file

@ -16,6 +16,7 @@
package org.springframework.samples.petclinic.infrastructure.controller;
import java.util.ArrayList;
import org.assertj.core.util.Lists;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
@ -25,9 +26,9 @@ import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.data.domain.PageImpl;
import org.springframework.data.domain.Pageable;
import org.springframework.http.MediaType;
import org.springframework.samples.petclinic.application.VetService;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.Specialty;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.Vet;
import org.springframework.samples.petclinic.infrastructure.persistence.vet.VetRepository;
import org.springframework.test.web.servlet.MockMvc;
import org.springframework.test.web.servlet.ResultActions;
import org.springframework.test.web.servlet.request.MockMvcRequestBuilders;
@ -48,7 +49,7 @@ class VetControllerTests {
private MockMvc mockMvc;
@MockBean
private VetRepository vets;
private VetService vetService;
private Vet james() {
Vet james = new Vet();
@ -72,9 +73,12 @@ class VetControllerTests {
@BeforeEach
void setup() {
given(this.vets.findAll()).willReturn(Lists.newArrayList(james(), helen()));
given(this.vets.findAll(any(Pageable.class)))
.willReturn(new PageImpl<Vet>(Lists.newArrayList(james(), helen())));
ArrayList<Vet> vetsList = Lists.newArrayList(james(), helen());
given(this.vetService.getVets()).willReturn(vetsList);
given(this.vetService.getVetPage(1, 5))
.willReturn(new PageImpl<>(vetsList));
}