From d574a048e3ca80574676c8d267bddd8b6df141d4 Mon Sep 17 00:00:00 2001 From: Abraham Date: Sat, 10 Apr 2021 14:36:59 +0200 Subject: [PATCH 01/18] no funcional --- .../cheapy/model/Authorities.java | 10 +- .../cheapy/model/Municipio.java | 5 + .../springframework/cheapy/model/User.java | 26 +- .../springframework/cheapy/model/Usuario.java | 43 +-- .../repository/AuthoritiesRepository.java | 9 +- .../cheapy/repository/UserRepository.java | 7 +- .../cheapy/repository/UsuarioRepository.java | 20 ++ .../cheapy/service/AuthoritiesService.java | 10 +- .../cheapy/service/UserService.java | 6 +- .../cheapy/service/UsuarioService.java | 34 ++ .../cheapy/system/SingUpController.java | 147 +++++++++ src/main/resources/db/mysql/data.sql | 32 +- .../webapp/WEB-INF/jsp/singup/singUpUser.jsp | 307 ++++++++++++++++++ src/main/webapp/WEB-INF/tags/menu.tag | 4 + 14 files changed, 602 insertions(+), 58 deletions(-) create mode 100644 src/main/java/org/springframework/cheapy/model/Municipio.java create mode 100644 src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java create mode 100644 src/main/java/org/springframework/cheapy/service/UsuarioService.java create mode 100644 src/main/java/org/springframework/cheapy/system/SingUpController.java create mode 100644 src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp diff --git a/src/main/java/org/springframework/cheapy/model/Authorities.java b/src/main/java/org/springframework/cheapy/model/Authorities.java index 3bcfbbb35..b774c1443 100644 --- a/src/main/java/org/springframework/cheapy/model/Authorities.java +++ b/src/main/java/org/springframework/cheapy/model/Authorities.java @@ -3,12 +3,18 @@ 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") -public class Authorities{ +public class Authorities extends BaseEntity{ - @Id + /** + * + */ + private static final long serialVersionUID = 1L; + + @NotNull String username; String authority; diff --git a/src/main/java/org/springframework/cheapy/model/Municipio.java b/src/main/java/org/springframework/cheapy/model/Municipio.java new file mode 100644 index 000000000..f89afca92 --- /dev/null +++ b/src/main/java/org/springframework/cheapy/model/Municipio.java @@ -0,0 +1,5 @@ +package org.springframework.cheapy.model; + +public enum Municipio { +sevilla,dosHermanas,carmona,bollullos,pilas,montellano,mairenaAljarafe,mairenaAlcor +} diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java index e9c232562..f5d51e554 100644 --- a/src/main/java/org/springframework/cheapy/model/User.java +++ b/src/main/java/org/springframework/cheapy/model/User.java @@ -5,20 +5,36 @@ 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{ +public class User extends BaseEntity{ - @Id + + /** + * + */ + private static final long serialVersionUID = 1L; + + @NotBlank private String username; @NotBlank private String password; - boolean enabled; - - private static final long serialVersionUID = 1L; + private Boolean enabled; + + public boolean isEnabled() { + return enabled; + } + + public void setEnabled(boolean enabled) { + this.enabled = enabled; + } public String getUsername() { return username; diff --git a/src/main/java/org/springframework/cheapy/model/Usuario.java b/src/main/java/org/springframework/cheapy/model/Usuario.java index 9079bc72e..715bb1383 100644 --- a/src/main/java/org/springframework/cheapy/model/Usuario.java +++ b/src/main/java/org/springframework/cheapy/model/Usuario.java @@ -2,11 +2,14 @@ package org.springframework.cheapy.model; import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.JoinColumn; 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") @@ -23,16 +26,12 @@ public class Usuario extends BaseEntity{ @NotBlank private String apellidos; - @NotBlank - private String dni; - @NotBlank private String direccion; - @NotBlank - //@Pattern(regexp = "([+][^0][\\d]{0,2})?[ ]?([(][\\d]{0,4}[)])?[ ]?([\\d]{6,10})$") - private String telefono; - + @Enumerated(value = EnumType.STRING) + private Municipio municipio; + @Email @NotBlank private String email; @@ -57,13 +56,6 @@ public class Usuario extends BaseEntity{ this.apellidos = apellidos; } - public String getDni() { - return dni; - } - - public void setDni(String dni) { - this.dni = dni; - } public String getDireccion() { return direccion; @@ -73,12 +65,20 @@ public class Usuario extends BaseEntity{ this.direccion = direccion; } - public String getTelefono() { - return telefono; + public Municipio getMunicipio() { + return municipio; } - public void setTelefono(String telefono) { - this.telefono = telefono; + public void setMunicipio(Municipio municipio) { + this.municipio = municipio; + } + + public User getUsuar() { + return usuar; + } + + public void setUsuar(User usuar) { + this.usuar = usuar; } public String getEmail() { @@ -89,13 +89,6 @@ public class Usuario extends BaseEntity{ this.email = email; } - public User getUser() { - return usuar; - } - - public void setUser(User username) { - this.usuar = username; - } } diff --git a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java index 8d5f6317c..02dca7b98 100644 --- a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java @@ -1,8 +1,11 @@ package org.springframework.cheapy.repository; -import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.Repository; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Authorities; -public interface AuthoritiesRepository extends CrudRepository{ - +public interface AuthoritiesRepository extends Repository{ + + @Autowired + void save(Authorities authorities); } diff --git a/src/main/java/org/springframework/cheapy/repository/UserRepository.java b/src/main/java/org/springframework/cheapy/repository/UserRepository.java index 0c29a7bf6..eee4fa621 100644 --- a/src/main/java/org/springframework/cheapy/repository/UserRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/UserRepository.java @@ -3,13 +3,18 @@ package org.springframework.cheapy.repository; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.Repository; import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.User; import org.springframework.cheapy.model.Usuario; -public interface UserRepository extends CrudRepository { +public interface UserRepository extends Repository { @Query("SELECT u FROM User u WHERE username =:username") @Transactional(readOnly = true) User findByUsername(String username); + + + void save(User user); } diff --git a/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java b/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java new file mode 100644 index 000000000..97e02959e --- /dev/null +++ b/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java @@ -0,0 +1,20 @@ + +package org.springframework.cheapy.repository; + +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.Repository; +import org.springframework.transaction.annotation.Transactional; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cheapy.model.User; +import org.springframework.cheapy.model.Usuario; + +public interface UsuarioRepository extends Repository { + + @Query("SELECT u FROM User u WHERE username =:username") + @Transactional(readOnly = true) + User findByUsername(String username); + + + void save(Usuario usuario); +} diff --git a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java index 7d0f8d7a8..689bad383 100644 --- a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java +++ b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java @@ -28,10 +28,10 @@ import org.springframework.transaction.annotation.Transactional; @Service public class AuthoritiesService { -/* - private AuthoritiesRepository authoritiesRepository; - private UserService userService; + private AuthoritiesRepository authoritiesRepository; +// private UserService userService; +/* @Autowired public AuthoritiesService(AuthoritiesRepository authoritiesRepository,UserService userService) { this.authoritiesRepository = authoritiesRepository; @@ -42,12 +42,12 @@ public class AuthoritiesService { public Authorities findAuthoritiyByUser(User user) { return this.authoritiesRepository.findByUser(user.getUsername()); } - +*/ @Transactional public void saveAuthorities(Authorities authorities) throws DataAccessException { authoritiesRepository.save(authorities); } - +/* @Transactional public void saveAuthorities(String username, String role) throws DataAccessException { Authorities authority = new Authorities(); diff --git a/src/main/java/org/springframework/cheapy/service/UserService.java b/src/main/java/org/springframework/cheapy/service/UserService.java index 92b896e7f..93f69adf4 100644 --- a/src/main/java/org/springframework/cheapy/service/UserService.java +++ b/src/main/java/org/springframework/cheapy/service/UserService.java @@ -1,6 +1,7 @@ package org.springframework.cheapy.service; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.User; import org.springframework.cheapy.repository.UserRepository; import org.springframework.dao.DataAccessException; @@ -25,5 +26,8 @@ public class UserService { String username = authentication.getName(); return this.userRepository.findByUsername(username); } - + + public void saveUser(final User user) throws DataAccessException { + this.userRepository.save(user); + } } diff --git a/src/main/java/org/springframework/cheapy/service/UsuarioService.java b/src/main/java/org/springframework/cheapy/service/UsuarioService.java new file mode 100644 index 000000000..52e143ac0 --- /dev/null +++ b/src/main/java/org/springframework/cheapy/service/UsuarioService.java @@ -0,0 +1,34 @@ +package org.springframework.cheapy.service; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cheapy.model.FoodOffer; +import org.springframework.cheapy.model.User; +import org.springframework.cheapy.model.Usuario; +import org.springframework.cheapy.repository.UserRepository; +import org.springframework.cheapy.repository.UsuarioRepository; +import org.springframework.dao.DataAccessException; +import org.springframework.security.core.Authentication; +import org.springframework.security.core.context.SecurityContextHolder; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; + +@Service +public class UsuarioService { + + private UsuarioRepository usuarioRepository; + + @Autowired + public UsuarioService(final UsuarioRepository usuarioRepository) { + this.usuarioRepository = usuarioRepository; + } + +// @Transactional +// public User getCurrentUser() throws DataAccessException { +// Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); +// String username = authentication.getName(); +// return this.userRepository.findByUsername(username); +// } + public void saveUsuario(final Usuario usuario) throws DataAccessException { + this.usuarioRepository.save(usuario); + } +} diff --git a/src/main/java/org/springframework/cheapy/system/SingUpController.java b/src/main/java/org/springframework/cheapy/system/SingUpController.java new file mode 100644 index 000000000..b4f2b3a38 --- /dev/null +++ b/src/main/java/org/springframework/cheapy/system/SingUpController.java @@ -0,0 +1,147 @@ +package org.springframework.cheapy.system; + +import java.util.Collection; +import java.util.Map; + +import javax.validation.Valid; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cheapy.model.Authorities; +import org.springframework.cheapy.model.Municipio; +import org.springframework.cheapy.model.Owner; +import org.springframework.cheapy.model.User; +import org.springframework.cheapy.model.Usuario; +import org.springframework.cheapy.service.AuthoritiesService; +import org.springframework.cheapy.service.ClientService; +import org.springframework.cheapy.service.OwnerService; +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.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 { + + //private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; + + private final ClientService clientService; + private final UserService userService; + private final UsuarioService usuarioService; + private final AuthoritiesService authoritiesService; + + + public SingUpController(final ClientService clientService, UserService userService, AuthoritiesService authoritiesService, + UsuarioService usuarioService) { + this.clientService = clientService; + this.userService = userService; + this.authoritiesService = authoritiesService; + this.usuarioService = usuarioService; + + } + + @InitBinder + public void setAllowedFields(WebDataBinder dataBinder) { + dataBinder.setDisallowedFields("id"); + } + + @GetMapping("/users/new") + public String initCreationForm(Map model) { + Usuario usuario = new Usuario(); + + User user=new User(); + + usuario.setUsuar(user); + model.put("municipio", Municipio.values()); + model.put("usuario", usuario); + //model.put("user", user); + return "singup/singUpUser"; + } + + @PostMapping("/users/new") + public String processCreationForm(/*@Valid User user,*/ @Valid Usuario usuario, BindingResult result) { + Authorities auth=new Authorities(); + User user= usuario.getUsuar(); + user.setEnabled(true); + usuario.setUsuar(user); + auth.setUsername(user.getUsername()); + auth.setAuthority("usuario"); + if (result.hasErrors()) { + return "singup/singUpUser"; + } + else { + this.userService.saveUser(user); + this.usuarioService.saveUsuario(usuario); + this.authoritiesService.saveAuthorities(auth); + return "redirect:/"; + } + } + +// @GetMapping("/owners/find") +// public String initFindForm(Map model) { +// model.put("owner", new Owner()); +// return "owners/findOwners"; +// } +// +// @GetMapping("/owners") +// public String processFindForm(Owner owner, BindingResult result, Map model) { +// +// // allow parameterless GET request for /owners to return all records +// if (owner.getLastName() == null) { +// owner.setLastName(""); // empty string signifies broadest possible search +// } +// +// // find owners by last name +// Collection results = this.ownerService.findByLastName(owner.getLastName()); +// if (results.isEmpty()) { +// // no owners found +// result.rejectValue("lastName", "notFound", "not found"); +// return "owners/findOwners"; +// } +// else if (results.size() == 1) { +// // 1 owner found +// owner = results.iterator().next(); +// return "redirect:/owners/" + owner.getId(); +// } +// else { +// // multiple owners found +// model.put("selections", results); +// return "owners/ownersList"; +// } +// } +// +// @GetMapping("/owners/{ownerId}/edit") +// public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) { +// Owner owner = this.ownerService.findOwnerById(ownerId); +// model.addAttribute(owner); +// return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; +// } +// +// @PostMapping("/owners/{ownerId}/edit") +// public String processUpdateOwnerForm(@Valid Owner owner, BindingResult result, +// @PathVariable("ownerId") int ownerId) { +// if (result.hasErrors()) { +// return VIEWS_OWNER_CREATE_OR_UPDATE_FORM; +// } +// else { +// owner.setId(ownerId); +// this.ownerService.saveOwner(owner); +// return "redirect:/owners/{ownerId}"; +// } +// } +// @GetMapping("/owners/{ownerId}") +// public ModelAndView showOwner(@PathVariable("ownerId") int ownerId) { +// ModelAndView mav = new ModelAndView("owners/ownerDetails"); +// Owner owner = this.ownerService.findOwnerById(ownerId); +// +// mav.addObject(owner); +// return mav; +// } +// +} diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index c279eadf3..5caa51654 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -9,25 +9,25 @@ INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', ' INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('User','admin','admin', TRUE ); -INSERT INTO authorities VALUES ('admin','admin'); +INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',1,'admin','admin', TRUE ); +INSERT INTO authorities (id,username,authority) VALUES (1,'admin','admin'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('User','manoli','manoli', TRUE ); -INSERT INTO authorities VALUES ('manoli','client'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('User','david','david', TRUE ); -INSERT INTO authorities VALUES ('david','client'); +INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',2,'manoli','manoli', TRUE ); +INSERT INTO authorities (id,username,authority) VALUES (2,'manoli','client'); +INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',3,'david','david', TRUE ); +INSERT INTO authorities (id,username,authority) VALUES (3,'david','client'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('User','paco','paco', TRUE ); -INSERT INTO authorities VALUES ('paco','usuario'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('User','lolo','lolo', TRUE ); -INSERT INTO authorities VALUES ('lolo','usuario'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('User','pepe','pepe', TRUE ); -INSERT INTO authorities VALUES ('pepe','usuario'); +INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',4,'paco','paco', TRUE ); +INSERT INTO authorities (id,username,authority) VALUES (4,'paco','usuario'); +INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',5,'lolo','lolo', TRUE ); +INSERT INTO authorities (id,username,authority) VALUES (5,'lolo','usuario'); +INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',6,'pepe','pepe', TRUE ); +INSERT INTO authorities (id,username,authority) VALUES (6,'pepe','usuario'); -INSERT INTO usuarios VALUES (1, 'admin', 'admin', 'admin', 'C/admin', '000000000', 'admin@gmail.com','admin'); -INSERT INTO usuarios VALUES (2, 'Paco', 'Naranjo', '21154416G', 'C/Esperanza', '666973647', 'Paco@gmail.com','paco'); -INSERT INTO usuarios VALUES (3, 'Lolo', 'Lopez', '25486596L', 'C/Macarena', '690670547' ,'Lolo@gmail.com','lolo'); -INSERT INTO usuarios VALUES (4, 'Pepe', 'Lopez', '12456776V', 'C/Macarena', '690670547', 'Pepe@gmail.com','pepe'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin', 'C/admin', 'carmona', 'admin@gmail.com','admin'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'sevilla', 'Paco@gmail.com','paco'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez', 'C/Macarena', 'dosHermanas', 'Lolo@gmail.com','lolo'); +INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'carmona', 'Pepe@gmail.com','pepe'); INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli'); INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (2,'bar david','david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david'); diff --git a/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp b/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp new file mode 100644 index 000000000..a2127d97f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/singup/singUpUser.jsp @@ -0,0 +1,307 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> + + + + + + + + +

+ +

+ +
+ + + +
+ + +
+ + + + +
+ + + + diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index 40f426e7e..0b9f07cc3 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -63,6 +63,10 @@
  • ">Iniciar sesión
    • + +
  • ">Registrarse
    • + +
  • From 2339891ff004f549911f4c84800f6347faf2c84b Mon Sep 17 00:00:00 2001 From: Abraham Date: Sat, 10 Apr 2021 19:34:28 +0200 Subject: [PATCH 02/18] Sigue sin ser funcional --- .../cheapy/model/Authorities.java | 68 ++++++++++--------- .../springframework/cheapy/model/User.java | 50 ++++++++++++-- .../repository/AuthoritiesRepository.java | 11 ++- .../cheapy/service/AuthoritiesService.java | 8 +++ .../cheapy/system/SingUpController.java | 11 ++- src/main/resources/db/mysql/data.sql | 40 +++++++---- 6 files changed, 134 insertions(+), 54 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/model/Authorities.java b/src/main/java/org/springframework/cheapy/model/Authorities.java index b774c1443..a39220455 100644 --- a/src/main/java/org/springframework/cheapy/model/Authorities.java +++ b/src/main/java/org/springframework/cheapy/model/Authorities.java @@ -7,14 +7,11 @@ import javax.validation.constraints.NotNull; @Entity @Table(name = "authorities") -public class Authorities extends BaseEntity{ +public class Authorities { - /** - * - */ - private static final long serialVersionUID = 1L; - @NotNull + //@NotNull + @Id String username; String authority; @@ -31,34 +28,41 @@ public class Authorities extends BaseEntity{ public void setAuthority(String authority) { this.authority = authority; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((authority == null) ? 0 : authority.hashCode()); + result = prime * result + ((username == null) ? 0 : username.hashCode()); + return result; + } + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + Authorities other = (Authorities) obj; + if (authority == null) { + if (other.authority != null) + return false; + } else if (!authority.equals(other.authority)) + return false; + if (username == null) { + if (other.username != null) + return false; + } else if (!username.equals(other.username)) + return false; + return true; + } + @Override + public String toString() { + return "Authorities [username=" + username + ", authority=" + authority + "]"; + } -// @ManyToOne -// @JoinColumn(name = "username") -// private Usuario user; -// -// @Size(min = 3, max = 50) -// private String authority; -// -// public Usuario getUser() { -// return user; -// } -// -// public void setUser(Usuario usern) { -// this.user = usern; -// } -// -// public String getAuthority() { -// return authority; -// } -// -// public void setAuthority(String authority) { -// this.authority = authority; -// } -// -// public static long getSerialversionuid() { -// return serialVersionUID; -// } } diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java index f5d51e554..242e65aa0 100644 --- a/src/main/java/org/springframework/cheapy/model/User.java +++ b/src/main/java/org/springframework/cheapy/model/User.java @@ -11,14 +11,11 @@ import net.bytebuddy.implementation.bind.annotation.Default; @Entity @Table(name = "users") -public class User extends BaseEntity{ +public class User { - /** - * - */ - private static final long serialVersionUID = 1L; + @Id @NotBlank private String username; @@ -52,4 +49,47 @@ public class User extends BaseEntity{ this.password = password; } + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((enabled == null) ? 0 : enabled.hashCode()); + result = prime * result + ((password == null) ? 0 : password.hashCode()); + result = prime * result + ((username == null) ? 0 : username.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + User other = (User) obj; + if (enabled == null) { + if (other.enabled != null) + return false; + } else if (!enabled.equals(other.enabled)) + return false; + if (password == null) { + if (other.password != null) + return false; + } else if (!password.equals(other.password)) + return false; + if (username == null) { + if (other.username != null) + return false; + } else if (!username.equals(other.username)) + return false; + return true; + } + + @Override + public String toString() { + return "User [username=" + username + ", password=" + password + ", enabled=" + enabled + "]"; + } + + } diff --git a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java index 02dca7b98..935bd9ad4 100644 --- a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java @@ -1,11 +1,16 @@ package org.springframework.cheapy.repository; +import org.springframework.data.repository.CrudRepository; import org.springframework.data.repository.Repository; +import org.springframework.transaction.annotation.Transactional; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Authorities; +import org.springframework.dao.DataAccessException; -public interface AuthoritiesRepository extends Repository{ +public interface AuthoritiesRepository extends CrudRepository{ - @Autowired - void save(Authorities authorities); +// @Autowired +// void save(Authorities authorities); + + } diff --git a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java index 689bad383..de4831c7e 100644 --- a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java +++ b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java @@ -47,6 +47,14 @@ public class AuthoritiesService { public void saveAuthorities(Authorities authorities) throws DataAccessException { authoritiesRepository.save(authorities); } + + @Transactional + public void saveAuthorities(String username, String role) throws DataAccessException { + Authorities authority = new Authorities(); + authority.setUsername(username); + authority.setAuthority(role); + authoritiesRepository.save(authority); + } /* @Transactional public void saveAuthorities(String username, String role) throws DataAccessException { diff --git a/src/main/java/org/springframework/cheapy/system/SingUpController.java b/src/main/java/org/springframework/cheapy/system/SingUpController.java index b4f2b3a38..42e8168ae 100644 --- a/src/main/java/org/springframework/cheapy/system/SingUpController.java +++ b/src/main/java/org/springframework/cheapy/system/SingUpController.java @@ -31,9 +31,13 @@ public class SingUpController { //private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; + @Autowired private final ClientService clientService; + @Autowired private final UserService userService; + @Autowired private final UsuarioService usuarioService; + @Autowired private final AuthoritiesService authoritiesService; @@ -76,9 +80,12 @@ public class SingUpController { return "singup/singUpUser"; } else { - this.userService.saveUser(user); + //auth.setId(1); + //this.authoritiesService.saveAuthorities(auth); this.usuarioService.saveUsuario(usuario); - this.authoritiesService.saveAuthorities(auth); + this.userService.saveUser(user); + this.authoritiesService.saveAuthorities(usuario.getUsuar().getUsername(), "usuario"); + return "redirect:/"; } } diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 5caa51654..4e1c4b24a 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -9,20 +9,36 @@ INSERT INTO owners VALUES (8, 'Maria', 'Escobito', '345 Maple St.', 'Madison', ' INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Madison', '6085559435'); INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); -INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',1,'admin','admin', TRUE ); -INSERT INTO authorities (id,username,authority) VALUES (1,'admin','admin'); +--INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',1,'admin','admin', TRUE ); +--INSERT INTO authorities (id,username,authority) VALUES (1,'admin','admin'); -INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',2,'manoli','manoli', TRUE ); -INSERT INTO authorities (id,username,authority) VALUES (2,'manoli','client'); -INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',3,'david','david', TRUE ); -INSERT INTO authorities (id,username,authority) VALUES (3,'david','client'); +--INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',2,'manoli','manoli', TRUE ); +--INSERT INTO authorities (id,username,authority) VALUES (2,'manoli','client'); +--INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',3,'david','david', TRUE ); +--INSERT INTO authorities (id,username,authority) VALUES (3,'david','client'); +-- +--INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',4,'paco','paco', TRUE ); +--INSERT INTO authorities (id,username,authority) VALUES (4,'paco','usuario'); +--INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',5,'lolo','lolo', TRUE ); +--INSERT INTO authorities (id,username,authority) VALUES (5,'lolo','usuario'); +--INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',6,'pepe','pepe', TRUE ); +--INSERT INTO authorities (id,username,authority) VALUES (6,'pepe','usuario'); + +INSERT INTO users (dtype,username,password,enabled) VALUES ('User','admin','admin', TRUE ); +INSERT INTO authorities (username,authority) VALUES ('admin','admin'); + +INSERT INTO users (dtype,username,password,enabled) VALUES ('User','manoli','manoli', TRUE ); +INSERT INTO authorities (username,authority) VALUES ('manoli','client'); +INSERT INTO users (dtype,username,password,enabled) VALUES ('User','david','david', TRUE ); +INSERT INTO authorities (username,authority) VALUES ('david','client'); + +INSERT INTO users (dtype,username,password,enabled) VALUES ('User','paco','paco', TRUE ); +INSERT INTO authorities (username,authority) VALUES ('paco','usuario'); +INSERT INTO users (dtype,username,password,enabled) VALUES ('User','lolo','lolo', TRUE ); +INSERT INTO authorities (username,authority) VALUES ('lolo','usuario'); +INSERT INTO users (dtype,username,password,enabled) VALUES ('User','pepe','pepe', TRUE ); +INSERT INTO authorities (username,authority) VALUES ('pepe','usuario'); -INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',4,'paco','paco', TRUE ); -INSERT INTO authorities (id,username,authority) VALUES (4,'paco','usuario'); -INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',5,'lolo','lolo', TRUE ); -INSERT INTO authorities (id,username,authority) VALUES (5,'lolo','usuario'); -INSERT INTO users (dtype,id,username,password,enabled) VALUES ('User',6,'pepe','pepe', TRUE ); -INSERT INTO authorities (id,username,authority) VALUES (6,'pepe','usuario'); INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (1, 'admin', 'admin', 'C/admin', 'carmona', 'admin@gmail.com','admin'); INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (2, 'Paco', 'Naranjo', 'C/Esperanza', 'sevilla', 'Paco@gmail.com','paco'); From 1f6805e89cb01b912b5b2ce415cd97a04c0b6818 Mon Sep 17 00:00:00 2001 From: Abraham Date: Sat, 10 Apr 2021 19:48:10 +0200 Subject: [PATCH 03/18] Registrar usuario funcional --- .../cheapy/repository/AuthoritiesRepository.java | 2 +- .../org/springframework/cheapy/service/AuthoritiesService.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java index 935bd9ad4..d4de73ec5 100644 --- a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java @@ -7,7 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Authorities; import org.springframework.dao.DataAccessException; -public interface AuthoritiesRepository extends CrudRepository{ +public interface AuthoritiesRepository extends CrudRepository{ // @Autowired // void save(Authorities authorities); diff --git a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java index de4831c7e..c26cdda15 100644 --- a/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java +++ b/src/main/java/org/springframework/cheapy/service/AuthoritiesService.java @@ -29,6 +29,7 @@ import org.springframework.transaction.annotation.Transactional; @Service public class AuthoritiesService { + @Autowired private AuthoritiesRepository authoritiesRepository; // private UserService userService; /* From f654cb3d132fa0b82e379767fe5a9204536553ab Mon Sep 17 00:00:00 2001 From: Abraham Date: Sun, 11 Apr 2021 14:19:45 +0200 Subject: [PATCH 04/18] Registro de cliente completo y funcional --- .../springframework/cheapy/model/Client.java | 29 +- .../springframework/cheapy/model/Code.java | 39 +++ .../cheapy/repository/ClientRepository.java | 7 +- .../cheapy/repository/CodeRepository.java | 19 ++ .../cheapy/service/ClientService.java | 22 +- .../cheapy/system/SingUpController.java | 48 ++- src/main/resources/db/mysql/data.sql | 9 +- .../WEB-INF/jsp/singup/singUpClient.jsp | 317 ++++++++++++++++++ src/main/webapp/WEB-INF/tags/menu.tag | 6 +- 9 files changed, 483 insertions(+), 13 deletions(-) create mode 100644 src/main/java/org/springframework/cheapy/model/Code.java create mode 100644 src/main/java/org/springframework/cheapy/repository/CodeRepository.java create mode 100644 src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java index e3f939728..bbabee95c 100644 --- a/src/main/java/org/springframework/cheapy/model/Client.java +++ b/src/main/java/org/springframework/cheapy/model/Client.java @@ -5,6 +5,8 @@ import java.util.Set; import javax.persistence.CascadeType; import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; import javax.persistence.JoinColumn; import javax.persistence.OneToMany; import javax.persistence.OneToOne; @@ -30,6 +32,9 @@ public class Client extends BaseEntity { @NotEmpty private String address; + + @Enumerated(value = EnumType.STRING) + private Municipio municipio; // Hora de apertura del local @NotBlank @@ -47,8 +52,8 @@ public class Client extends BaseEntity { private String description; // Codigo de activacion de cuenta - @NotEmpty - private String code; +// @NotEmpty +// private String code; @NotEmpty private String food; @@ -56,6 +61,10 @@ public class Client extends BaseEntity { @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "username", referencedColumnName = "username") private User usuar; + + @OneToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "code", referencedColumnName = "code") + private Code cod; @OneToMany private List foodOffers; @@ -125,12 +134,20 @@ public class Client extends BaseEntity { this.description = description; } - public String getCode() { - return code; + public Municipio getMunicipio() { + return municipio; } - public void setCode(String code) { - this.code = code; + public void setMunicipio(Municipio municipio) { + this.municipio = municipio; + } + + public Code getCode() { + return cod; + } + + public void setCode(Code code) { + this.cod = code; } public String getFood() { diff --git a/src/main/java/org/springframework/cheapy/model/Code.java b/src/main/java/org/springframework/cheapy/model/Code.java new file mode 100644 index 000000000..a151abf8d --- /dev/null +++ b/src/main/java/org/springframework/cheapy/model/Code.java @@ -0,0 +1,39 @@ +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 = "codes") +public class Code extends BaseEntity{ + + + /** + * + */ + private static final long serialVersionUID = 1L; + + @NotNull + String code; + + Boolean activo; + + public String getCode() { + return code; + } + + public void setCode(String code) { + this.code = code; + } + + public Boolean getActivo() { + return activo; + } + + public void setActivo(Boolean activo) { + this.activo = activo; + } + +} diff --git a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java index 1e04f6f3a..82947d2c3 100644 --- a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java @@ -1,14 +1,19 @@ package org.springframework.cheapy.repository; import org.springframework.cheapy.model.Client; +import org.springframework.cheapy.model.Code; +import org.springframework.cheapy.model.Usuario; import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.Repository; import org.springframework.transaction.annotation.Transactional; -public interface ClientRepository extends CrudRepository { +public interface ClientRepository extends Repository { @Query("SELECT client FROM Client client WHERE username =:username") @Transactional(readOnly = true) Client findByUsername(String username); + void save(Client client); + } diff --git a/src/main/java/org/springframework/cheapy/repository/CodeRepository.java b/src/main/java/org/springframework/cheapy/repository/CodeRepository.java new file mode 100644 index 000000000..324b9f63a --- /dev/null +++ b/src/main/java/org/springframework/cheapy/repository/CodeRepository.java @@ -0,0 +1,19 @@ +package org.springframework.cheapy.repository; + +import org.springframework.cheapy.model.Client; +import org.springframework.cheapy.model.Code; +import org.springframework.cheapy.model.Usuario; +import org.springframework.data.jpa.repository.Query; +import org.springframework.data.repository.CrudRepository; +import org.springframework.data.repository.Repository; +import org.springframework.transaction.annotation.Transactional; + +public interface CodeRepository extends Repository { + + void save(Code code); + + @Query("SELECT code FROM Code code WHERE code.code =:code") + @Transactional(readOnly = true) + Code findCodeByCode(String code); + +} diff --git a/src/main/java/org/springframework/cheapy/service/ClientService.java b/src/main/java/org/springframework/cheapy/service/ClientService.java index d65649680..d1bf88e94 100644 --- a/src/main/java/org/springframework/cheapy/service/ClientService.java +++ b/src/main/java/org/springframework/cheapy/service/ClientService.java @@ -1,8 +1,13 @@ package org.springframework.cheapy.service; +import javax.validation.Valid; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Client; +import org.springframework.cheapy.model.Code; +import org.springframework.cheapy.model.Usuario; import org.springframework.cheapy.repository.ClientRepository; +import org.springframework.cheapy.repository.CodeRepository; import org.springframework.dao.DataAccessException; import org.springframework.security.core.Authentication; import org.springframework.security.core.context.SecurityContextHolder; @@ -13,10 +18,12 @@ import org.springframework.transaction.annotation.Transactional; public class ClientService { private ClientRepository clientRepository; + private CodeRepository codeRepository; @Autowired - public ClientService(final ClientRepository clientRepository) { + public ClientService(final ClientRepository clientRepository, CodeRepository codeRepository) { this.clientRepository = clientRepository; + this.codeRepository = codeRepository; } @Transactional @@ -25,5 +32,18 @@ public class ClientService { String username = authentication.getName(); return this.clientRepository.findByUsername(username); } + + public void saveClient(final Client client) throws DataAccessException { + this.clientRepository.save(client); + } + + public void saveCode(Code code) throws DataAccessException{ + this.codeRepository.save(code); + + } + + public Code findCodeByCode(String code) { + return this.codeRepository.findCodeByCode(code); + } } diff --git a/src/main/java/org/springframework/cheapy/system/SingUpController.java b/src/main/java/org/springframework/cheapy/system/SingUpController.java index 42e8168ae..6ddc319ca 100644 --- a/src/main/java/org/springframework/cheapy/system/SingUpController.java +++ b/src/main/java/org/springframework/cheapy/system/SingUpController.java @@ -7,6 +7,8 @@ import javax.validation.Valid; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Authorities; +import org.springframework.cheapy.model.Client; +import org.springframework.cheapy.model.Code; import org.springframework.cheapy.model.Municipio; import org.springframework.cheapy.model.Owner; import org.springframework.cheapy.model.User; @@ -56,7 +58,7 @@ public class SingUpController { } @GetMapping("/users/new") - public String initCreationForm(Map model) { + public String singUpUserForm(Map model) { Usuario usuario = new Usuario(); User user=new User(); @@ -69,7 +71,7 @@ public class SingUpController { } @PostMapping("/users/new") - public String processCreationForm(/*@Valid User user,*/ @Valid Usuario usuario, BindingResult result) { + public String singUpUserForm(/*@Valid User user,*/ @Valid Usuario usuario, BindingResult result) { Authorities auth=new Authorities(); User user= usuario.getUsuar(); user.setEnabled(true); @@ -90,6 +92,48 @@ public class SingUpController { } } + @GetMapping("/clients/new") + public String singUpClientForm(Map model) { + Client cliente = new Client(); + + User user=new User(); + + cliente.setUsuar(user); + model.put("municipio", Municipio.values()); + model.put("cliente", cliente); + //model.put("user", user); + return "singup/singUpClient"; + } + + @PostMapping("/clients/new") + public String singUpClientForm(/*@Valid User user,*/ @Valid Client cliente, BindingResult result) { + Authorities auth=new Authorities(); + System.out.println(cliente.getCode().getCode()); + String cod=cliente.getCode().getCode(); + Code code=this.clientService.findCodeByCode(cod); + User user= cliente.getUsuar(); + user.setEnabled(true); + cliente.setUsuar(user); + auth.setUsername(user.getUsername()); + auth.setAuthority("client"); + if (result.hasErrors()) { + return "singup/singUpClient"; + }else if(code.getActivo().equals(false)) { + return "error"; + }else { + //auth.setId(1); + //this.authoritiesService.saveAuthorities(auth); + code.setActivo(false); + this.clientService.saveCode(code); + cliente.setCode(code); + this.clientService.saveClient(cliente); + this.userService.saveUser(user); + this.authoritiesService.saveAuthorities(cliente.getUsuar().getUsername(), "client"); + + + return "redirect:/"; + } + } // @GetMapping("/owners/find") // public String initFindForm(Map model) { // model.put("owner", new Owner()); diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 4e1c4b24a..8edb0af25 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -45,8 +45,13 @@ INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, userna INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (3, 'Lolo', 'Lopez', 'C/Macarena', 'dosHermanas', 'Lolo@gmail.com','lolo'); INSERT INTO usuarios (id, nombre, apellidos, direccion, municipio, email, username) VALUES (4, 'Pepe', 'Lopez', 'C/Macarena', 'carmona', 'Pepe@gmail.com','pepe'); -INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'bar manoli','manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli'); -INSERT INTO clients (id, name, email, address, init, finish, telephone, description, code, food, username) VALUES (2,'bar david','david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david'); +INSERT INTO codes (id,code,activo) VALUES (1,'code1',FALSE); +INSERT INTO codes (id,code,activo) VALUES (2,'code2',FALSE); +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, init, municipio, 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 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); INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-08-15 12:00:00', '2021-08-16 12:00:00', 'FO-2', 'active', 1, 'macarrones con tomate', 10); diff --git a/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp b/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp new file mode 100644 index 000000000..2582bf34f --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/singup/singUpClient.jsp @@ -0,0 +1,317 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> +<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> + + + + + + + + +

    + +

    + +
    + + +
    + + +
    + + + + + + + + + + +
    +     + +     + diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index 0b9f07cc3..80bb200fd 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -64,7 +64,11 @@ -
  • ">Registrarse
    • +
  • ">Registrarse Usuario
    • + +     + +
  • ">Registrarse Cliente
    •  From 8374d8bd1f55d2d13fa5c2a4fbc782c2df24a4cd Mon Sep 17 00:00:00 2001 From: David Date: Mon, 12 Apr 2021 13:25:54 +0200 Subject: [PATCH 05/18] =?UTF-8?q?Arreglos=20de=20errores=20de=20vistas=20y?= =?UTF-8?q?=20creado=20el=20tag=20para=20contrase=C3=B1as?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jsp/clients/createOrUpdateClientForm.jsp | 2 +- .../usuarios/createOrUpdateUsuarioForm.jsp | 2 +- src/main/webapp/WEB-INF/jsp/welcome.jsp | 16 ++--------- src/main/webapp/WEB-INF/tags/dateField.tag | 28 +++++++++++++++++++ src/main/webapp/WEB-INF/tags/menu.tag | 15 +++++++++- .../webapp/WEB-INF/tags/passwordField.tag | 28 +++++++++++++++++++ 6 files changed, 74 insertions(+), 17 deletions(-) create mode 100644 src/main/webapp/WEB-INF/tags/dateField.tag create mode 100644 src/main/webapp/WEB-INF/tags/passwordField.tag diff --git a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp index 163807396..627c02aa2 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp @@ -16,7 +16,7 @@
    - + diff --git a/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp b/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp index e63363513..6f110a3fb 100644 --- a/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/usuarios/createOrUpdateUsuarioForm.jsp @@ -20,7 +20,7 @@ - +
    diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 0ebaa7377..18a6e579c 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -34,23 +34,11 @@
    -
    - -
    +
    - -
    -
    - -
    -
    -     + diff --git a/src/main/webapp/WEB-INF/tags/dateField.tag b/src/main/webapp/WEB-INF/tags/dateField.tag new file mode 100644 index 000000000..de67d3a1c --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/dateField.tag @@ -0,0 +1,28 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ attribute name="name" required="true" rtexprvalue="true" + description="Name of corresponding property in bean object" %> +<%@ attribute name="label" required="true" rtexprvalue="true" + description="Label appears in red color if input is considered as invalid after submission" %> +<%@ attribute name="placeholder" required="false" rtexprvalue="true" + description="Placeholder para los campos en los input fields" %> + + + + +
    + + +
    + + + + + + + ${status.errorMessage} + +
    +
    +     diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index 97f1d6ced..8c9bdd2ee 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -71,8 +71,21 @@     - +
      + + + + + Mi perfil + + + + + + Mi perfil + +
    • ">Iniciar sesión
      • diff --git a/src/main/webapp/WEB-INF/tags/passwordField.tag b/src/main/webapp/WEB-INF/tags/passwordField.tag new file mode 100644 index 000000000..3fcd43959 --- /dev/null +++ b/src/main/webapp/WEB-INF/tags/passwordField.tag @@ -0,0 +1,28 @@ +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ attribute name="name" required="true" rtexprvalue="true" + description="Name of corresponding property in bean object" %> +<%@ attribute name="label" required="true" rtexprvalue="true" + description="Label appears in red color if input is considered as invalid after submission" %> +<%@ attribute name="placeholder" required="false" rtexprvalue="true" + description="Placeholder para los campos en los input fields" %> + + + + +
      + + +
      + + + + + + + ${status.errorMessage} + +
      +
      +       From b4f9538de9ab4e9559e759ef3a35d34a0c2a2e72 Mon Sep 17 00:00:00 2001 From: Antonio Vidal Date: Mon, 12 Apr 2021 18:43:19 +0200 Subject: [PATCH 06/18] Registro de todas las ofertas Se muestran todas juntas, indicando su tipo, estado y un boton para ver los detalles. --- .../cheapy/web/OfertaController.java | 34 +++++++++ .../WEB-INF/jsp/offers/offersRecordList.jsp | 74 +++++++++++++++++++ src/main/webapp/WEB-INF/tags/menu.tag | 7 ++ 3 files changed, 115 insertions(+) create mode 100644 src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java index b2b302cf9..2b82b91dc 100644 --- a/src/main/java/org/springframework/cheapy/web/OfertaController.java +++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java @@ -2,11 +2,14 @@ package org.springframework.cheapy.web; import java.time.format.DateTimeFormatter; +import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.NuOffer; +import org.springframework.cheapy.model.Offer; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.TimeOffer; import org.springframework.cheapy.service.ClientService; @@ -123,7 +126,38 @@ public class OfertaController { return "offers/offersCreate"; } + + @GetMapping("/offersRecord") + public String processOffersRecordForm(final Map model) { + + Pageable p = PageRequest.of(0, 3); + + Map datos = new HashMap(); + + for(Offer of:this.foodOfferService.findAllFoodOffer(p)) { + datos.put(of, "food"); + } + + for(Offer of:this.nuOfferService.findAllNuOffer(p)) { + datos.put(of, "nu"); + } + + for(Offer of:this.speedOfferService.findAllSpeedOffer(p)) { + datos.put(of, "speed"); + } + + for(Offer of:this.timeOfferService.findAllTimeOffer(p)) { + datos.put(of, "time"); + } + + model.put("datos", datos); + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + + return "offers/offersRecordList"; + } + // @GetMapping("/owners/{ownerId}/edit") // public String initUpdateOwnerForm(@PathVariable("ownerId") int ownerId, Model model) { // Owner owner = this.ownerService.findOwnerById(ownerId); diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp new file mode 100644 index 000000000..22e141745 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp @@ -0,0 +1,74 @@ +<%@ page session="false" trimDirectiveWhitespaces="true" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> + + + +

      Registro de Ofertas

      + +

      No hay ninguna oferta creada.

      +       + +
      + + + + + + + + + + + + + + + + + + + + + + + + + +
      RestauranteTipo de oferta
      + + + + + + + + + + + + + + + + + + + + + + + + +
      + +
      +
      +
      +       +       diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index a56f8cf35..793c8ca16 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -53,6 +53,13 @@ Usuarios       + + + + + Registro de ofertas + + + + + + + + + + + + + + + + + + + + +

      -

      + +
      - - + + + + + - +
      @@ -45,7 +97,8 @@
      +       - +       From e7cd181596f0d37d61ccc865f013e9c2d578cbae Mon Sep 17 00:00:00 2001 From: abemorcardc Date: Tue, 13 Apr 2021 16:24:32 +0200 Subject: [PATCH 16/18] Corregido el modificar municipio de cliente, y correcciones menores --- .../springframework/cheapy/web/ClientController.java | 2 +- src/main/less/cheapy.less | 3 +++ src/main/resources/messages/messages_es.properties | 3 ++- src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp | 2 +- .../WEB-INF/jsp/clients/createOrUpdateClientForm.jsp | 12 ++++++------ .../jsp/offers/nu/createOrUpdateNuOfferForm.jsp | 9 ++------- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/web/ClientController.java b/src/main/java/org/springframework/cheapy/web/ClientController.java index fab77c2e5..7bc63dbc7 100644 --- a/src/main/java/org/springframework/cheapy/web/ClientController.java +++ b/src/main/java/org/springframework/cheapy/web/ClientController.java @@ -110,7 +110,7 @@ public class ClientController { return ClientController.VIEWS_CREATE_OR_UPDATE_CLIENT; } - BeanUtils.copyProperties(clienteSesion, clientEdit, "name", "email", "address","init", "finish","telephone", "description","food","usuar"); + BeanUtils.copyProperties(clienteSesion, clientEdit, "name", "email", "address","init","municipio", "finish","telephone", "description","food","usuar"); clientEdit.getUsuar().setUsername(clienteSesion.getUsuar().getUsername()); clientEdit.getUsuar().setEnabled(true); this.clientService.saveClient(clientEdit); diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less index b62ff8533..bb8ae194d 100644 --- a/src/main/less/cheapy.less +++ b/src/main/less/cheapy.less @@ -81,6 +81,9 @@ } } +.container { + width: 85%; +} .container .text-muted { margin: 20px 0; diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties index d1e5854d1..d93fb4800 100644 --- a/src/main/resources/messages/messages_es.properties +++ b/src/main/resources/messages/messages_es.properties @@ -69,4 +69,5 @@ users=Usuarios nameUser=Nombre surname= Apellidos dni= DNI -usuario=Usuario \ No newline at end of file +usuario=Usuario +municipio=Municipio \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp index b3c34f7e9..9ccf3f800 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/clientShow.jsp @@ -37,7 +37,7 @@ - + diff --git a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp index 550354c47..a42dd67c5 100644 --- a/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/clients/createOrUpdateClientForm.jsp @@ -15,12 +15,12 @@
      - + - + - +
      - - - + + +
      diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp index fa312a38a..0200bdc9a 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp @@ -64,13 +64,8 @@ --> - - + + From 975cc0a2dd83c59395494572075ef01ebc7b65c1 Mon Sep 17 00:00:00 2001 From: David Date: Tue, 13 Apr 2021 21:37:59 +0200 Subject: [PATCH 17/18] =?UTF-8?q?A=C3=B1adido=20estilo=20a=20los=20filtros?= =?UTF-8?q?=20y=20algunas=20tablas=20nuevas?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/less/cheapy.less | 37 ++++++++ .../jsp/offers/food/foodOffersList.jsp | 66 +++++++------ .../WEB-INF/jsp/offers/nu/nuOffersList.jsp | 68 +++++++------- .../webapp/WEB-INF/jsp/offers/offersList.jsp | 94 +++++++++++-------- .../WEB-INF/jsp/offers/offersRecordList.jsp | 10 +- .../jsp/offers/speed/speedOffersList.jsp | 67 ++++++------- .../jsp/offers/time/timeOffersList.jsp | 66 ++++++------- 7 files changed, 239 insertions(+), 169 deletions(-) diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less index bb8ae194d..a6a211767 100644 --- a/src/main/less/cheapy.less +++ b/src/main/less/cheapy.less @@ -224,6 +224,28 @@ img.img-responsive{ width: 25%; } +.btn-filter{ + background: rgb(40, 140, 215); + color: white; +} + +.btn-filter:hover{ + background: rgb(0, 64, 128); + color: white; +} + +.btn-filter-active{ + background: rgb(0, 64, 128); + color: white; + +} + +.btn-filter-max button { + padding:10px; + margin-bottom: 20px; + +} + .btn-home { display: flex; justify-content: center; @@ -307,6 +329,15 @@ img.img-responsive{ background-color: rgb(40, 140, 215); } +#offerTable th{ + text-align: center; +} + +#offerTable td{ + vertical-align:middle; + text-align: center; +} + #foodOfferTable th { width: 20%; text-align: center; @@ -564,6 +595,12 @@ text-align: center; color: rgb(29, 142, 226); } +input[type=text] { + width:80%; + +} + + .row-full{ width: 100vw; position: relative; diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp index 06c8cc2f3..1a6a725e8 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersList.jsp @@ -9,39 +9,43 @@ - - - - - - - - - - - - - - - - - - - - +
      +
      + + + + + + + + + + + + + + + + + + + + +
      +

      -

      No hay ninguna oferta por plato específico activa.

      +

      No hay ninguna oferta por plato espec�fico activa.

       @@ -97,7 +101,7 @@ + P�g. anterior @@ -106,7 +110,7 @@ + P�g. siguiente diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp index 87e79f081..1ea94e7c6 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersList.jsp @@ -7,40 +7,42 @@ <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - - - - - - - - - - - - - - - - - - - - + +
      +
      + + + + + + + + + + + + + + + + + + + +
      +

      -

      No hay ninguna oferta por número de comensales activa.

      +

      No hay ninguna oferta por n�mero de comensales activa.
      @@ -94,7 +96,7 @@ + P�g. anterior @@ -103,7 +105,7 @@ + P�g. siguiente diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index 1bef89a39..650d5876f 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -9,51 +9,67 @@ - - - - - - - - - - - - - - - - - - - - - +
      +
      + + + + + + + + + + + + + + + + + + + + + + + +
      +
      - - +

      Búsqueda por nombre del bar/restaurante:

      +
      + + +
      - - +

      Búsqueda por comida:

      +
      + + +

      -

      No hay ninguna oferta por plato específico activa.

      +

      No hay ninguna oferta por plato específico activa.

       @@ -107,13 +123,13 @@
      + Ver más

      -

      No hay ninguna oferta por número de comensales activa.

      +

      No hay ninguna oferta por n�mero de comensales activa.

       @@ -165,7 +181,7 @@ + Ver más
      @@ -226,7 +242,7 @@ + Ver más @@ -285,7 +301,7 @@ + Ver más diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp index 22e141745..7598a1ddc 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersRecordList.jsp @@ -51,7 +51,15 @@ - + + + + + + + + + diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp index ce01ceef1..76661379a 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersList.jsp @@ -7,37 +7,38 @@ <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - - - - - - - - - - - - - - - - - - - - - + +
      +
      + + + + + + + + + + + + + + + + + + + +
      +

      No hay ninguna oferta por tiempo empleado en comer activa.

      @@ -95,7 +96,7 @@ + P�g. anterior       @@ -104,7 +105,7 @@ + P�g. siguiente       diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp index 8ec8da295..984ad9ecd 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersList.jsp @@ -7,36 +7,38 @@ <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags" %> - - - - - - - - - - - - - - - - - - - - - - + +
      +
      + + + + + + + + + + + + + + + + + + + +
      +

      @@ -94,7 +96,7 @@ + P�g. anterior @@ -103,7 +105,7 @@ + P�g. siguiente From 3e9507e9a903319b337a86379d9a7e70f1905108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pablo=20Franco=20S=C3=A1nchez?= <56022165+pabfrasan@users.noreply.github.com> Date: Wed, 14 Apr 2021 20:57:50 +0200 Subject: [PATCH 18/18] Arreglo en travis Eliminado "apt-get update" al dar un error inesperado --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 4957b38a3..3698c8809 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ before_install: - wget -O ~/codacy-coverage-reporter-assembly-latest.jar $(curl https://api.github.com/repos/codacy/codacy-coverage-reporter/releases/latest | jq -r .assets[0].browser_download_url) - chmod +x mvnw - mysql -e 'CREATE DATABASE cheapy;' - - sudo apt-get update after_success: - ls - ls target