From aa1545d16637e7987b17a7d67150ec6b1a8fdf56 Mon Sep 17 00:00:00 2001 From: Abraham Date: Mon, 12 Apr 2021 19:55:00 +0200 Subject: [PATCH 1/2] 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); From a4dc355bd6e0c74a2a2d646666a23d92e4cb39db Mon Sep 17 00:00:00 2001 From: abemorcardc Date: Mon, 12 Apr 2021 21:03:18 +0200 Subject: [PATCH 2/2] Arreglados show y edit de cliente y usuario con los nuevos cambios --- .../cheapy/model/Authorities.java | 1 - .../springframework/cheapy/model/Code.java | 1 - .../springframework/cheapy/model/User.java | 4 ---- .../springframework/cheapy/model/Usuario.java | 1 - .../cheapy/system/SingUpController.java | 4 ---- .../cheapy/web/ClientController.java | 6 +++--- .../cheapy/web/UsuarioController.java | 11 +++++++++-- src/main/resources/db/mysql/data.sql | 2 +- .../webapp/WEB-INF/jsp/clients/clientShow.jsp | 4 ++++ .../jsp/clients/createOrUpdateClientForm.jsp | 19 +++++++++---------- .../usuarios/createOrUpdateUsuarioForm.jsp | 19 ++++++++----------- .../WEB-INF/jsp/usuarios/usuariosShow.jsp | 9 +++------ 12 files changed, 37 insertions(+), 44 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/model/Authorities.java b/src/main/java/org/springframework/cheapy/model/Authorities.java index a39220455..f12de11e0 100644 --- a/src/main/java/org/springframework/cheapy/model/Authorities.java +++ b/src/main/java/org/springframework/cheapy/model/Authorities.java @@ -3,7 +3,6 @@ package org.springframework.cheapy.model; import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import javax.validation.constraints.NotNull; @Entity @Table(name = "authorities") diff --git a/src/main/java/org/springframework/cheapy/model/Code.java b/src/main/java/org/springframework/cheapy/model/Code.java index a151abf8d..e441d4e31 100644 --- a/src/main/java/org/springframework/cheapy/model/Code.java +++ b/src/main/java/org/springframework/cheapy/model/Code.java @@ -1,7 +1,6 @@ package org.springframework.cheapy.model; import javax.persistence.Entity; -import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.NotNull; diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java index 275ec7968..7891d4c8e 100644 --- a/src/main/java/org/springframework/cheapy/model/User.java +++ b/src/main/java/org/springframework/cheapy/model/User.java @@ -5,10 +5,6 @@ import javax.persistence.Id; import javax.persistence.Table; import javax.validation.constraints.NotBlank; -import org.springframework.boot.context.properties.bind.DefaultValue; - -import net.bytebuddy.implementation.bind.annotation.Default; - @Entity @Table(name = "users") public class User { diff --git a/src/main/java/org/springframework/cheapy/model/Usuario.java b/src/main/java/org/springframework/cheapy/model/Usuario.java index 660faa88a..9adf0a9ec 100644 --- a/src/main/java/org/springframework/cheapy/model/Usuario.java +++ b/src/main/java/org/springframework/cheapy/model/Usuario.java @@ -9,7 +9,6 @@ import javax.persistence.OneToOne; import javax.persistence.Table; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; @Entity @Table(name = "usuarios") diff --git a/src/main/java/org/springframework/cheapy/system/SingUpController.java b/src/main/java/org/springframework/cheapy/system/SingUpController.java index d07f727f6..6459ec357 100644 --- a/src/main/java/org/springframework/cheapy/system/SingUpController.java +++ b/src/main/java/org/springframework/cheapy/system/SingUpController.java @@ -1,6 +1,5 @@ package org.springframework.cheapy.system; -import java.util.Collection; import java.util.Map; import javax.servlet.http.HttpServletRequest; @@ -18,15 +17,12 @@ import org.springframework.cheapy.service.ClientService; import org.springframework.cheapy.service.UserService; import org.springframework.cheapy.service.UsuarioService; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.InitBinder; -import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.servlet.ModelAndView; @Controller public class SingUpController { diff --git a/src/main/java/org/springframework/cheapy/web/ClientController.java b/src/main/java/org/springframework/cheapy/web/ClientController.java index 9fa128732..fab77c2e5 100644 --- a/src/main/java/org/springframework/cheapy/web/ClientController.java +++ b/src/main/java/org/springframework/cheapy/web/ClientController.java @@ -12,6 +12,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Client; import org.springframework.cheapy.model.FoodOffer; +import org.springframework.cheapy.model.Municipio; import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; @@ -85,7 +86,7 @@ public class ClientController { Client client = this.clientService.getCurrentClient(); - + model.put("municipio", Municipio.values()); model.addAttribute("client", client); return ClientController.VIEWS_CREATE_OR_UPDATE_CLIENT; @@ -97,8 +98,6 @@ 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"); @@ -107,6 +106,7 @@ public class ClientController { if (result.hasErrors()) { model.addAttribute("client", clientEdit); + model.put("municipio", Municipio.values()); return ClientController.VIEWS_CREATE_OR_UPDATE_CLIENT; } diff --git a/src/main/java/org/springframework/cheapy/web/UsuarioController.java b/src/main/java/org/springframework/cheapy/web/UsuarioController.java index 8e6d965cc..593443a76 100644 --- a/src/main/java/org/springframework/cheapy/web/UsuarioController.java +++ b/src/main/java/org/springframework/cheapy/web/UsuarioController.java @@ -7,6 +7,7 @@ import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import org.springframework.beans.BeanUtils; +import org.springframework.cheapy.model.Municipio; import org.springframework.cheapy.model.Usuario; import org.springframework.cheapy.service.UsuarioService; import org.springframework.stereotype.Controller; @@ -37,15 +38,21 @@ public class UsuarioController { public String updateUsuario(final ModelMap model, HttpServletRequest request) { Usuario usuario = this.usuarioService.getCurrentUsuario(); model.addAttribute("usuario", usuario); + model.put("municipio", Municipio.values()); return UsuarioController.VIEWS_USUARIO_CREATE_OR_UPDATE_FORM; } @PostMapping(value = "/usuarios/edit") public String updateUsuario(@Valid final Usuario usuarioEdit, final BindingResult result, final ModelMap model, HttpServletRequest request) { - + + if (result.hasErrors()) { + model.addAttribute("usuario", usuarioEdit); + model.put("municipio", Municipio.values()); + return UsuarioController.VIEWS_USUARIO_CREATE_OR_UPDATE_FORM; + } Usuario usuario = this.usuarioService.getCurrentUsuario(); - BeanUtils.copyProperties(usuario, usuarioEdit, "nombre", "apellidos", "dni", "direccion", "telefono", "usuar"); + BeanUtils.copyProperties(usuario, usuarioEdit, "nombre", "apellidos", "municipio", "direccion","email", "usuar"); usuarioEdit.getUsuar().setUsername(usuario.getNombre()); usuarioEdit.getUsuar().setEnabled(true); this.usuarioService.saveUsuario(usuarioEdit); diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 97230b156..39ba10cab 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -25,7 +25,7 @@ INSERT INTO codes (id,code,activo) VALUES (3,'code3',TRUE); INSERT INTO codes (id,code,activo) VALUES (4,'code4',TRUE); INSERT INTO clients (id, name, email, address, municipio, init, finish, telephone, description, food, username, code) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis', 'sevilla','10:00','22:00','608726190', 'description 1', 'ESPAÑOLA','manoli', 'code1'); -INSERT INTO clients (id, name, email, address, municipio, init, finish, telephone, description, food, username, code) VALUES (2,'bar david','david@gmail.com','C/Sevilla', 'dosHermanas','09:30','22:00','608726190', 'description 2', 'americana','david', 'code2'); +INSERT INTO clients (id, name, email, address, municipio, init, finish, telephone, description, food, username, code) VALUES (2,'bar david','david@gmail.com','C/Sevilla', 'dos_hermanas','09:30','22:00','608726190', 'description 2', 'americana','david', 'code2'); INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-08-14 12:00:00', '2021-08-15 12:00:00', 'FO-1', 'inactive', 1, 'macarrones', 15); diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp index 8b865dd99..b3c34f7e9 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp @@ -35,6 +35,10 @@ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp index 163807396..582488b38 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp @@ -15,7 +15,6 @@
- @@ -24,6 +23,14 @@ +
+ + +
@@ -31,18 +38,10 @@
- - - - - + - -
diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp index e63363513..fd58830a6 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp @@ -16,27 +16,24 @@
- +
+ + +
-
- - - - - - -
diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp index c9201d00c..ae1cb8d4c 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/usuariosShow.jsp @@ -22,17 +22,14 @@ - - + + - - - - +