Merge branch 'develop' into 009-cambiarVistas

src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java

@@ -40,7 +40,8 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 		.antMatchers("/usuarios/new").permitAll()
 		.antMatchers("/admin/**").hasAnyAuthority("admin")
 		.antMatchers("/owners/**").hasAnyAuthority("owner", "admin")
-		.antMatchers("/vets/**").authenticated().anyRequest().anonymous()
+		.antMatchers("/clients/new").permitAll()
+		.antMatchers("/offers/**").hasAnyAuthority("admin")
 		.and().formLogin()
 			.loginPage("/login").permitAll()
 			.failureUrl("/login?error")
@@ -59,7 +60,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter {
 	public void configure(final AuthenticationManagerBuilder auth) throws Exception {
 		auth.jdbcAuthentication().dataSource(this.dataSource)
 			//[login de admin,owner y vet] .usersByUsernameQuery("select username,password,enabled " + "from users " + "where username = ?")
-			.usersByUsernameQuery("select username, password, enabled from users where username=?").authoritiesByUsernameQuery("select username, authority " + "from authorities " + "where username = ?") //[login de tallerespaco]
+			.usersByUsernameQuery("select username, password, enabled from users where username=?").authoritiesByUsernameQuery("select username, authority " + "from authorities " + "where username = ?") 
 			.passwordEncoder(this.passwordEncoder());
 
 	}

src/main/java/org/springframework/cheapy/model/Administrator.java

@@ -6,5 +6,10 @@ import javax.persistence.Table;
 @Entity
 @Table(name = "administrators")
 public class Administrator extends User{
+
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	
 }

src/main/java/org/springframework/cheapy/model/Authorities.java

@@ -1,47 +1,58 @@
 package org.springframework.cheapy.model;
 
 import javax.persistence.Entity;
-import javax.persistence.JoinColumn;
+import javax.persistence.Id;
-import javax.persistence.ManyToOne;
 import javax.persistence.Table;
-import javax.validation.constraints.Size;
 
 @Entity
 @Table(name = "authorities")
-public class Authorities extends BaseEntity{
+public class Authorities{
 	
+	@Id
+	String username;
 	
-	/**
+	String authority;
-	 * 
+	
-	 */
+	public String getUsername() {
-	private static final long serialVersionUID = 1L;
+		return username;
-
-	@ManyToOne
-    @JoinColumn(name = "username")
-	private Usuario user;
-
-    @Size(min = 3, max = 50)
-    private String authority;
-
-	public Usuario getUser() {
-		return user;
 	}
-
+	public void setUsername(String username) {
-	public void setUser(Usuario usern) {
+		this.username = username;
-		this.user = usern;
 	}
-
 	public String getAuthority() {
 		return authority;
 	}
-
 	public void setAuthority(String authority) {
 		this.authority = authority;
 	}
-
+	
-	public static long getSerialversionuid() {
+	
-		return serialVersionUID;
+//	@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;
+//	}
 	
 	
 }

src/main/java/org/springframework/cheapy/model/Client.java

@@ -1,25 +1,43 @@
 package org.springframework.cheapy.model;
 
+import java.time.LocalTime;
 import java.util.Set;
 
+import javax.persistence.CascadeType;
 import javax.persistence.Entity;
+import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
 import javax.validation.constraints.Digits;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 
+import org.springframework.format.annotation.DateTimeFormat;
+
 @Entity
 @Table(name = "clients")
-public class Client extends User {
+public class Client extends BaseEntity{
-	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
+
+	// (id, email, address, init, finish, telephone, description, code, food, usuar)
+
 	@NotEmpty
 	private String email;
 	
 	@NotEmpty
 	private String address;
 
-	@NotEmpty
+	//@DateTimeFormat(pattern = "HH:mm")
-	private String timetable;
+    @NotBlank
+    private String init;
+
+    //@DateTimeFormat(pattern = "HH:mm")
+    @NotBlank
+    private String finish;
 
 	@NotEmpty
 	@Digits(fraction = 0, integer = 10)
@@ -34,6 +52,10 @@ public class Client extends User {
 	@NotEmpty
 	private String food;
 	
+	@OneToOne(cascade = CascadeType.ALL)
+	@JoinColumn(name = "username", referencedColumnName = "username")
+	private User usuar;
+	
 	@OneToMany
 	private Set<FoodOffer> foodOffers;
 	
@@ -46,6 +68,8 @@ public class Client extends User {
 	@OneToMany
 	private Set<TimeOffer> timeOffers;
 	
+	
+	
 	public String getEmail() {
 		return email;
 	}
@@ -62,12 +86,29 @@ public class Client extends User {
 		this.address = address;
 	}
 
-	public String getTimetable() {
+
-		return timetable;
+	public String getInit() {
+		return init;
 	}
 
-	public void setTimetable(String timetable) {
+	public void setInit(String init) {
-		this.timetable = timetable;
+		this.init = init;
+	}
+
+	public String getFinish() {
+		return finish;
+	}
+
+	public void setFinish(String finish) {
+		this.finish = finish;
+	}
+
+	public User getUsername() {
+		return usuar;
+	}
+
+	public void setUsername(User username) {
+		this.usuar = username;
 	}
 
 	public String getTelephone() {
@@ -101,4 +142,37 @@ public class Client extends User {
 	public void setFood(String food) {
 		this.food = food;
 	}
+
+	public Set<FoodOffer> getFoodOffers() {
+		return foodOffers;
+	}
+
+	public void setFoodOffers(Set<FoodOffer> foodOffers) {
+		this.foodOffers = foodOffers;
+	}
+
+	public Set<NuOffer> getNuOffers() {
+		return nuOffers;
+	}
+
+	public void setNuOffers(Set<NuOffer> nuOffers) {
+		this.nuOffers = nuOffers;
+	}
+
+	public Set<SpeedOffer> getSpeedOffers() {
+		return speedOffers;
+	}
+
+	public void setSpeedOffers(Set<SpeedOffer> speedOffers) {
+		this.speedOffers = speedOffers;
+	}
+
+	public Set<TimeOffer> getTimeOffers() {
+		return timeOffers;
+	}
+
+	public void setTimeOffers(Set<TimeOffer> timeOffers) {
+		this.timeOffers = timeOffers;
+	}
+
 }

src/main/java/org/springframework/cheapy/model/FoodOffer.java

@@ -22,7 +22,7 @@ import javax.validation.constraints.NotBlank;
 @Entity
 @Table(name = "food_offers")
 public class FoodOffer extends Offer {
-
+//Plato específico
 	@NotBlank
 	private String food;
 

src/main/java/org/springframework/cheapy/model/NuOffer.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.NotBlank;
 @Entity
 @Table(name = "nu_offers")
 public class NuOffer extends Offer {
-
+//Oferta por numero de comensales
 	@NotBlank
 	private Integer gold;
 

src/main/java/org/springframework/cheapy/model/Offer.java

@@ -31,7 +31,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 
 @MappedSuperclass
 public class Offer extends BaseEntity {
-
+//Clase padre
 	@DateTimeFormat(pattern = "dd/MM/yyyy HH:mm")
 	@NotBlank
 	@Future

src/main/java/org/springframework/cheapy/model/SpeedOffer.java

@@ -23,7 +23,7 @@ import javax.validation.constraints.NotBlank;
 @Entity
 @Table(name = "speed_offers")
 public class SpeedOffer extends Offer {
-
+//Ofertar por rapidez comiendo
 	@NotBlank
 	private Integer gold; // x minutos
 

src/main/java/org/springframework/cheapy/model/TimeOffer.java

@@ -28,7 +28,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 @Entity
 @Table(name = "time_offers")
 public class TimeOffer extends Offer {
-
+//Oferta por franja horaria
 	@DateTimeFormat(pattern = "HH:mm")
 	@NotBlank
 	private LocalTime init;

src/main/java/org/springframework/cheapy/model/User.java

@@ -1,23 +1,12 @@
 package org.springframework.cheapy.model;
 
-import java.util.List;
+import javax.persistence.JoinColumn;
-import java.util.Set;
-
-import javax.persistence.CascadeType;
-import javax.persistence.Entity;
-import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
-import javax.persistence.OneToMany;
 import javax.persistence.OneToOne;
-import javax.persistence.Table;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
 
-
+@Entity
-//@Entity
+@Table(name = "users")
-//@Table(name = "users")
+//@MappedSuperclass
-@MappedSuperclass
 public class User{
 	
 	@Id
@@ -27,7 +16,12 @@ public class User{
 	private String password;
 	
 	boolean enabled;
+
 	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 1L;
 	
 
 	public String getUsername() {
@@ -46,11 +40,4 @@ public class User{
 		this.password = password;
 	}
 
-//	public Set<Authorities> getAuthority() {
-//		return authorities;
-//	}
-//
-//	public void setAuthorities(Set<Authorities> authorities) {
-//		this.authorities = authorities;
-//	}
 }

src/main/java/org/springframework/cheapy/model/Usuario.java

@@ -5,22 +5,101 @@ import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Entity;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
 import javax.persistence.OneToMany;
+import javax.persistence.OneToOne;
 import javax.persistence.Table;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
 
 @Entity
-@Table(name = "users")
+@Table(name = "usuarios")
-public class Usuario extends User{
+public class Usuario extends BaseEntity{
 	
-	@OneToMany(cascade = CascadeType.ALL, mappedBy = "user")
+	/** nombre, apellidos, dni, direccion, telefono, email, username
-	private Set<Authorities> authorities;
+	 * (id,nombre, apellidos, dni, direccion, telefono, email, usuar)
+	 */
+	private static final long serialVersionUID = 1L;
 
-	public Set<Authorities> getAuthorities() {
+	@NotBlank
-		return authorities;
+	private String	nombre;
+
+	@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;
+
+	@Email
+	@NotBlank
+	private String	email;
+
+	@OneToOne(cascade = CascadeType.ALL)
+	@JoinColumn(name = "username", referencedColumnName = "username")
+	private User usuar;
+
+	public String getNombre() {
+		return nombre;
 	}
 
-	public void setAuthorities(Set<Authorities> authorities) {
+	public void setNombre(String nombre) {
-		this.authorities = authorities;
+		this.nombre = nombre;
 	}
+
+	public String getApellidos() {
+		return apellidos;
+	}
+
+	public void setApellidos(String apellidos) {
+		this.apellidos = apellidos;
+	}
+
+	public String getDni() {
+		return dni;
+	}
+
+	public void setDni(String dni) {
+		this.dni = dni;
+	}
+
+	public String getDireccion() {
+		return direccion;
+	}
+
+	public void setDireccion(String direccion) {
+		this.direccion = direccion;
+	}
+
+	public String getTelefono() {
+		return telefono;
+	}
+
+	public void setTelefono(String telefono) {
+		this.telefono = telefono;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
+	public User getUser() {
+		return usuar;
+	}
+
+	public void setUser(User username) {
+		this.usuar = username;
+	}
+	
 	
 }

src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.repository;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Repository class for <code>Owner</code> domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface FoodOfferRepository extends Repository<FoodOffer, Integer> {
+
+	/**
+	 * Retrieve {@link Owner}s from the data store by last name, returning all owners
+	 * whose last name <i>starts</i> with the given name.
+	 * @param lastName Value to search for
+	 * @return a Collection of matching {@link Owner}s (or an empty Collection if none
+	 * found)
+	 */
+	@Query("SELECT foodOffer FROM FoodOffer foodOffer")
+	@Transactional(readOnly = true)
+	List<FoodOffer> findAllFoodOffer();
+
+	/**
+	 * Retrieve an {@link Owner} from the data store by id.
+	 * @param id the id to search for
+	 * @return the {@link Owner} if found
+	 */
+	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE id =:id")
+	@Transactional(readOnly = true)
+	FoodOffer findById(@Param("id") Integer id);
+
+	/**
+	 * Save an {@link Owner} to the data store, either inserting or updating it.
+	 * @param owner the {@link Owner} to save
+	 */
+	void save(FoodOffer foodOffer);
+
+}

src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.repository;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.NuOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Repository class for <code>Owner</code> domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface NuOfferRepository extends Repository<NuOffer, Integer> {
+
+	/**
+	 * Retrieve {@link Owner}s from the data store by last name, returning all owners
+	 * whose last name <i>starts</i> with the given name.
+	 * @param lastName Value to search for
+	 * @return a Collection of matching {@link Owner}s (or an empty Collection if none
+	 * found)
+	 */
+	@Query("SELECT nuOffer FROM NuOffer nuOffer")
+	@Transactional(readOnly = true)
+	List<NuOffer> findAllNuOffer();
+
+	/**
+	 * Retrieve an {@link Owner} from the data store by id.
+	 * @param id the id to search for
+	 * @return the {@link Owner} if found
+	 */
+	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE id =:id")
+	@Transactional(readOnly = true)
+	NuOffer findById(@Param("id") Integer id);
+
+	/**
+	 * Save an {@link Owner} to the data store, either inserting or updating it.
+	 * @param owner the {@link Owner} to save
+	 */
+	void save(NuOffer nuOffer);
+
+}

src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.repository;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.model.SpeedOffer;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Repository class for <code>Owner</code> domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface SpeedOfferRepository extends Repository<SpeedOffer, Integer> {
+
+	/**
+	 * Retrieve {@link Owner}s from the data store by last name, returning all owners
+	 * whose last name <i>starts</i> with the given name.
+	 * @param lastName Value to search for
+	 * @return a Collection of matching {@link Owner}s (or an empty Collection if none
+	 * found)
+	 */
+	@Query("SELECT speedOffer FROM SpeedOffer speedOffer")
+	@Transactional(readOnly = true)
+	List<SpeedOffer> findAllSpeedOffer();
+
+	/**
+	 * Retrieve an {@link Owner} from the data store by id.
+	 * @param id the id to search for
+	 * @return the {@link Owner} if found
+	 */
+	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE id =:id")
+	@Transactional(readOnly = true)
+	SpeedOffer findById(@Param("id") Integer id);
+
+	/**
+	 * Save an {@link Owner} to the data store, either inserting or updating it.
+	 * @param owner the {@link Owner} to save
+	 */
+	void save(SpeedOffer speedOffer);
+
+}

src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java

@@ -0,0 +1,68 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.repository;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.Repository;
+import org.springframework.data.repository.query.Param;
+import org.springframework.transaction.annotation.Transactional;
+
+/**
+ * Repository class for <code>Owner</code> domain objects All method names are compliant
+ * with Spring Data naming conventions so this interface can easily be extended for Spring
+ * Data. See:
+ * https://docs.spring.io/spring-data/jpa/docs/current/reference/html/#repositories.query-methods.query-creation
+ *
+ * @author Ken Krebs
+ * @author Juergen Hoeller
+ * @author Sam Brannen
+ * @author Michael Isvy
+ */
+public interface TimeOfferRepository extends Repository<TimeOffer, Integer> {
+
+	/**
+	 * Retrieve {@link Owner}s from the data store by last name, returning all owners
+	 * whose last name <i>starts</i> with the given name.
+	 * @param lastName Value to search for
+	 * @return a Collection of matching {@link Owner}s (or an empty Collection if none
+	 * found)
+	 */
+	@Query("SELECT timeOffer FROM TimeOffer timeOffer")
+	@Transactional(readOnly = true)
+	List<TimeOffer> findAllTimeOffer();
+
+	/**
+	 * Retrieve an {@link Owner} from the data store by id.
+	 * @param id the id to search for
+	 * @return the {@link Owner} if found
+	 */
+	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE id =:id")
+	@Transactional(readOnly = true)
+	TimeOffer findById(@Param("id") Integer id);
+
+	/**
+	 * Save an {@link Owner} to the data store, either inserting or updating it.
+	 * @param owner the {@link Owner} to save
+	 */
+	void save(TimeOffer timeOffer);
+
+}

src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java

@@ -7,6 +7,6 @@ import org.springframework.cheapy.model.Usuario;
 
 public interface UsuarioRepository extends CrudRepository<Usuario, String> {
 
-	Usuario findByUsername(String currentPrincipalName);
+	//Usuario findByUsername(String currentPrincipalName);
 
 }

src/main/java/org/springframework/cheapy/service/FoodOfferService.java

@@ -0,0 +1,37 @@
+package org.springframework.cheapy.service;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.FoodOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.repository.FoodOfferRepository;
+import org.springframework.cheapy.repository.OwnerRepository;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+@Service
+public class FoodOfferService {
+	private FoodOfferRepository foodOfferRepository;
+
+
+	@Autowired
+	public FoodOfferService(final FoodOfferRepository foodOfferRepository) {
+		this.foodOfferRepository = foodOfferRepository;
+	}
+
+	public FoodOffer findFoodOfferById(final int id) {
+		return this.foodOfferRepository.findById(id);
+	}
+
+	public List<FoodOffer> findAllFoodOffer() { //
+		return this.foodOfferRepository.findAllFoodOffer();
+
+	}
+	
+	public void saveOwner(final FoodOffer foodOffer) throws DataAccessException { //
+		this.foodOfferRepository.save(foodOffer);
+
+	}
+}

src/main/java/org/springframework/cheapy/service/NuOfferService.java

@@ -0,0 +1,37 @@
+package org.springframework.cheapy.service;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.NuOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.repository.NuOfferRepository;
+import org.springframework.cheapy.repository.OwnerRepository;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+@Service
+public class NuOfferService {
+	private NuOfferRepository nuOfferRepository;
+
+
+	@Autowired
+	public NuOfferService(final NuOfferRepository nuOfferRepository) {
+		this.nuOfferRepository = nuOfferRepository;
+	}
+
+	public NuOffer findNuOfferById(final int id) {
+		return this.nuOfferRepository.findById(id);
+	}
+
+	public List<NuOffer> findAllNuOffer() { //
+		return this.nuOfferRepository.findAllNuOffer();
+
+	}
+	
+	public void saveOwner(final NuOffer nuOffer) throws DataAccessException { //
+		this.nuOfferRepository.save(nuOffer);
+
+	}
+}

src/main/java/org/springframework/cheapy/service/SpeedOfferService.java

@@ -0,0 +1,35 @@
+package org.springframework.cheapy.service;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.SpeedOffer;
+import org.springframework.cheapy.repository.SpeedOfferRepository;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+@Service
+public class SpeedOfferService {
+	private SpeedOfferRepository speedOfferRepository;
+
+
+	@Autowired
+	public SpeedOfferService(final SpeedOfferRepository speedOfferRepository) {
+		this.speedOfferRepository = speedOfferRepository;
+	}
+
+	public SpeedOffer findSpeedOfferById(final int id) {
+		return this.speedOfferRepository.findById(id);
+	}
+
+	public List<SpeedOffer> findAllSpeedOffer() { //
+		return this.speedOfferRepository.findAllSpeedOffer();
+
+	}
+	
+	public void saveOwner(final SpeedOffer speedOffer) throws DataAccessException { //
+		this.speedOfferRepository.save(speedOffer);
+
+	}
+}

src/main/java/org/springframework/cheapy/service/TimeOfferService.java

@@ -0,0 +1,37 @@
+package org.springframework.cheapy.service;
+
+import java.util.Collection;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.cheapy.model.Owner;
+import org.springframework.cheapy.repository.TimeOfferRepository;
+import org.springframework.cheapy.repository.OwnerRepository;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TimeOfferService {
+	private TimeOfferRepository timeOfferRepository;
+
+
+	@Autowired
+	public TimeOfferService(final TimeOfferRepository timeOfferRepository) {
+		this.timeOfferRepository = timeOfferRepository;
+	}
+
+	public TimeOffer findTimeOfferById(final int id) {
+		return this.timeOfferRepository.findById(id);
+	}
+
+	public List<TimeOffer> findAllTimeOffer() { //
+		return this.timeOfferRepository.findAllTimeOffer();
+
+	}
+	
+	public void saveOwner(final TimeOffer timeOffer) throws DataAccessException { //
+		this.timeOfferRepository.save(timeOffer);
+
+	}
+}

src/main/java/org/springframework/cheapy/service/UserService.java

@@ -1,64 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.springframework.cheapy.service;
-
-
-import java.util.Optional;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.dao.DataAccessException;
-import org.springframework.cheapy.model.User;
-import org.springframework.cheapy.repository.UsuarioRepository;
-import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-
-
-/**
- * Mostly used as a facade for all Petclinic controllers Also a placeholder
- * for @Transactional and @Cacheable annotations
- *
- * @author Michael Isvy
- */
-
-@Service
-public class UserService {
-/*
-	private UserRepository userRepository;
-
-	@Autowired
-	public UserService(UserRepository userRepository) {
-		this.userRepository = userRepository;
-	}
-
-	@Transactional
-	public void saveUser(User user) throws DataAccessException {
-		userRepository.save(user);
-	}
-	
-	public Optional<User> findUser(String username) {
-		return userRepository.findById(username);
-	}
-	
-	@Transactional
-	public User getCurrentUser() throws DataAccessException {
-		Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
-		String currentPrincipalName = authentication.getName();             //Obtiene el nombre del ususario actual
-		return this.userRepository.findByUsername(currentPrincipalName);         //Obtiene el usuario con ese nombre
-	}
-	*/
-}

src/main/java/org/springframework/cheapy/web/FoodOfferController.java

@@ -0,0 +1,67 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.web;
+
+import java.util.ArrayList;
+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.SpeedOffer;
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.cheapy.service.FoodOfferService;
+import org.springframework.cheapy.service.NuOfferService;
+import org.springframework.cheapy.service.SpeedOfferService;
+import org.springframework.cheapy.service.TimeOfferService;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ */
+@Controller 
+public class FoodOfferController {
+
+	//private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
+	private final FoodOfferService foodOfferService;
+
+
+
+	public FoodOfferController(final FoodOfferService foodOfferService) {
+		this.foodOfferService = foodOfferService;
+
+	}
+
+	@GetMapping("/offers/food/{foodOfferId}")
+	public String processShowForm(@PathVariable("foodOfferId") int foodOfferId, Map<String, Object> model) {
+
+		FoodOffer foodOffer=this.foodOfferService.findFoodOfferById(foodOfferId);
+		
+		model.put("foodOffer", foodOffer);
+		
+		return "foodOffers/foodOffersShow";
+
+	}
+
+}

src/main/java/org/springframework/cheapy/web/NuOfferController.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.web;
+
+import java.util.ArrayList;
+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.SpeedOffer;
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.cheapy.service.FoodOfferService;
+import org.springframework.cheapy.service.NuOfferService;
+import org.springframework.cheapy.service.SpeedOfferService;
+import org.springframework.cheapy.service.TimeOfferService;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ */
+@Controller 
+public class NuOfferController {
+
+	//private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
+	private final FoodOfferService foodOfferService;
+	private final NuOfferService nuOfferService; 
+	private final SpeedOfferService speedOfferService;
+	private final TimeOfferService timeOfferService;
+
+
+
+	public NuOfferController(final FoodOfferService foodOfferService, final NuOfferService nuOfferService,
+			final SpeedOfferService speedOfferService, final TimeOfferService timeOfferService) {
+		this.foodOfferService = foodOfferService;
+		this.nuOfferService = nuOfferService;
+		this.speedOfferService = speedOfferService;
+		this.timeOfferService = timeOfferService;
+
+	}
+
+
+	@GetMapping("/offers/nu/{nuOfferId}")
+	public String processShowForm(@PathVariable("nuOfferId") int nuOfferId, Map<String, Object> model) {
+
+		NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId);
+		
+		model.put("nuOffer", nuOffer);
+		
+		return "nuOffers/nuOffersShow";
+
+	}
+
+//	@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;
+//	}
+	
+	
+}

src/main/java/org/springframework/cheapy/web/OfertaController.java

@@ -0,0 +1,109 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.web;
+
+import java.util.ArrayList;
+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.SpeedOffer;
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.cheapy.service.FoodOfferService;
+import org.springframework.cheapy.service.NuOfferService;
+import org.springframework.cheapy.service.SpeedOfferService;
+import org.springframework.cheapy.service.TimeOfferService;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ */
+@Controller
+public class OfertaController {
+
+	//private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
+	private final FoodOfferService foodOfferService;
+	private final NuOfferService nuOfferService; 
+	private final SpeedOfferService speedOfferService;
+	private final TimeOfferService timeOfferService;
+
+
+
+	public OfertaController(final FoodOfferService foodOfferService, final NuOfferService nuOfferService,
+			final SpeedOfferService speedOfferService, final TimeOfferService timeOfferService) {
+		this.foodOfferService = foodOfferService;
+		this.nuOfferService = nuOfferService;
+		this.speedOfferService = speedOfferService;
+		this.timeOfferService = timeOfferService;
+
+	}
+
+
+	@GetMapping("/offers")
+	public String processFindForm( Map<String, Object> model) {
+
+		List<FoodOffer> foodOfferLs=this.foodOfferService.findAllFoodOffer();
+		List<NuOffer> nuOfferLs=this.nuOfferService.findAllNuOffer();
+		List<SpeedOffer> speedOfferLs=this.speedOfferService.findAllSpeedOffer();
+		List<TimeOffer> timeOfferLs=this.timeOfferService.findAllTimeOffer();
+		
+		model.put("foodOfferLs", foodOfferLs);
+		model.put("nuOfferLs", nuOfferLs);
+		model.put("speedOfferLs", speedOfferLs);
+		model.put("timeOfferLs", timeOfferLs);
+		
+		return "offers/offersList";
+
+	}
+
+//	@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;
+//	}
+	
+	
+}

src/main/java/org/springframework/cheapy/web/SpeedOfferController.java

@@ -0,0 +1,104 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.web;
+
+import java.util.ArrayList;
+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.SpeedOffer;
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.cheapy.service.FoodOfferService;
+import org.springframework.cheapy.service.NuOfferService;
+import org.springframework.cheapy.service.SpeedOfferService;
+import org.springframework.cheapy.service.TimeOfferService;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.BindingResult;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ */
+@Controller 
+public class SpeedOfferController {
+
+	//private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+
+	private final FoodOfferService foodOfferService;
+	private final NuOfferService nuOfferService; 
+	private final SpeedOfferService speedOfferService;
+	private final TimeOfferService timeOfferService;
+
+
+
+	public SpeedOfferController(final FoodOfferService foodOfferService, final NuOfferService nuOfferService,
+			final SpeedOfferService speedOfferService, final TimeOfferService timeOfferService) {
+		this.foodOfferService = foodOfferService;
+		this.nuOfferService = nuOfferService;
+		this.speedOfferService = speedOfferService;
+		this.timeOfferService = timeOfferService;
+
+	}
+
+
+	@GetMapping("/offers/speed/{speedOfferId}")
+	public String processShowForm(@PathVariable("speedOfferId") int speedOfferId, Map<String, Object> model) {
+
+		SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId);
+		
+		model.put("speedOffer", speedOffer);
+		
+		return "speedOffers/speedOffersShow";
+
+	}
+
+//	@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;
+//	}
+	
+	
+}

src/main/java/org/springframework/cheapy/web/TimeOfferController.java

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2012-2019 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.cheapy.web;
+
+import java.util.Map;
+
+import org.springframework.cheapy.model.TimeOffer;
+import org.springframework.cheapy.service.TimeOfferService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+
+
+/**
+ * @author Juergen Hoeller
+ * @author Ken Krebs
+ * @author Arjen Poutsma
+ * @author Michael Isvy
+ */
+@Controller 
+public class TimeOfferController {
+
+	//private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm";
+	private final TimeOfferService timeOfferService;
+
+	public TimeOfferController(final TimeOfferService timeOfferService) {
+		this.timeOfferService = timeOfferService;
+
+	}
+
+	@GetMapping("/offers/time/{timeOfferId}")
+	public String processShowForm(@PathVariable("timeOfferId") int timeOfferId, Map<String, Object> model) {
+
+		TimeOffer timeOffer=this.timeOfferService.findTimeOfferById(timeOfferId);
+		
+		model.put("timeOffer", timeOffer);
+		
+		return "timeOffers/timeOffersShow";
+
+	}
+}

src/main/java/org/springframework/cheapy/web/UserController.java

@@ -1,154 +0,0 @@
-/*
- * Copyright 2002-2013 the original author or authors.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.springframework.cheapy.web;
-
-import javax.persistence.EntityNotFoundException;
-
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.cheapy.model.Authorities;
-import org.springframework.cheapy.model.User;
-import org.springframework.cheapy.service.AuthoritiesService;
-import org.springframework.cheapy.service.UserService;
-import org.springframework.stereotype.Controller;
-import org.springframework.ui.ModelMap;
-import org.springframework.validation.BindingResult;
-import org.springframework.validation.FieldError;
-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.ModelAttribute;
-import org.springframework.web.bind.annotation.PostMapping;
-
-/**
- * @author Juergen Hoeller
- * @author Ken Krebs
- * @author Arjen Poutsma
- * @author Michael Isvy
- */
-@Controller
-public class UserController {
-
-	private UserService userService;
-	
-	private AuthoritiesService authoritiesService;
-	
-//	@Autowired
-//	public UserController (UserService userService, AuthoritiesService authoritiesService, 
-//			ClienteService clienteService, FarmaceuticoService farmaceuticoService, ProveedorService proveedorService) {
-//		this.userService = userService;
-//		this.authoritiesService = authoritiesService;
-//		this.clienteService = clienteService;
-//		this.farmaceuticoService = farmaceuticoService;
-//		this.proveedorService = proveedorService;
-//	}
-//	
-//	@InitBinder
-//	public void setAllowedFields(final WebDataBinder dataBinder) {
-//		dataBinder.setDisallowedFields("id");
-//	}
-//	
-//	@GetMapping("users")
-//	private String showUserDetails(ModelMap model) {
-//		User user = this.userService.getCurrentUser();
-//		Authorities authority = this.authoritiesService.findAuthoritiyByUser(user);
-//		
-//		if(authority.getAuthority().equals("cliente")) {
-//			Cliente cliente = this.clienteService.findClienteUser(user);
-//			model.addAttribute("cliente", cliente);
-//		}else if(authority.getAuthority().equals("proveedor")) {
-//			Proveedor proveedor = this.proveedorService.findProveedorUser(user);
-//			model.addAttribute("proveedor", proveedor);
-//		}else if(authority.getAuthority().equals("farmaceutico")) {
-//			Farmaceutico farmaceutico = this.farmaceuticoService.findFarmaceuticoByUser(user);
-//			model.addAttribute("farmaceutico", farmaceutico);
-//		}
-//
-//		log.info("El usuario '" + user.getUsername() + "' ha mostrado su informacion personal");
-//		return "users/userDetails";
-//	}
-//	
-//	@GetMapping("/users/new")
-//	public String newUser(ModelMap model) {
-//		Cliente cliente = new Cliente();
-//		model.addAttribute("cliente", cliente);
-//		model.addAttribute("dni", new String());
-//		return "users/userRegister";
-//	}
-//	
-//	@PostMapping("/users/new")
-//	public String creationUser(@ModelAttribute("cliente") Cliente cliente, final BindingResult result, ModelMap model) {
-//		if (result.hasErrors()) {
-//			return "users/userRegister";
-//		} else if(cliente.getUser() == null) {
-//			try {
-//				cliente = this.clienteService.clienteDni(cliente.getDni());
-//			}catch(EntityNotFoundException ex) {
-//				result.rejectValue("dni", "clienteNotFound");
-//				return "users/userRegister";
-//			}
-//			cliente.setUser(new User());
-//			model.addAttribute("cliente", cliente);
-//			return "users/userRegister";
-//		}else {
-//			this.userService.saveUser(cliente.getUser());
-//			this.authoritiesService.saveAuthorities(cliente.getUser().getUsername(), "cliente");
-//			this.clienteService.saveCliente(cliente);
-//			log.info("El cliente con dni '" + cliente.getDni() + "' se ha registrado como usuario");
-//			return "redirect:../";
-//		}
-//	}
-//	
-//	@GetMapping("/users/password")
-//	public String initChangePassword(ModelMap model) {
-//		User currentUser = this.userService.getCurrentUser();
-//		UserValidate user = new UserValidate(currentUser.getUsername(), "");
-//		model.addAttribute("user", user);
-//		return "users/passwordEdit";
-//	}
-//	
-//	@PostMapping("/users/password")
-//	public String changePassword(@ModelAttribute("user") UserValidate user, final BindingResult result, ModelMap model) {
-//		if(result.hasErrors()) {
-//			return "users/passwordEdit";
-//		}else {
-//			User CurrentUser = this.userService.getCurrentUser();
-//			if(CurrentUser.getPassword().equals(user.getPassword()) && user.getNewPassword().equals(user.getValidPassword())) {
-//				if(!user.getNewPassword().isEmpty()) {
-//					CurrentUser.setPassword(user.getNewPassword());
-//					this.userService.saveUser(CurrentUser);
-//					log.info("El usuario '" + CurrentUser.getUsername() + "' ha cambiado satisfactoriamente su contraseña");
-//					return "redirect:../";
-//				}else {
-//					FieldError err = new FieldError("PassException", "newPassword", "Introduce una nueva contraseña");
-//					result.addError(err);
-//					log.warn("El usuario '" + CurrentUser.getUsername() + "' ha tenido un error 'PassException'");
-//					return "users/passwordEdit";
-//				}
-//			}else if(!CurrentUser.getPassword().equals(user.getPassword())){
-//				FieldError err = new FieldError("PassException", "password", "Contraseña incorrecta");
-//				result.addError(err);
-//				log.warn("El usuario '" + CurrentUser.getUsername() + "' ha tenido un error 'PassException'");
-//				return "users/passwordEdit";
-//			}else {
-//				FieldError err = new FieldError("PassException", "newPassword", "Las contraseñas no coinciden");
-//				result.addError(err);
-//				log.warn("El usuario '" + CurrentUser.getUsername() + "' ha tenido un error 'PassException'");
-//				return "users/passwordEdit";
-//			}
-//		}
-//	}
-}

src/main/resources/db/mysql/data.sql

@@ -13,10 +13,27 @@ INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Wa
 INSERT INTO food_offers(start, end, code, type, client_id, food, discount, units) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'jkhlljk', 'active', null, 'macarrones', '15%', 10);
 
 INSERT INTO time_offers(start, end, code, type, client_id, init, finish, discount) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'jkhlljk', 'active', null, '12:00:00', '13:00:00', '10%');
+INSERT INTO speed_offers(start, end, code, type, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'jkhlljk', 'active', null,5,'25%',10,'15%',15,'10%' );
+INSERT INTO nu_offers(start, end, code, type, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'jkhlljk', 'active', null,15,'25%',10,'15%',5,'10%' );
 
---insert into usuarios(username, password, enabled) values ('admin3', 'admin', true);
+INSERT INTO users (dtype,username,password,enabled) VALUES ('user','admin','admin', TRUE );
---insert into authorities(id ,usuario, authority) values (42,'admin3', 'admin');
+INSERT INTO authorities VALUES ('admin','admin');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('user','manoli','manoli', TRUE );
+INSERT INTO authorities VALUES ('manoli','cliente');
+INSERT INTO users (dtype,username,password,enabled) VALUES ('user','david','david', TRUE );
+INSERT INTO authorities VALUES ('david','cliente');
+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(username,password,enabled) VALUES ('admin1','4dm1n',TRUE);
+INSERT INTO usuarios VALUES (1, 'admin', 'admin', 'admin', 'C/admin', '000000000', 'admin@gmail.com','admin');
-INSERT INTO authorities(id,username,authority) VALUES (1,'admin1','admin');
 
+INSERT INTO clients  VALUES (1,'manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli');
+INSERT INTO clients  VALUES (2,'david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david');
+
+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');

src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp

@@ -0,0 +1,44 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+
+<cheapy:layout pageName="foodOffer">
+
+    <h2>Oferta por plato específico</h2>
+
+
+    <table class="table table-striped">
+        <tr>
+            <th>Inicio de la oferta</th>
+            <td><b><c:out value="${foodOffer.start}"/></b></td>
+        </tr>
+        <tr>
+            <th>Fin de la oferta</th>
+            <td><c:out value="${foodOffer.end}"/></td>
+        </tr>
+		<tr>
+            <th>Plato en oferta</th>
+            <td><c:out value="${foodOffer.food}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento</th>
+            <td><c:out value="${foodOffer.discount}"/></td>
+        </tr>
+        <tr>
+            <th>Cantidad</th>
+            <td><c:out value="${foodOffer.units}"/></td>
+        </tr>
+        <tr>
+            <th>Codigo de la oferta</th>
+            <td><c:out value="${foodOffer.code}"/></td>
+        </tr>
+    </table>
+
+    <%-- <spring:url value="{ownerId}/edit" var="editUrl">
+        <spring:param name="ownerId" value="${owner.id}"/>
+    </spring:url>
+    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a> --%>
+
+</cheapy:layout>

src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp

@@ -0,0 +1,56 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+
+<cheapy:layout pageName="nuOffer">
+
+    <h2>Oferta por número de comensales</h2>
+
+
+    <table class="table table-striped">
+        <tr>
+            <th>Inicio de la oferta</th>
+            <td><b><c:out value="${nuOffer.start}"/></b></td>
+        </tr>
+        <tr>
+            <th>Fin de la oferta</th>
+            <td><c:out value="${nuOffer.end}"/></td>
+        </tr>
+        <tr>
+            <th>Meta oro</th>
+            <td><c:out value="${nuOffer.gold}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento oro</th>
+            <td><c:out value="${nuOffer.discountGold}"/></td>
+        </tr>
+        <tr>
+            <th>Meta plata</th>
+            <td><c:out value="${nuOffer.silver}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento plata</th>
+            <td><c:out value="${nuOffer.discountSilver}"/></td>
+        </tr>
+        <tr>
+            <th>Meta bronce</th>
+            <td><c:out value="${nuOffer.bronze}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento bronce</th>
+            <td><c:out value="${nuOffer.discountBronze}"/></td>
+        </tr>
+        <tr>
+            <th>Codigo de la oferta</th>
+            <td><c:out value="${nuOffer.code}"/></td>
+        </tr>
+    </table>
+
+    <%-- <spring:url value="{ownerId}/edit" var="editUrl">
+        <spring:param name="ownerId" value="${owner.id}"/>
+    </spring:url>
+    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a> --%>
+
+</cheapy:layout>

src/main/webapp/WEB-INF/jsp/offers/offersList.jsp

@@ -0,0 +1,141 @@
+<%@ 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" %>
+
+<cheapy:layout pageName="owners">
+    <h2>Ofertas por plato específico</h2>
+
+    <table id="foodOfferTable" class="table table-striped">
+        <thead>
+        <tr>
+        	<!-- <th style="width: 150px;">Restaurante</th> -->
+        	<th style="width: 150px;">Plato</th>
+            <th style="width: 150px;">Fecha inicio</th>
+            <th style="width: 200px;">Fecha fin</th>
+            <th> </th>
+        </tr>
+        </thead>
+        <tbody>
+        <c:forEach items="${foodOfferLs}" var="foodOffer">
+            <tr>
+                <td>
+                    <c:out value="${foodOffer.food}"/>
+                </td>
+                <td>
+                    <c:out value="${foodOffer.start}"/>
+                </td>
+                <td>
+                    <c:out value="${foodOffer.end}"/>
+                </td>
+                <td>
+                <spring:url value="/offers/food/{foodOfferId}" var="foodOfferUrl">
+                        <spring:param name="foodOfferId" value="${foodOffer.id}"/>
+                    </spring:url>
+                    <a href="${fn:escapeXml(foodOfferUrl)}"/>Enlace</a>
+                </td> 
+                  
+            </tr>
+        </c:forEach>
+        </tbody>
+    </table>
+    
+    <h2>Ofertas por número de comensales</h2>
+
+    <table id="nuOfferTable" class="table table-striped">
+        <thead>
+        <tr>
+        	<!-- <th style="width: 150px;">Restaurante</th> -->
+            <th style="width: 150px;">Fecha inicio</th>
+            <th style="width: 200px;">Fecha fin</th>
+            <th> </th>
+            
+        </tr>
+        </thead>
+        <tbody>
+        <c:forEach items="${nuOfferLs}" var="nuOffer">
+            <tr>
+                
+                <td>
+                    <c:out value="${nuOffer.start}"/>
+                </td>
+                <td>
+                    <c:out value="${nuOffer.end}"/>
+                </td>
+                <td>
+                <spring:url value="/offers/nu/{nuOfferId}" var="nuOfferUrl">
+                        <spring:param name="nuOfferId" value="${nuOffer.id}"/>
+                    </spring:url>
+                    <a href="${fn:escapeXml(nuOfferUrl)}"/>Enlace</a>
+                </td>  
+            </tr>
+        </c:forEach>
+        </tbody>
+    </table>
+    <h2>Ofertas rapidez comiendo</h2>
+
+    <table id="speedOfferTable" class="table table-striped">
+        <thead>
+        <tr>
+        	<!-- <th style="width: 150px;">Restaurante</th> -->
+            <th style="width: 150px;">Fecha inicio</th>
+            <th style="width: 200px;">Fecha fin</th>
+            <th> </th>
+            
+        </tr>
+        </thead>
+        <tbody>
+        <c:forEach items="${speedOfferLs}" var="speedOffer">
+            <tr>
+                
+                <td>
+                    <c:out value="${speedOffer.start}"/>
+                </td>
+                <td>
+                    <c:out value="${speedOffer.end}"/>
+                </td>
+                <td>
+                    <spring:url value="/offers/speed/{speedOfferId}" var="speedOfferUrl">
+                        <spring:param name="speedOfferId" value="${speedOffer.id}"/>
+                    </spring:url>
+                    <a href="${fn:escapeXml(speedOfferUrl)}"/>Enlace</a>
+                </td>
+                  
+            </tr>
+        </c:forEach>
+        </tbody>
+    </table>
+    <h2>Ofertas por franja horaria</h2>
+
+    <table id="timeOfferTable" class="table table-striped">
+        <thead>
+        <tr>
+        	<!-- <th style="width: 150px;">Restaurante</th> -->
+            <th style="width: 150px;">Fecha inicio</th>
+            <th style="width: 200px;">Fecha fin</th>
+            <th> </th>
+        </tr>
+        </thead>
+        <tbody>
+        	<c:forEach items="${timeOfferLs}" var="timeOffer">
+            <tr>
+                
+                <td>
+                    <c:out value="${timeOffer.start}"/>
+                </td>
+                <td>
+                    <c:out value="${timeOffer.end}"/>
+                </td>
+                <td>
+                <spring:url value="/offers/time/{timeOfferId}" var="timeOfferUrl">
+                        <spring:param name="timeOfferId" value="${timeOffer.id}"/>
+                    </spring:url>
+                    <a href="${fn:escapeXml(timeOfferUrl)}"/>Enlace</a>
+                </td> 
+            </tr>
+        </c:forEach>
+        </tbody>
+    </table>
+</cheapy:layout>

src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp

@@ -0,0 +1,56 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+
+<cheapy:layout pageName="speedOffer">
+
+    <h2>Oferta por comer veloz</h2>
+
+
+    <table class="table table-striped">
+        <tr>
+            <th>Inicio de la oferta</th>
+            <td><b><c:out value="${speedOffer.start}"/></b></td>
+        </tr>
+        <tr>
+            <th>Fin de la oferta</th>
+            <td><c:out value="${speedOffer.end}"/></td>
+        </tr>
+        <tr>
+            <th>Meta oro</th>
+            <td><c:out value="${speedOffer.gold}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento oro</th>
+            <td><c:out value="${speedOffer.discountGold}"/></td>
+        </tr>
+        <tr>
+            <th>Meta plata</th>
+            <td><c:out value="${speedOffer.silver}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento plata</th>
+            <td><c:out value="${speedOffer.discountSilver}"/></td>
+        </tr>
+        <tr>
+            <th>Meta bronce</th>
+            <td><c:out value="${speedOffer.bronze}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento bronce</th>
+            <td><c:out value="${speedOffer.discountBronze}"/></td>
+        </tr>
+        <tr>
+            <th>Codigo de la oferta</th>
+            <td><c:out value="${speedOffer.code}"/></td>
+        </tr>
+    </table>
+
+    <%-- <spring:url value="{ownerId}/edit" var="editUrl">
+        <spring:param name="ownerId" value="${owner.id}"/>
+    </spring:url>
+    <a href="${fn:escapeXml(editUrl)}" class="btn btn-default">Edit Owner</a> --%>
+
+</cheapy:layout>

src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp

@@ -0,0 +1,31 @@
+<%@ page session="false" trimDirectiveWhitespaces="true" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %>
+<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %>
+
+<cheapy:layout pageName="timeOffer">
+
+    <h2>Oferta por franja horária</h2>
+
+
+    <table class="table table-striped">
+        <tr>
+            <th>Inicio de la oferta</th>
+            <td><b><c:out value="${timeOffer.start}"/></b></td>
+        </tr>
+        <tr>
+            <th>Fin de la oferta</th>
+            <td><c:out value="${timeOffer.end}"/></td>
+        </tr>
+        <tr>
+            <th>Descuento</th>
+            <td><c:out value="${timeOffer.discount}"/></td>
+        </tr>
+        <tr>
+            <th>Codigo de la oferta</th>
+            <td><c:out value="${timeOffer.code}"/></td>
+        </tr>
+    </table>
+
+</cheapy:layout>

src/main/webapp/WEB-INF/tags/menu.tag

@@ -28,7 +28,7 @@
 					<span>Home</span>
 				</cheapy:menuItem>
 				
-				<cheapy:menuItem active="${name eq 'ofertas'}" url="/ofertas"
+				<cheapy:menuItem active="${name eq 'ofertas'}" url="/offers"
 					title="ofertas">
 					<span class="glyphicon glyphicon-cutlery" aria-hidden="true"></span>
 					<span>Ver ofertas</span>