From aa1545d16637e7987b17a7d67150ec6b1a8fdf56 Mon Sep 17 00:00:00 2001 From: Abraham Date: Mon, 12 Apr 2021 19:55:00 +0200 Subject: [PATCH] fix errors --- .../org/springframework/cheapy/web/ClientController.java | 5 +++-- .../cheapy/web/FoodOfferControllerTests.java | 6 +++++- .../springframework/cheapy/web/NuOfferControllerTests.java | 6 +++++- .../cheapy/web/SpeedOfferControllerTests.java | 6 +++++- .../cheapy/web/TimeOfferControllerTests.java | 6 +++++- 5 files changed, 23 insertions(+), 6 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/web/ClientController.java b/src/main/java/org/springframework/cheapy/web/ClientController.java index f17923b36..9fa128732 100644 --- a/src/main/java/org/springframework/cheapy/web/ClientController.java +++ b/src/main/java/org/springframework/cheapy/web/ClientController.java @@ -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"; } diff --git a/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java index a6ca4f81c..d4282cf3c 100644 --- a/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java +++ b/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java @@ -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); diff --git a/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java index 13815ff9a..2eefd3e90 100644 --- a/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java +++ b/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java @@ -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); diff --git a/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java index d05027011..5ebea4839 100644 --- a/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java +++ b/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java @@ -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); diff --git a/src/test/java/org/springframework/cheapy/web/TimeOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/TimeOfferControllerTests.java index 8ff0a094e..7456c63c0 100644 --- a/src/test/java/org/springframework/cheapy/web/TimeOfferControllerTests.java +++ b/src/test/java/org/springframework/cheapy/web/TimeOfferControllerTests.java @@ -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);