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

fix errors

Browse source
This commit is contained in:
Abraham 2021-04-12 19:55:00 +02:00
parent 3ae808a2c5
commit aa1545d166
5 changed files with 23 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/main/java/org/springframework/cheapy/web/ClientController.java
View file

@ -84,6 +84,7 @@ public class ClientController {
public String updateClient( final ModelMap model, HttpServletRequest request) {
Client client = this.clientService.getCurrentClient();
model.addAttribute("client", client);
@ -96,7 +97,8 @@ public class ClientController {
Client clienteSesion = this.clientService.getCurrentClient();
clientEdit.setCode(clienteSesion.getCode());
clientEdit.setMunicipio(clienteSesion.getMunicipio());
if(!this.checkTimes(clientEdit)) {
result.rejectValue("finish","" ,"La hora de cierre debe ser posterior a la hora de apertura");
@ -161,7 +163,6 @@ public class ClientController {
public String showRestaurant(final ModelMap model, @PathVariable("clientId") Integer id) {
Client client = this.clientRepo.findById(id).get();
System.out.println(client.getDescription());
model.put("client", client);
return "clients/restaurantShow";
}

6
src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java
View file

@ -18,6 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.cheapy.configuration.SecurityConfiguration;
import org.springframework.cheapy.model.Client;
import org.springframework.cheapy.model.Code;
import org.springframework.cheapy.model.FoodOffer;
import org.springframework.cheapy.model.User;
import org.springframework.cheapy.service.ClientService;
@ -52,6 +53,9 @@ class FoodOfferControllerTest {
@BeforeEach
void setup() {
User user1 = new User();
Code code1 = new Code();
code1.setActivo(true);
code1.setCode("codeTest1");
user1.setUsername("user1");
user1.setPassword("user1");
Client client1 = new Client();;
@ -63,7 +67,7 @@ class FoodOfferControllerTest {
client1.setFinish(LocalTime.of(01, 01));
client1.setTelephone("123456789");
client1.setDescription("client1");
client1.setCode("client1");
client1.setCode(code1);
client1.setFood("client1");
client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);

6
src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java
View file

@ -18,6 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.cheapy.configuration.SecurityConfiguration;
import org.springframework.cheapy.model.Client;
import org.springframework.cheapy.model.Code;
import org.springframework.cheapy.model.NuOffer;
import org.springframework.cheapy.model.User;
import org.springframework.cheapy.service.ClientService;
@ -51,6 +52,9 @@ class NuOfferControllerTest {
@BeforeEach
void setup() {
User user1 = new User();
Code code1 = new Code();
code1.setActivo(true);
code1.setCode("codeTest1");
user1.setUsername("user1");
user1.setPassword("user1");
Client client1 = new Client();
@ -62,7 +66,7 @@ class NuOfferControllerTest {
client1.setFinish(LocalTime.of(01, 01));
client1.setTelephone("123456789");
client1.setDescription("client1");
client1.setCode("client1");
client1.setCode(code1);
client1.setFood("client1");
client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);

6
src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java
View file

@ -18,6 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.cheapy.configuration.SecurityConfiguration;
import org.springframework.cheapy.model.Client;
import org.springframework.cheapy.model.Code;
import org.springframework.cheapy.model.SpeedOffer;
import org.springframework.cheapy.model.User;
import org.springframework.cheapy.service.ClientService;
@ -52,6 +53,9 @@ class SpeedOfferControllerTest {
@BeforeEach
void setup() {
User user1 = new User();
Code code1 = new Code();
code1.setActivo(true);
code1.setCode("codeTest1");
user1.setUsername("user1");
user1.setPassword("user1");
Client client1 = new Client();
@ -63,7 +67,7 @@ class SpeedOfferControllerTest {
client1.setFinish(LocalTime.of(01, 01));
client1.setTelephone("123456789");
client1.setDescription("client1");
client1.setCode("client1");
client1.setCode(code1);
client1.setFood("client1");
client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);

6
src/test/java/org/springframework/cheapy/web/TimeOfferControllerTests.java
View file

@ -18,6 +18,7 @@ import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest;
import org.springframework.boot.test.mock.mockito.MockBean;
import org.springframework.cheapy.configuration.SecurityConfiguration;
import org.springframework.cheapy.model.Client;
import org.springframework.cheapy.model.Code;
import org.springframework.cheapy.model.TimeOffer;
import org.springframework.cheapy.model.User;
import org.springframework.cheapy.service.ClientService;
@ -51,6 +52,9 @@ class TimeOfferControllerTest {
@BeforeEach
void setup() {
User user1 = new User();
Code code1 = new Code();
code1.setActivo(true);
code1.setCode("codeTest1");
user1.setUsername("user1");
user1.setPassword("user1");
Client client1 = new Client();
@ -62,7 +66,7 @@ class TimeOfferControllerTest {
client1.setFinish(LocalTime.of(01, 01));
client1.setTelephone("123456789");
client1.setDescription("client1");
client1.setCode("client1");
client1.setCode(code1);
client1.setFood("client1");
client1.setUsuar(user1);
BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1);