From a75a5adc70bb3b542207a7b9160dd3f3f4eb93b5 Mon Sep 17 00:00:00 2001 From: Javier Date: Thu, 25 Mar 2021 19:17:52 +0100 Subject: [PATCH 01/13] Modificar y eliminar ofertas de nuOffers y speedOffers, queda revisarlo --- .../springframework/cheapy/model/NuOffer.java | 7 +- .../springframework/cheapy/model/Offer.java | 5 +- .../cheapy/model/SpeedOffer.java | 7 +- .../cheapy/service/NuOfferService.java | 2 +- .../cheapy/service/SpeedOfferService.java | 2 +- .../cheapy/web/NuOfferController.java | 85 ++++++++++++++++++- .../cheapy/web/SpeedOfferController.java | 85 ++++++++++++++++++- src/main/resources/db/mysql/data.sql | 4 - .../nuOffers/createOrUpdateNuOfferForm.jsp | 39 +++++++++ .../WEB-INF/jsp/nuOffers/nuOffersDisable.jsp | 27 ++++++ .../createOrUpdateSpeedOfferForm.jsp | 37 ++++++++ .../jsp/speedOffers/speedOffersDisable.jsp | 27 ++++++ 12 files changed, 311 insertions(+), 16 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersDisable.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersDisable.jsp diff --git a/src/main/java/org/springframework/cheapy/model/NuOffer.java b/src/main/java/org/springframework/cheapy/model/NuOffer.java index 25ebce674..ca0965fd6 100644 --- a/src/main/java/org/springframework/cheapy/model/NuOffer.java +++ b/src/main/java/org/springframework/cheapy/model/NuOffer.java @@ -19,26 +19,27 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; @Entity @Table(name = "nu_offers") public class NuOffer extends Offer { //Oferta por numero de comensales - @NotBlank + @NotNull private Integer gold; @Column(name = "discount_gold") @NotBlank private String discountGold; - @NotBlank + @NotNull private Integer silver; @Column(name = "discount_silver") @NotBlank private String discountSilver; - @NotBlank + @NotNull private Integer bronze; @Column(name = "discount_bronze") diff --git a/src/main/java/org/springframework/cheapy/model/Offer.java b/src/main/java/org/springframework/cheapy/model/Offer.java index 0e6d23f18..17759487d 100644 --- a/src/main/java/org/springframework/cheapy/model/Offer.java +++ b/src/main/java/org/springframework/cheapy/model/Offer.java @@ -26,6 +26,7 @@ import javax.persistence.MappedSuperclass; import javax.persistence.Table; import javax.validation.constraints.Future; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import org.springframework.format.annotation.DateTimeFormat; @@ -33,12 +34,12 @@ import org.springframework.format.annotation.DateTimeFormat; public class Offer extends BaseEntity { //Clase padre @DateTimeFormat(pattern = "dd/MM/yyyy HH:mm") - @NotBlank + @NotNull @Future private LocalDateTime start; @DateTimeFormat(pattern = "dd/MM/yyyy HH:mm") - @NotBlank + @NotNull @Future private LocalDateTime end; diff --git a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java index 71e32ae3e..2f76166b8 100644 --- a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java +++ b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java @@ -19,26 +19,27 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; @Entity @Table(name = "speed_offers") public class SpeedOffer extends Offer { //Ofertar por rapidez comiendo - @NotBlank + @NotNull private Integer gold; // x minutos @Column(name = "discount_gold") @NotBlank private String discountGold; - @NotBlank + @NotNull private Integer silver; @Column(name = "discount_silver") @NotBlank private String discountSilver; - @NotBlank + @NotNull private Integer bronze; @Column(name = "discount_bronze") diff --git a/src/main/java/org/springframework/cheapy/service/NuOfferService.java b/src/main/java/org/springframework/cheapy/service/NuOfferService.java index 1029999d5..ce149068e 100644 --- a/src/main/java/org/springframework/cheapy/service/NuOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/NuOfferService.java @@ -30,7 +30,7 @@ public class NuOfferService { } - public void saveOwner(final NuOffer nuOffer) throws DataAccessException { // + public void saveNuOffer(final NuOffer nuOffer) throws DataAccessException { // this.nuOfferRepository.save(nuOffer); } diff --git a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java index bfc70644e..192616ca4 100644 --- a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java @@ -28,7 +28,7 @@ public class SpeedOfferService { } - public void saveOwner(final SpeedOffer speedOffer) throws DataAccessException { // + public void saveSpeedOffer(final SpeedOffer speedOffer) throws DataAccessException { // this.speedOfferRepository.save(speedOffer); } diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index bd6d34844..f0e24eed7 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -15,22 +15,29 @@ */ package org.springframework.cheapy.web; +import java.security.Principal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.validation.Valid; + +import org.springframework.beans.BeanUtils; import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.model.SpeedOffer; +import org.springframework.cheapy.model.StatusOffer; 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.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; /** @@ -42,7 +49,7 @@ import org.springframework.web.bind.annotation.PathVariable; @Controller public class NuOfferController { - //private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; + private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "nuOffers/createOrUpdateNuOfferForm"; private final FoodOfferService foodOfferService; private final NuOfferService nuOfferService; @@ -101,4 +108,80 @@ public class NuOfferController { // } + @GetMapping(value = "/offers/nu/{nuOfferId}/edit") + public String updateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } + + NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); + model.put("nuOffer", nuOffer); + return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/nu/{nuOfferId}/edit") + public String updateNuOffer(@Valid final NuOffer nuOfferEdit, final BindingResult result, @PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } + + if (result.hasErrors()) { + model.put("nuOffer", nuOfferEdit); + return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + + NuOffer nuOfferOld=this.nuOfferService.findNuOfferById(nuOfferId); + + BeanUtils.copyProperties(nuOfferEdit, nuOfferOld, "id", "client_id"); + + this.nuOfferService.saveNuOffer(nuOfferOld); + + return "redirect:"; + } + + } + + @GetMapping(value = "/offers/nu/{nuOfferId}/disable") + public String disableNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } +// +// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { +// model.addAttribute("x", true); +// +// } else { +// model.addAttribute("x", false); +// } + + NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); + model.put("nuOffer", nuOffer); + return "nuOffers/nuOffersDisable"; + } + + @PostMapping(value = "/offers/nu/{nuOfferId}/disable") + public String disableNuOfferForm(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } +// +// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { +// return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; +// +// } else { + NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); + + nuOffer.setType(StatusOffer.inactive); + + this.nuOfferService.saveNuOffer(nuOffer); + + return "redirect:"; + + } + } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index 68a377a68..38513859e 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -15,22 +15,29 @@ */ package org.springframework.cheapy.web; +import java.security.Principal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import javax.validation.Valid; + +import org.springframework.beans.BeanUtils; import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.model.SpeedOffer; +import org.springframework.cheapy.model.StatusOffer; 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.ui.ModelMap; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; /** @@ -42,7 +49,7 @@ import org.springframework.web.bind.annotation.PathVariable; @Controller public class SpeedOfferController { - //private static final String VIEWS_OWNER_CREATE_OR_UPDATE_FORM = "owners/createOrUpdateOwnerForm"; + private static final String VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM = "speedOffers/createOrUpdateSpeedOfferForm"; private final FoodOfferService foodOfferService; private final NuOfferService nuOfferService; @@ -100,5 +107,81 @@ public class SpeedOfferController { // return mav; // } + @GetMapping(value = "/offers/speed/{speedOfferId}/edit") + public String updateNuOffer(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } + + SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); + model.put("speedOffer", speedOffer); + return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/speed/{speedOfferId}/edit") + public String updateNuOffer(@Valid final SpeedOffer speedOfferEdit, final BindingResult result, @PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } + + if (result.hasErrors()) { + model.put("speedOffer", speedOfferEdit); + return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + + SpeedOffer speedOfferOld=this.speedOfferService.findSpeedOfferById(speedOfferId); + + BeanUtils.copyProperties(speedOfferEdit, speedOfferOld, "id", "client_id"); + + this.speedOfferService.saveSpeedOffer(speedOfferOld); + + return "redirect:"; + } + + } + + @GetMapping(value = "/offers/speed/{speedOfferId}/disable") + public String disableSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } +// +// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { +// model.addAttribute("x", true); +// +// } else { +// model.addAttribute("x", false); +// } + + SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); + model.put("speedOffer", speedOffer); + return "speedOffers/speedOffersDisable"; + } + + @PostMapping(value = "/offers/speed/{speedOfferId}/disable") + public String disableNuOfferForm(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { + +// if (!this.comprobarIdentidad(principal, vehiculoId)) { +// return "exception"; +// } +// +// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { +// return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; +// +// } else { + SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); + + speedOffer.setType(StatusOffer.inactive); + + this.speedOfferService.saveSpeedOffer(speedOffer); + + return "redirect:"; + + } + } diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index b1bab7a65..d0f4aac33 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -11,14 +11,10 @@ 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 authorities(id ,usuario, authority) values (42,'admin3', 'admin'); - INSERT INTO users(username,password,enabled) VALUES ('admin1','4dm1n',TRUE); INSERT INTO authorities(id,username,authority) VALUES (1,'admin1','admin'); diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp new file mode 100644 index 000000000..e0d2366cd --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp @@ -0,0 +1,39 @@ +<%@ 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="petclinic" tagdir="/WEB-INF/tags" %> + + +

+ New NuOffer +

+ +
+ + + + + + + + + + +
+
+
+ + + + + + + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersDisable.jsp new file mode 100644 index 000000000..83fa94c10 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersDisable.jsp @@ -0,0 +1,27 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere dar de baja su offer?

+ + + + + + + + + + + + + Volver + + + diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp new file mode 100644 index 000000000..f813733b0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp @@ -0,0 +1,37 @@ +<%@ 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="petclinic" tagdir="/WEB-INF/tags" %> + + +

+ New SpeedOffer +

+ +
+ + + + + + + + +
+
+
+ + + + + + + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersDisable.jsp new file mode 100644 index 000000000..0e2febbf0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersDisable.jsp @@ -0,0 +1,27 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere dar de baja su offer?

+ + + + + + + + + + + + + Volver + + + From 457cba860dfaac30951914f7496585d9d8db1e17 Mon Sep 17 00:00:00 2001 From: Martinagr32 Date: Thu, 25 Mar 2021 23:51:59 +0100 Subject: [PATCH 02/13] Publicar ofertas arreglado --- .../cheapy/model/BaseEntity.java | 27 +++---------- .../springframework/cheapy/model/Client.java | 3 -- .../cheapy/model/FoodOffer.java | 8 +++- .../cheapy/model/NamedEntity.java | 27 +++---------- .../springframework/cheapy/model/NuOffer.java | 5 +++ .../springframework/cheapy/model/Offer.java | 8 +++- .../springframework/cheapy/model/Owner.java | 38 +++---------------- .../springframework/cheapy/model/Person.java | 25 +++--------- .../cheapy/model/SpeedOffer.java | 4 ++ .../cheapy/model/TimeOffer.java | 25 ++++-------- .../springframework/cheapy/model/User.java | 7 ++-- .../springframework/cheapy/model/Usuario.java | 4 -- .../cheapy/model/package-info.java | 19 ---------- .../repository/AuthoritiesRepository.java | 2 - .../cheapy/repository/ClientRepository.java | 7 ++-- .../repository/FoodOfferRepository.java | 5 +-- .../cheapy/repository/NuOfferRepository.java | 11 +----- .../repository/SpeedOfferRepository.java | 8 +--- .../repository/TimeOfferRepository.java | 11 +----- .../cheapy/repository/UsuarioRepository.java | 1 - .../cheapy/service/ClientService.java | 22 +---------- .../cheapy/service/FoodOfferService.java | 6 +-- .../cheapy/service/TimeOfferService.java | 6 ++- .../cheapy/web/FoodOfferController.java | 4 +- .../cheapy/web/OfertaController.java | 30 --------------- .../cheapy/web/OwnerController.java | 23 ----------- .../cheapy/web/SpeedOfferController.java | 9 +---- src/main/resources/db/mysql/data.sql | 20 ++++------ .../webapp/WEB-INF/jsp/offers/offersList.jsp | 2 +- src/main/webapp/WEB-INF/jsp/welcome.jsp | 6 +-- .../cheapy/web/OwnerControllerTests.java | 3 -- 31 files changed, 84 insertions(+), 292 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/model/BaseEntity.java b/src/main/java/org/springframework/cheapy/model/BaseEntity.java index 21aab45b7..95e0b3338 100644 --- a/src/main/java/org/springframework/cheapy/model/BaseEntity.java +++ b/src/main/java/org/springframework/cheapy/model/BaseEntity.java @@ -1,18 +1,3 @@ -/* - * 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.model; import java.io.Serializable; @@ -22,16 +7,14 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.MappedSuperclass; -/** - * Simple JavaBean domain object with an id property. Used as a base class for objects - * needing this property. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ @MappedSuperclass public class BaseEntity implements Serializable { + /** + * + */ + private static final long serialVersionUID = 1L; + @Id @GeneratedValue(strategy = GenerationType.IDENTITY) private Integer id; diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java index 39a398df5..210e3ed70 100644 --- a/src/main/java/org/springframework/cheapy/model/Client.java +++ b/src/main/java/org/springframework/cheapy/model/Client.java @@ -1,6 +1,5 @@ package org.springframework.cheapy.model; -import java.time.LocalTime; import java.util.Set; import javax.persistence.CascadeType; @@ -13,8 +12,6 @@ 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 BaseEntity{ diff --git a/src/main/java/org/springframework/cheapy/model/FoodOffer.java b/src/main/java/org/springframework/cheapy/model/FoodOffer.java index d6a7d8e3d..59419f1d1 100644 --- a/src/main/java/org/springframework/cheapy/model/FoodOffer.java +++ b/src/main/java/org/springframework/cheapy/model/FoodOffer.java @@ -23,7 +23,13 @@ import javax.validation.constraints.NotNull; @Entity @Table(name = "food_offers") public class FoodOffer extends Offer { -//Plato específico + + /** + * + */ + private static final long serialVersionUID = 1L; + + //Plato específico @NotBlank private String food; diff --git a/src/main/java/org/springframework/cheapy/model/NamedEntity.java b/src/main/java/org/springframework/cheapy/model/NamedEntity.java index 0f00a5e9c..3d777b298 100644 --- a/src/main/java/org/springframework/cheapy/model/NamedEntity.java +++ b/src/main/java/org/springframework/cheapy/model/NamedEntity.java @@ -1,33 +1,16 @@ -/* - * 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.model; import javax.persistence.Column; import javax.persistence.MappedSuperclass; -/** - * Simple JavaBean domain object adds a name property to BaseEntity. Used as - * a base class for objects needing these properties. - * - * @author Ken Krebs - * @author Juergen Hoeller - */ @MappedSuperclass public class NamedEntity extends BaseEntity { + /** + * + */ + private static final long serialVersionUID = 1L; + @Column(name = "name") private String name; diff --git a/src/main/java/org/springframework/cheapy/model/NuOffer.java b/src/main/java/org/springframework/cheapy/model/NuOffer.java index fbb884f5d..5a52a5756 100644 --- a/src/main/java/org/springframework/cheapy/model/NuOffer.java +++ b/src/main/java/org/springframework/cheapy/model/NuOffer.java @@ -10,6 +10,11 @@ import javax.validation.constraints.NotNull; @Table(name = "nu_offers") public class NuOffer extends Offer { + /** + * + */ + private static final long serialVersionUID = 1L; + @NotNull private Integer gold; diff --git a/src/main/java/org/springframework/cheapy/model/Offer.java b/src/main/java/org/springframework/cheapy/model/Offer.java index b26ea57bf..c41ca9040 100644 --- a/src/main/java/org/springframework/cheapy/model/Offer.java +++ b/src/main/java/org/springframework/cheapy/model/Offer.java @@ -29,7 +29,13 @@ import org.springframework.format.annotation.DateTimeFormat; @MappedSuperclass public class Offer extends BaseEntity { -//Clase padre + + /** + * + */ + private static final long serialVersionUID = 1L; + + //Clase padre @DateTimeFormat(pattern = "dd/MM/yyyy HH:mm") @NotNull @Future diff --git a/src/main/java/org/springframework/cheapy/model/Owner.java b/src/main/java/org/springframework/cheapy/model/Owner.java index 792f42753..7a04f3434 100644 --- a/src/main/java/org/springframework/cheapy/model/Owner.java +++ b/src/main/java/org/springframework/cheapy/model/Owner.java @@ -1,50 +1,22 @@ -/* - * 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.model; -import java.util.ArrayList; -import java.util.Collections; -import java.util.HashSet; -import java.util.List; -import java.util.Set; - -import javax.persistence.CascadeType; import javax.persistence.Column; import javax.persistence.Entity; -import javax.persistence.OneToMany; import javax.persistence.Table; import javax.validation.constraints.Digits; import javax.validation.constraints.NotEmpty; -import org.springframework.beans.support.MutableSortDefinition; -import org.springframework.beans.support.PropertyComparator; import org.springframework.core.style.ToStringCreator; -/** - * Simple JavaBean domain object representing an owner. - * - * @author Ken Krebs - * @author Juergen Hoeller - * @author Sam Brannen - * @author Michael Isvy - */ @Entity @Table(name = "owners") public class Owner extends Person { + /** + * + */ + private static final long serialVersionUID = 1L; + @Column(name = "address") @NotEmpty private String address; diff --git a/src/main/java/org/springframework/cheapy/model/Person.java b/src/main/java/org/springframework/cheapy/model/Person.java index 7e8d87c0c..8758455db 100644 --- a/src/main/java/org/springframework/cheapy/model/Person.java +++ b/src/main/java/org/springframework/cheapy/model/Person.java @@ -1,32 +1,17 @@ -/* - * 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.model; import javax.persistence.Column; import javax.persistence.MappedSuperclass; import javax.validation.constraints.NotEmpty; -/** - * Simple JavaBean domain object representing an person. - * - * @author Ken Krebs - */ @MappedSuperclass public class Person extends BaseEntity { + /** + * + */ + private static final long serialVersionUID = 1L; + @Column(name = "first_name") @NotEmpty private String firstName; diff --git a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java index 1ef45f6e1..0ef65d7a2 100644 --- a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java +++ b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java @@ -10,6 +10,10 @@ import javax.validation.constraints.NotNull; @Table(name = "speed_offers") public class SpeedOffer extends Offer { + /** + * + */ + private static final long serialVersionUID = 1L; @NotNull private Integer gold; // x minutos diff --git a/src/main/java/org/springframework/cheapy/model/TimeOffer.java b/src/main/java/org/springframework/cheapy/model/TimeOffer.java index 33da076ab..d9833e0c8 100644 --- a/src/main/java/org/springframework/cheapy/model/TimeOffer.java +++ b/src/main/java/org/springframework/cheapy/model/TimeOffer.java @@ -1,18 +1,3 @@ -/* - * 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.model; import java.time.LocalTime; @@ -27,7 +12,13 @@ import org.springframework.format.annotation.DateTimeFormat; @Entity @Table(name = "time_offers") public class TimeOffer extends Offer { -//Oferta por franja horaria + + /** + * + */ + private static final long serialVersionUID = 1L; + + //Oferta por franja horaria @DateTimeFormat(pattern = "HH:mm") @NotNull private LocalTime init; @@ -39,8 +30,6 @@ public class TimeOffer extends Offer { @NotBlank private String discount; - - public LocalTime getInit() { return init; } diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java index 7cfc346d1..bd5b2dd30 100644 --- a/src/main/java/org/springframework/cheapy/model/User.java +++ b/src/main/java/org/springframework/cheapy/model/User.java @@ -1,8 +1,9 @@ package org.springframework.cheapy.model; -import javax.persistence.JoinColumn; -import javax.persistence.MappedSuperclass; -import javax.persistence.OneToOne; +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.validation.constraints.NotBlank; @Entity @Table(name = "users") diff --git a/src/main/java/org/springframework/cheapy/model/Usuario.java b/src/main/java/org/springframework/cheapy/model/Usuario.java index f6204abeb..9079bc72e 100644 --- a/src/main/java/org/springframework/cheapy/model/Usuario.java +++ b/src/main/java/org/springframework/cheapy/model/Usuario.java @@ -1,12 +1,8 @@ package org.springframework.cheapy.model; -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; diff --git a/src/main/java/org/springframework/cheapy/model/package-info.java b/src/main/java/org/springframework/cheapy/model/package-info.java index 620e13c68..1bc54373f 100644 --- a/src/main/java/org/springframework/cheapy/model/package-info.java +++ b/src/main/java/org/springframework/cheapy/model/package-info.java @@ -1,20 +1 @@ -/* - * 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. - */ - -/** - * The classes in this package represent utilities used by the domain. - */ package org.springframework.cheapy.model; diff --git a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java index a8adee7f7..8d5f6317c 100644 --- a/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/AuthoritiesRepository.java @@ -2,8 +2,6 @@ package org.springframework.cheapy.repository; import org.springframework.data.repository.CrudRepository; import org.springframework.cheapy.model.Authorities; -import org.springframework.cheapy.model.User; - public interface AuthoritiesRepository extends CrudRepository{ diff --git a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java index 4c12840c2..764b35184 100644 --- a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java @@ -1,13 +1,14 @@ - package org.springframework.cheapy.repository; - import org.springframework.cheapy.model.Client; +import org.springframework.data.jpa.repository.Query; import org.springframework.data.repository.CrudRepository; +import org.springframework.transaction.annotation.Transactional; public interface ClientRepository extends CrudRepository { - + @Query("SELECT client FROM Client client WHERE username =:username") + @Transactional(readOnly = true) Client findByUsername(String username); } diff --git a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java index 752bb718d..80fadc686 100644 --- a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java @@ -1,18 +1,15 @@ package org.springframework.cheapy.repository; - import org.springframework.cheapy.model.FoodOffer; -import java.util.Collection; import java.util.List; 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; - public interface FoodOfferRepository extends Repository { -@Query("SELECT foodOffer FROM FoodOffer foodOffer") + @Query("SELECT foodOffer FROM FoodOffer foodOffer") @Transactional(readOnly = true) List findAllFoodOffer(); diff --git a/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java index 39fff01bb..42d437fdb 100644 --- a/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java @@ -1,28 +1,19 @@ - package org.springframework.cheapy.repository; -import java.util.Collection; import java.util.List; import org.springframework.cheapy.model.NuOffer; import org.springframework.data.repository.Repository; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; - public interface NuOfferRepository extends Repository { - - - - NuOffer findNuOfferById(int nuOfferId); - @Query("SELECT nuOffer FROM NuOffer nuOffer") + @Query("SELECT nuOffer FROM NuOffer nuOffer") @Transactional(readOnly = true) List findAllNuOffer(); - - void save(NuOffer nuOffer); } diff --git a/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java index c3840912b..aef04d36d 100644 --- a/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java @@ -1,8 +1,5 @@ - package org.springframework.cheapy.repository; - -import java.util.Collection; import java.util.List; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.data.jpa.repository.Query; @@ -10,19 +7,16 @@ import org.springframework.data.repository.Repository; import org.springframework.data.repository.query.Param; import org.springframework.transaction.annotation.Transactional; - public interface SpeedOfferRepository extends Repository { - @Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE id =:id") @Transactional(readOnly = true) SpeedOffer findById(@Param("id") Integer id); - @Query("SELECT speedOffer FROM SpeedOffer speedOffer") + @Query("SELECT speedOffer FROM SpeedOffer speedOffer") @Transactional(readOnly = true) List findAllSpeedOffer(); - void save(SpeedOffer speedOffer); } diff --git a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java index 71717624d..b663057a7 100644 --- a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java @@ -1,28 +1,19 @@ - package org.springframework.cheapy.repository; -import java.util.Collection; import java.util.List; import org.springframework.cheapy.model.TimeOffer; import org.springframework.data.repository.Repository; import org.springframework.data.jpa.repository.Query; import org.springframework.transaction.annotation.Transactional; - public interface TimeOfferRepository extends Repository { - - - - TimeOffer findTimeOfferById(int timeOfferId); - @Query("SELECT timeOffer FROM TimeOffer timeOffer") + @Query("SELECT timeOffer FROM TimeOffer timeOffer") @Transactional(readOnly = true) List findAllTimeOffer(); - - void save(TimeOffer timeOffer); } diff --git a/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java b/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java index d16d99bf6..1bd7c8ee2 100644 --- a/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/UsuarioRepository.java @@ -2,7 +2,6 @@ package org.springframework.cheapy.repository; import org.springframework.data.repository.CrudRepository; -import org.springframework.cheapy.model.User; import org.springframework.cheapy.model.Usuario; public interface UsuarioRepository extends CrudRepository { diff --git a/src/main/java/org/springframework/cheapy/service/ClientService.java b/src/main/java/org/springframework/cheapy/service/ClientService.java index 9b197c438..d65649680 100644 --- a/src/main/java/org/springframework/cheapy/service/ClientService.java +++ b/src/main/java/org/springframework/cheapy/service/ClientService.java @@ -1,21 +1,5 @@ -/* - * 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 org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.Client; import org.springframework.cheapy.repository.ClientRepository; @@ -25,8 +9,6 @@ import org.springframework.security.core.context.SecurityContextHolder; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; - - @Service public class ClientService { @@ -37,13 +19,11 @@ public class ClientService { this.clientRepository = clientRepository; } - @Transactional public Client getCurrentClient() throws DataAccessException { Authentication authentication = SecurityContextHolder.getContext().getAuthentication(); - String username = authentication.getName(); + String username = authentication.getName(); return this.clientRepository.findByUsername(username); - } } diff --git a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java index edd61b7f5..d23ffc321 100644 --- a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java @@ -3,16 +3,15 @@ package org.springframework.cheapy.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.repository.FoodOfferRepository; -import java.util.Collection; import java.util.List; 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; @@ -23,12 +22,9 @@ public class FoodOfferService { } public List findAllFoodOffer() { // return this.foodOfferRepository.findAllFoodOffer(); - } - public void saveFoodOffer(final FoodOffer foodOffer) throws DataAccessException { - this.foodOfferRepository.save(foodOffer); } diff --git a/src/main/java/org/springframework/cheapy/service/TimeOfferService.java b/src/main/java/org/springframework/cheapy/service/TimeOfferService.java index f544b0515..b7d5904ef 100644 --- a/src/main/java/org/springframework/cheapy/service/TimeOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/TimeOfferService.java @@ -1,5 +1,7 @@ package org.springframework.cheapy.service; +import java.util.List; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.TimeOffer; import org.springframework.cheapy.repository.TimeOfferRepository; @@ -21,12 +23,12 @@ public class TimeOfferService { return this.timeOfferRepository.findTimeOfferById(id); } - public List findAllTimeOffer() { // + public List findAllTimeOffer() { return this.timeOfferRepository.findAllTimeOffer(); } - public void saveTimeOffer(final TimeOffer TimeOffer) throws DataAccessException { // + public void saveTimeOffer(final TimeOffer TimeOffer) throws DataAccessException { this.timeOfferRepository.save(TimeOffer); diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index d9f53a5e6..af191c66d 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -49,7 +49,7 @@ public class FoodOfferController { return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; } else { - Client client = this.clientService.getCurrentclient(); + Client client = this.clientService.getCurrentClient(); foodOffer.setClient(client); foodOffer.setType(StatusOffer.hidden); this.foodOfferService.saveFoodOffer(foodOffer); @@ -60,7 +60,7 @@ public class FoodOfferController { @GetMapping(value = "/foodOffers/{foodOfferId}/activate") public String activateFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, ModelMap modelMap) { FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); - Client client = this.clientService.getCurrentclient(); + Client client = this.clientService.getCurrentClient(); if(foodOffer.getClient().equals(client)) { foodOffer.setType(StatusOffer.active); foodOffer.setCode("FO-"+foodOfferId); diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java index dcd92f583..ffb11b46f 100644 --- a/src/main/java/org/springframework/cheapy/web/OfertaController.java +++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java @@ -1,21 +1,5 @@ -/* - * 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; @@ -28,38 +12,24 @@ 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 model) { diff --git a/src/main/java/org/springframework/cheapy/web/OwnerController.java b/src/main/java/org/springframework/cheapy/web/OwnerController.java index d95e5d120..229693415 100644 --- a/src/main/java/org/springframework/cheapy/web/OwnerController.java +++ b/src/main/java/org/springframework/cheapy/web/OwnerController.java @@ -1,18 +1,3 @@ -/* - * 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.Collection; @@ -21,7 +6,6 @@ import java.util.Map; import javax.validation.Valid; import org.springframework.cheapy.model.Owner; -import org.springframework.cheapy.repository.OwnerRepository; import org.springframework.cheapy.service.OwnerService; import org.springframework.stereotype.Controller; import org.springframework.ui.Model; @@ -33,12 +17,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.servlet.ModelAndView; -/** - * @author Juergen Hoeller - * @author Ken Krebs - * @author Arjen Poutsma - * @author Michael Isvy - */ @Controller public class OwnerController { @@ -137,5 +115,4 @@ public class OwnerController { return mav; } - } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index 419dc2ad4..f9678e4bc 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -45,7 +45,6 @@ public class SpeedOfferController { public SpeedOfferController(final SpeedOfferService speedOfferService, final ClientService clientService) { this.speedOfferService = speedOfferService; this.clientService = clientService; - } @InitBinder @@ -66,7 +65,7 @@ public class SpeedOfferController { return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } else { - Client client = this.clientService.getCurrentclient(); + Client client = this.clientService.getCurrentClient(); speedOffer.setClient(client); speedOffer.setType(StatusOffer.hidden); this.speedOfferService.saveSpeedOffer(speedOffer); @@ -77,7 +76,7 @@ public class SpeedOfferController { @GetMapping(value = "/speedOffers/{speedOfferId}/activate") public String activateSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, ModelMap modelMap) { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); - Client client = this.clientService.getCurrentclient(); + Client client = this.clientService.getCurrentClient(); if(speedOffer.getClient().equals(client)) { speedOffer.setType(StatusOffer.active); speedOffer.setCode("SP-"+speedOfferId); @@ -92,11 +91,7 @@ public class SpeedOfferController { public String processShowForm(@PathVariable("speedOfferId") int speedOfferId, Map model) { SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); - model.put("speedOffer", speedOffer); - return "speedOffers/speedOffersShow"; - } - } diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 4678e73bb..30ae2672e 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -9,15 +9,6 @@ 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 food_offers(start, end, code, type, client_id, food, discount, units) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'FO-1', 'active', null, 'macarrones', '15%', 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', 'SP-1', 'active', null, 5, '15%', 10, '10%', 15, '5%'); -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 users (dtype,username,password,enabled) VALUES ('user','admin','admin', TRUE ); INSERT INTO authorities VALUES ('admin','admin'); INSERT INTO users (dtype,username,password,enabled) VALUES ('user','manoli','manoli', TRUE ); @@ -32,10 +23,15 @@ INSERT INTO users (dtype,username,password,enabled) VALUES ('user','pepe','pepe' INSERT INTO authorities VALUES ('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 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'); +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', 'FO-1', 'active', null, 'macarrones', '15%', 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', 'SP-1', 'active', null, 5, '15%', 10, '10%', 15, '5%'); +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%' ); diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index 54efc214d..d65c50967 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -5,7 +5,7 @@ <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%@ taglib prefix="cheapy" tagdir="/WEB-INF/tags" %> - +

Ofertas por plato específico

diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index fc2db8671..5d48bc8d5 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -6,7 +6,7 @@ -

+

@@ -14,8 +14,8 @@
- - +
diff --git a/src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java b/src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java index dc0782a4d..c684187ca 100644 --- a/src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java +++ b/src/test/java/org/springframework/cheapy/web/OwnerControllerTests.java @@ -160,6 +160,3 @@ class OwnerControllerTests { .andExpect(model().attribute("owner", hasProperty("telephone", is("6085551023")))) .andExpect(view().name("owners/ownerDetails")); }*/ - -} -*/ \ No newline at end of file From dbf0b01744eb13a67830625da5f3eaa0fc07e675 Mon Sep 17 00:00:00 2001 From: Javier Date: Fri, 26 Mar 2021 19:20:31 +0100 Subject: [PATCH 03/13] =?UTF-8?q?A=C3=B1adir=20jsp?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheapy/web/NuOfferController.java | 40 ++++++++++++++----- .../createOrUpdateFoodOfferForm.jsp | 31 ++++++++++++++ .../jsp/foodOffers/foodOffersDisable.jsp | 24 +++++++++++ .../nuOffers/createOrUpdateNuOfferForm.jsp | 9 +---- .../WEB-INF/jsp/nuOffers/nuOffersShow.jsp | 13 ++++-- .../createOrUpdateTimeOfferForm.jsp | 37 +++++++++++++++++ .../jsp/timeOffers/timeOffersDisable.jsp | 24 +++++++++++ 7 files changed, 158 insertions(+), 20 deletions(-) create mode 100644 src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp create mode 100644 src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersDisable.jsp diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index f0e24eed7..fb39595ed 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -25,6 +25,7 @@ import javax.validation.Valid; import org.springframework.beans.BeanUtils; import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.NuOffer; +import org.springframework.cheapy.model.Owner; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; import org.springframework.cheapy.model.TimeOffer; @@ -33,9 +34,12 @@ 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.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; +import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -51,21 +55,19 @@ public class NuOfferController { private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "nuOffers/createOrUpdateNuOfferForm"; - 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; + public NuOfferController(final NuOfferService nuOfferService) { this.nuOfferService = nuOfferService; - this.speedOfferService = speedOfferService; - this.timeOfferService = timeOfferService; } + + @InitBinder + public void setAllowedFields(WebDataBinder dataBinder) { + dataBinder.setDisallowedFields("id"); + } @GetMapping("/offers/nu/{nuOfferId}") @@ -139,11 +141,31 @@ public class NuOfferController { this.nuOfferService.saveNuOffer(nuOfferOld); - return "redirect:"; + return "offers/offersList"; } } + @GetMapping(value ="/offers/nu/{nuOfferId}/edit") + public String initUpdateNuOfferForm(@PathVariable("nuOfferId") int nuOfferId, Model model) { + NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); + model.addAttribute(nuOffer); + return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping("/offers/nu/{nuOfferId}/edit") + public String processUpdateOwnerForm(@Valid NuOffer nuOffer, BindingResult result, + @PathVariable("nuOfferId") int nuOfferId) { + if (result.hasErrors()) { + return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + } + else { + nuOffer.setId(nuOfferId); + this.nuOfferService.saveNuOffer(nuOffer); + return "redirect:/offers/nu/{nuOfferId}"; + } + } + @GetMapping(value = "/offers/nu/{nuOfferId}/disable") public String disableNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp new file mode 100644 index 000000000..ff6097fe2 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp @@ -0,0 +1,31 @@ +<%@ 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="petclinic" tagdir="/WEB-INF/tags" %> + + +

+ New FoodOffer +

+ +
+ + + + + +
+
+
+ + + + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp new file mode 100644 index 000000000..6f14e9ba0 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp @@ -0,0 +1,24 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere eliminar su oferta?

+ + + + + + + + + + Volver + + + diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp index e0d2366cd..229cd0786 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp @@ -25,14 +25,9 @@
- - - - - + - - +
diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp index 9c4eca9f3..e059983b3 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp @@ -6,7 +6,7 @@ -

Oferta por número de comensales

+

Oferta por n�mero de comensales

@@ -48,9 +48,14 @@
- <%-- - + + - Edit Owner --%> + Editar Oferta + + + + + Eliminar Oferta diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp new file mode 100644 index 000000000..687a2d6b9 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp @@ -0,0 +1,37 @@ + +<%@ 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="petclinic" tagdir="/WEB-INF/tags" %> + + +

+ New TimeOffer +

+ +
+ + + + + + + +
+
+
+ + + + + + + + +
+
+ + diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersDisable.jsp new file mode 100644 index 000000000..0baaaabcc --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersDisable.jsp @@ -0,0 +1,24 @@ +<%@ page session="false" trimDirectiveWhitespaces="true"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="petclinic" tagdir="/WEB-INF/tags"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions"%> + + + + +

¿Esta seguro de que quiere eliminar su oferta?

+ + + + + + + + + + Volver + + + From 14585f778af8785a45b468750657835db5da4e4b Mon Sep 17 00:00:00 2001 From: "gabgutpri@alum.us.es" Date: Fri, 26 Mar 2021 19:28:11 +0100 Subject: [PATCH 04/13] Error corregido --- .../springframework/cheapy/model/NuOffer.java | 49 +++--- .../cheapy/model/SpeedOffer.java | 49 +++--- .../cheapy/service/NuOfferService.java | 13 +- .../cheapy/service/SpeedOfferService.java | 11 +- .../cheapy/web/NuOfferController.java | 148 ++++++------------ .../cheapy/web/SpeedOfferController.java | 148 ++++++------------ src/main/resources/db/mysql/data.sql | 8 +- .../nuOffers/createOrUpdateNuOfferForm.jsp | 7 +- .../WEB-INF/jsp/nuOffers/nuOffersShow.jsp | 6 +- .../createOrUpdateSpeedOfferForm.jsp | 7 +- .../jsp/speedOffers/speedOffersShow.jsp | 6 +- 11 files changed, 186 insertions(+), 266 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/model/NuOffer.java b/src/main/java/org/springframework/cheapy/model/NuOffer.java index ca0965fd6..37e665cbd 100644 --- a/src/main/java/org/springframework/cheapy/model/NuOffer.java +++ b/src/main/java/org/springframework/cheapy/model/NuOffer.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -13,85 +13,92 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.cheapy.model; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Entity @Table(name = "nu_offers") public class NuOffer extends Offer { -//Oferta por numero de comensales + + //Oferta por numero de comensales @NotNull - private Integer gold; + @Min(1) + private Integer gold; @Column(name = "discount_gold") @NotBlank - private String discountGold; + private String discountGold; @NotNull - private Integer silver; + @Min(1) + private Integer silver; @Column(name = "discount_silver") @NotBlank - private String discountSilver; + private String discountSilver; @NotNull - private Integer bronze; + @Min(1) + private Integer bronze; @Column(name = "discount_bronze") @NotBlank - private String discountBronze; + private String discountBronze; + public Integer getGold() { - return gold; + return this.gold; } - public void setGold(Integer gold) { + public void setGold(final Integer gold) { this.gold = gold; } public String getDiscountGold() { - return discountGold; + return this.discountGold; } - public void setDiscountGold(String discountGold) { + public void setDiscountGold(final String discountGold) { this.discountGold = discountGold; } public Integer getSilver() { - return silver; + return this.silver; } - public void setSilver(Integer silver) { + public void setSilver(final Integer silver) { this.silver = silver; } public String getDiscountSilver() { - return discountSilver; + return this.discountSilver; } - public void setDiscountSilver(String discountSilver) { + public void setDiscountSilver(final String discountSilver) { this.discountSilver = discountSilver; } public Integer getBronze() { - return bronze; + return this.bronze; } - public void setBronze(Integer bronze) { + public void setBronze(final Integer bronze) { this.bronze = bronze; } public String getDiscountBronze() { - return discountBronze; + return this.discountBronze; } - public void setDiscountBronze(String discountBronze) { + public void setDiscountBronze(final String discountBronze) { this.discountBronze = discountBronze; } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java index 2f76166b8..ca20c296e 100644 --- a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java +++ b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -13,85 +13,92 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.cheapy.model; import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Entity @Table(name = "speed_offers") public class SpeedOffer extends Offer { -//Ofertar por rapidez comiendo + + //Ofertar por rapidez comiendo @NotNull - private Integer gold; // x minutos + @Min(0) + private Integer gold; // x minutos @Column(name = "discount_gold") @NotBlank - private String discountGold; + private String discountGold; @NotNull - private Integer silver; + @Min(0) + private Integer silver; @Column(name = "discount_silver") @NotBlank - private String discountSilver; + private String discountSilver; @NotNull - private Integer bronze; + @Min(0) + private Integer bronze; @Column(name = "discount_bronze") @NotBlank - private String discountBronze; + private String discountBronze; + public Integer getGold() { - return gold; + return this.gold; } - public void setGold(Integer gold) { + public void setGold(final Integer gold) { this.gold = gold; } public String getDiscountGold() { - return discountGold; + return this.discountGold; } - public void setDiscountGold(String discountGold) { + public void setDiscountGold(final String discountGold) { this.discountGold = discountGold; } public Integer getSilver() { - return silver; + return this.silver; } - public void setSilver(Integer silver) { + public void setSilver(final Integer silver) { this.silver = silver; } public String getDiscountSilver() { - return discountSilver; + return this.discountSilver; } - public void setDiscountSilver(String discountSilver) { + public void setDiscountSilver(final String discountSilver) { this.discountSilver = discountSilver; } public Integer getBronze() { - return bronze; + return this.bronze; } - public void setBronze(Integer bronze) { + public void setBronze(final Integer bronze) { this.bronze = bronze; } public String getDiscountBronze() { - return discountBronze; + return this.discountBronze; } - public void setDiscountBronze(String discountBronze) { + public void setDiscountBronze(final String discountBronze) { this.discountBronze = discountBronze; } -} \ No newline at end of file +} diff --git a/src/main/java/org/springframework/cheapy/service/NuOfferService.java b/src/main/java/org/springframework/cheapy/service/NuOfferService.java index ce149068e..95147d734 100644 --- a/src/main/java/org/springframework/cheapy/service/NuOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/NuOfferService.java @@ -1,18 +1,18 @@ + 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; +import org.springframework.transaction.annotation.Transactional; @Service public class NuOfferService { + private NuOfferRepository nuOfferRepository; @@ -21,17 +21,18 @@ public class NuOfferService { this.nuOfferRepository = nuOfferRepository; } + @Transactional public NuOffer findNuOfferById(final int id) { return this.nuOfferRepository.findById(id); } + @Transactional public List findAllNuOffer() { // return this.nuOfferRepository.findAllNuOffer(); - } - + + @Transactional public void saveNuOffer(final NuOffer nuOffer) throws DataAccessException { // this.nuOfferRepository.save(nuOffer); - } } diff --git a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java index 192616ca4..54017526a 100644 --- a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java @@ -1,6 +1,6 @@ + package org.springframework.cheapy.service; -import java.util.Collection; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; @@ -8,9 +8,11 @@ import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.repository.SpeedOfferRepository; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; @Service public class SpeedOfferService { + private SpeedOfferRepository speedOfferRepository; @@ -19,17 +21,18 @@ public class SpeedOfferService { this.speedOfferRepository = speedOfferRepository; } + @Transactional public SpeedOffer findSpeedOfferById(final int id) { return this.speedOfferRepository.findById(id); } + @Transactional public List findAllSpeedOffer() { // return this.speedOfferRepository.findAllSpeedOffer(); - } - + + @Transactional public void saveSpeedOffer(final SpeedOffer speedOffer) throws DataAccessException { // this.speedOfferRepository.save(speedOffer); - } } diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index f0e24eed7..ff2d512d6 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -13,21 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.cheapy.web; import java.security.Principal; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import javax.validation.Valid; -import org.springframework.beans.BeanUtils; -import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.NuOffer; -import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; -import org.springframework.cheapy.model.TimeOffer; import org.springframework.cheapy.service.FoodOfferService; import org.springframework.cheapy.service.NuOfferService; import org.springframework.cheapy.service.SpeedOfferService; @@ -39,27 +34,24 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; - /** * @author Juergen Hoeller * @author Ken Krebs * @author Arjen Poutsma * @author Michael Isvy */ -@Controller +@Controller public class NuOfferController { - private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "nuOffers/createOrUpdateNuOfferForm"; + private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "nuOffers/createOrUpdateNuOfferForm"; - private final FoodOfferService foodOfferService; - private final NuOfferService nuOfferService; - private final SpeedOfferService speedOfferService; - private final TimeOfferService timeOfferService; + 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) { + public NuOfferController(final FoodOfferService foodOfferService, final NuOfferService nuOfferService, final SpeedOfferService speedOfferService, final TimeOfferService timeOfferService) { this.foodOfferService = foodOfferService; this.nuOfferService = nuOfferService; this.speedOfferService = speedOfferService; @@ -67,121 +59,77 @@ public class NuOfferController { } - @GetMapping("/offers/nu/{nuOfferId}") - public String processShowForm(@PathVariable("nuOfferId") int nuOfferId, Map model) { + public String processShowForm(@PathVariable("nuOfferId") final int nuOfferId, final Map model) { + + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); - 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; -// } - - @GetMapping(value = "/offers/nu/{nuOfferId}/edit") public String updateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } - - NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); - model.put("nuOffer", nuOffer); - return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + model.addAttribute("nuOffer", nuOffer); + return NuOfferController.VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } @PostMapping(value = "/offers/nu/{nuOfferId}/edit") - public String updateNuOffer(@Valid final NuOffer nuOfferEdit, final BindingResult result, @PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { - -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } + public String updateNuOffer(@Valid final NuOffer nuOfferEdit, final BindingResult result, final Principal principal, final ModelMap model) { if (result.hasErrors()) { - model.put("nuOffer", nuOfferEdit); - return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + model.addAttribute("nuOffer", nuOfferEdit); + return NuOfferController.VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } else { - - NuOffer nuOfferOld=this.nuOfferService.findNuOfferById(nuOfferId); - - BeanUtils.copyProperties(nuOfferEdit, nuOfferOld, "id", "client_id"); - - this.nuOfferService.saveNuOffer(nuOfferOld); - - return "redirect:"; + this.nuOfferService.saveNuOffer(nuOfferEdit); + return "redirect:/offers/nu/" + nuOfferEdit.getId(); } } - + @GetMapping(value = "/offers/nu/{nuOfferId}/disable") public String disableNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } -// -// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { -// model.addAttribute("x", true); -// -// } else { -// model.addAttribute("x", false); -// } + // if (!this.comprobarIdentidad(principal, vehiculoId)) { + // return "exception"; + // } + // + // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { + // model.addAttribute("x", true); + // + // } else { + // model.addAttribute("x", false); + // } - NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); model.put("nuOffer", nuOffer); return "nuOffers/nuOffersDisable"; } - @PostMapping(value = "/offers/nu/{nuOfferId}/disable") + @PostMapping(value = "/offers/nu/{nuOfferId}/disable") public String disableNuOfferForm(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } -// -// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { -// return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; -// -// } else { - NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); - + // if (!this.comprobarIdentidad(principal, vehiculoId)) { + // return "exception"; + // } + // + // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { + // return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; + // + // } else { + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + nuOffer.setType(StatusOffer.inactive); - + this.nuOfferService.saveNuOffer(nuOffer); - + return "redirect:"; - + } - + } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index 38513859e..bd62eee3f 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -5,7 +5,7 @@ * 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 + * 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, @@ -13,21 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.cheapy.web; import java.security.Principal; -import java.util.ArrayList; -import java.util.List; import java.util.Map; import javax.validation.Valid; -import org.springframework.beans.BeanUtils; -import org.springframework.cheapy.model.FoodOffer; -import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; -import org.springframework.cheapy.model.TimeOffer; import org.springframework.cheapy.service.FoodOfferService; import org.springframework.cheapy.service.NuOfferService; import org.springframework.cheapy.service.SpeedOfferService; @@ -39,27 +34,24 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; - /** * @author Juergen Hoeller * @author Ken Krebs * @author Arjen Poutsma * @author Michael Isvy */ -@Controller +@Controller public class SpeedOfferController { - private static final String VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM = "speedOffers/createOrUpdateSpeedOfferForm"; + private static final String VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM = "speedOffers/createOrUpdateSpeedOfferForm"; - private final FoodOfferService foodOfferService; - private final NuOfferService nuOfferService; - private final SpeedOfferService speedOfferService; - private final TimeOfferService timeOfferService; + 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) { + public SpeedOfferController(final FoodOfferService foodOfferService, final NuOfferService nuOfferService, final SpeedOfferService speedOfferService, final TimeOfferService timeOfferService) { this.foodOfferService = foodOfferService; this.nuOfferService = nuOfferService; this.speedOfferService = speedOfferService; @@ -67,121 +59,77 @@ public class SpeedOfferController { } - @GetMapping("/offers/speed/{speedOfferId}") - public String processShowForm(@PathVariable("speedOfferId") int speedOfferId, Map model) { + public String processShowForm(@PathVariable("speedOfferId") final int speedOfferId, final Map model) { + + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); - 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; -// } - @GetMapping(value = "/offers/speed/{speedOfferId}/edit") public String updateNuOffer(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } - - SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); - model.put("speedOffer", speedOffer); - return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); + model.addAttribute("speedOffer", speedOffer); + return SpeedOfferController.VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } @PostMapping(value = "/offers/speed/{speedOfferId}/edit") - public String updateNuOffer(@Valid final SpeedOffer speedOfferEdit, final BindingResult result, @PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { - -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } + public String updateNuOffer(@Valid final SpeedOffer speedOfferEdit, final BindingResult result, final Principal principal, final ModelMap model) { if (result.hasErrors()) { - model.put("speedOffer", speedOfferEdit); - return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; + model.addAttribute("speedOffer", speedOfferEdit); + return SpeedOfferController.VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } else { - - SpeedOffer speedOfferOld=this.speedOfferService.findSpeedOfferById(speedOfferId); - - BeanUtils.copyProperties(speedOfferEdit, speedOfferOld, "id", "client_id"); - - this.speedOfferService.saveSpeedOffer(speedOfferOld); - - return "redirect:"; + this.speedOfferService.saveSpeedOffer(speedOfferEdit); + return "redirect:/offers/speed/" + speedOfferEdit.getId(); } } - + @GetMapping(value = "/offers/speed/{speedOfferId}/disable") public String disableSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } -// -// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { -// model.addAttribute("x", true); -// -// } else { -// model.addAttribute("x", false); -// } + // if (!this.comprobarIdentidad(principal, vehiculoId)) { + // return "exception"; + // } + // + // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { + // model.addAttribute("x", true); + // + // } else { + // model.addAttribute("x", false); + // } - SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); model.put("speedOffer", speedOffer); return "speedOffers/speedOffersDisable"; } - @PostMapping(value = "/offers/speed/{speedOfferId}/disable") + @PostMapping(value = "/offers/speed/{speedOfferId}/disable") public String disableNuOfferForm(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { -// if (!this.comprobarIdentidad(principal, vehiculoId)) { -// return "exception"; -// } -// -// if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { -// return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; -// -// } else { - SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); - + // if (!this.comprobarIdentidad(principal, vehiculoId)) { + // return "exception"; + // } + // + // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { + // return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; + // + // } else { + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); + speedOffer.setType(StatusOffer.inactive); - + this.speedOfferService.saveSpeedOffer(speedOffer); - + return "redirect:"; - + } - - + } diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index d0f4aac33..862d199a7 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -10,10 +10,10 @@ INSERT INTO owners VALUES (9, 'David', 'Schroeder', '2749 Blackhawk Trail', 'Mad INSERT INTO owners VALUES (10, 'Carlos', 'Estaban', '2335 Independence La.', 'Waunakee', '6085555487'); -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 food_offers(start, end, code, type, client_id, food, discount, units) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'F-001', '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', 'T-001', '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', 'SP-001', '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', 'NU-001', 'active', null,15,'25%',10,'15%',5,'10%' ); INSERT INTO users(username,password,enabled) VALUES ('admin1','4dm1n',TRUE); INSERT INTO authorities(id,username,authority) VALUES (1,'admin1','admin'); diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp index e0d2366cd..3392a11c5 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp @@ -12,6 +12,9 @@
+ + + @@ -27,10 +30,10 @@
- + - +
diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp index 9c4eca9f3..e52856c9d 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp @@ -48,9 +48,9 @@ - <%-- - + + - Edit Owner --%> + Editar ofeta diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp index f813733b0..245444234 100644 --- a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp @@ -12,6 +12,9 @@
+ + + @@ -25,10 +28,10 @@
- + - +
diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp index 4a85df28b..ec071786d 100644 --- a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp @@ -48,9 +48,9 @@ - <%-- - + + - Edit Owner --%> + Editar oferta From 8ccda96390e856229408b4357bc9f0b0c5d6e8cb Mon Sep 17 00:00:00 2001 From: Angel Caballero Dominguez Date: Fri, 26 Mar 2021 21:11:12 +0100 Subject: [PATCH 05/13] Decoradas vistas de funciones de oferta creadas Se han decorado las vistas de mostrar ofertas y las vistas de mostrar detalles de oferta de cada uno de los tipos de oferta actuales --- .../cheapy/web/FoodOfferController.java | 4 + .../cheapy/web/NuOfferController.java | 4 + .../cheapy/web/OfertaController.java | 4 + .../cheapy/web/SpeedOfferController.java | 4 + .../cheapy/web/TimeOfferController.java | 4 + src/main/less/cheapy.less | 132 +++++++++++++++++- .../resources/messages/messages.properties | 4 +- .../resources/messages/messages_es.properties | 30 +++- .../WEB-INF/jsp/foodOffers/foodOffersShow.jsp | 26 ++-- .../WEB-INF/jsp/nuOffers/nuOffersShow.jsp | 32 +++-- .../webapp/WEB-INF/jsp/offers/offersList.jsp | 81 ++++++----- .../jsp/speedOffers/speedOffersShow.jsp | 34 +++-- .../WEB-INF/jsp/timeOffers/timeOffersShow.jsp | 22 ++- src/main/webapp/WEB-INF/jsp/welcome.jsp | 5 +- src/main/webapp/WEB-INF/tags/pivotal.tag | 2 +- 15 files changed, 305 insertions(+), 83 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index af191c66d..c9d966408 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -1,6 +1,7 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; import org.springframework.cheapy.model.Client; @@ -77,6 +78,9 @@ public class FoodOfferController { model.put("foodOffer", foodOffer); + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "foodOffers/foodOffersShow"; } diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index c6ad3c47f..2315ff4ad 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -1,5 +1,6 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; @@ -89,6 +90,9 @@ public class NuOfferController { model.put("nuOffer", nuOffer); + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "nuOffers/nuOffersShow"; } diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java index ffb11b46f..c7cb3de71 100644 --- a/src/main/java/org/springframework/cheapy/web/OfertaController.java +++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java @@ -1,5 +1,6 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.List; import java.util.Map; @@ -43,6 +44,9 @@ public class OfertaController { model.put("speedOfferLs", speedOfferLs); model.put("timeOfferLs", timeOfferLs); + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "offers/offersList"; } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index f9678e4bc..ab440b40d 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -16,6 +16,7 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; @@ -92,6 +93,9 @@ public class SpeedOfferController { SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); model.put("speedOffer", speedOffer); + + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); return "speedOffers/speedOffersShow"; } } diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index b1bc2e528..86864aaf1 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -1,5 +1,6 @@ package org.springframework.cheapy.web; +import java.time.format.DateTimeFormatter; import java.util.Map; import javax.validation.Valid; @@ -88,6 +89,9 @@ public class TimeOfferController { model.put("timeOffer", timeOffer); + //Se añade formateador de fecha al modelo + model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm")); + return "timeOffers/timeOffersShow"; } diff --git a/src/main/less/cheapy.less b/src/main/less/cheapy.less index 0f326f7ed..2ad446686 100644 --- a/src/main/less/cheapy.less +++ b/src/main/less/cheapy.less @@ -47,10 +47,10 @@ @pagination-active-bg: @spring-brown; @pagination-active-border: @spring-blue; -@table-border-color: @spring-brown; +@table-border-color: rgb(0, 64, 128); -.table > thead > tr > th { - background-color: lighten(@spring-brown, 3%); + .table > thead > tr > th { + background-color: rgb(40, 140, 215); color: @spring-light-grey; } @@ -237,7 +237,131 @@ img.img-responsive{ .btn-home button:hover { - background-color: rgb(0, 64, 128); + background-color: rgb(40, 140, 215); +} + +#foodOfferTable th { + width: 25%; +} + +#nuOfferTable th { + width: 33%; +} + +#speedOfferTable th { + width: 33%; +} + +#timeOfferTable th { + width: 33%; +} + +.btn-detalles button { + background-color: rgb(0, 64, 128); + border: 1px solid rgb(0, 0, 160); + color: white; + padding: 10px 24px; + cursor: pointer; + display: block; + float: right; +} + +.btn-detalles button:not(:last-child) { + border-bottom: none; +} + + +.btn-detalles button:hover { + background-color: rgb(40, 140, 215); +} + +.btn-return{ + display: table; + margin: 0 auto; + width: 100%; +} + +.btn-return button { + background-color: rgb(0, 64, 128); + border: 1px solid rgb(0, 0, 160); + color: white; + padding: 10px 24px; + cursor: pointer; + display: block; + left: 0%; +} + +.btn-return button:not(:last-child) { + border-bottom: none; +} + + +.btn-return button:hover { + background-color: rgb(40, 140, 215); +} + +#foodOfferTable td{ + vertical-align:middle; +} + +#nuOfferTable td{ + vertical-align:middle; +} + +#speedOfferTable td{ + vertical-align:middle; +} + +#timeOfferTable td{ + vertical-align:middle; +} + +#nuOffer-table tr:nth-child(3){ + background-color: rgb(255, 215, 0); +} + +#nuOffer-table tr:nth-child(4){ + background-color: rgb(255, 215, 0); +} + +#nuOffer-table tr:nth-child(5){ + background-color: rgb(192, 192, 192); +} + +#nuOffer-table tr:nth-child(6){ + background-color: rgb(192, 192, 192); +} + +#nuOffer-table tr:nth-child(7){ + background-color: rgb(204, 128, 51); +} + +#nuOffer-table tr:nth-child(8){ + background-color: rgb(204, 128, 51); +} + +#speedOffer-table tr:nth-child(3){ + background-color: rgb(255, 215, 0); +} + +#speedOffer-table tr:nth-child(4){ + background-color: rgb(255, 215, 0); +} + +#speedOffer-table tr:nth-child(5){ + background-color: rgb(192, 192, 192); +} + +#speedOffer-table tr:nth-child(6){ + background-color: rgb(192, 192, 192); +} + +#speedOffer-table tr:nth-child(7){ + background-color: rgb(204, 128, 51); +} + +#speedOffer-table tr:nth-child(8){ + background-color: rgb(204, 128, 51); } .alert-success { diff --git a/src/main/resources/messages/messages.properties b/src/main/resources/messages/messages.properties index 173417a10..1947d786c 100644 --- a/src/main/resources/messages/messages.properties +++ b/src/main/resources/messages/messages.properties @@ -1,4 +1,6 @@ -welcome=Welcome +welcome=Welcome to +listOffers=List Offers + required=is required notFound=has not been found duplicate=is already in use diff --git a/src/main/resources/messages/messages_es.properties b/src/main/resources/messages/messages_es.properties index bdf81dae7..81b71314d 100644 --- a/src/main/resources/messages/messages_es.properties +++ b/src/main/resources/messages/messages_es.properties @@ -1,8 +1,34 @@ welcome=Bienvenido a -required=Es requerido +listOffers=Ver Ofertas +foodOffers=Ofertas por plato especifico +foodOffer=Oferta por plato especifico +nuOffers=Ofertas por numero de comensales +nuOffer=Oferta por numero de comensales +speedOffers=Ofertas rapidez comiendo +speedOffer=Oferta por comer veloz +timeOffers=Ofertas por franja horaria +timeOffer=Oferta por franja horaria +food=Plato +foodInOffer=Plato en oferta +cuantity=Cantidad +discount=Descuento +goldGoal=Meta oro +goldDiscount=Descuento oro +silverGoal=Meta plata +silverDiscount=Descuento plata +bronzeGoal=Meta bronce +bronzeDiscount=Descuento bronce +startDate=Fecha inicio +offerBeginning=Inicio de la oferta +endDate=Fecha fin +offerEnding=Fin de la oferta +details=Detalles +offerCode=Codigo de la oferta +return=Volver +required=Es requeridOfertas por franja horariao notFound=No ha sido encontrado duplicate=Ya se encuentra en uso nonNumeric=Sólo debe contener numeros duplicateFormSubmission=No se permite el envío de formularios duplicados typeMismatch.date=Fecha invalida -typeMismatch.birthDate=Fecha invalida +typeMismatch.birthDate=Fecha invalida \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp index 0b7c8785a..f307756d5 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp @@ -3,38 +3,46 @@ <%@ 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" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por plato específico

+

- - + + - - + + - + - + - + - +
Inicio de la oferta
Fin de la oferta
Plato en oferta
Descuento
Cantidad
Codigo de la oferta
+ +
+ +
<%-- diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp index 431d2a4d6..301184bb3 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp @@ -3,35 +3,37 @@ <%@ 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" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por número de comensales

+

- +
- - + + - - + + - + - + - + - + @@ -39,14 +41,20 @@ - + - +
Inicio de la oferta
Fin de la oferta
Meta oro
Descuento oro
Meta plata
Descuento plata
Descuento bronce
Codigo de la oferta
+ +
+ +
<%-- diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index d65c50967..d326a6b8a 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -4,17 +4,18 @@ <%@ 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" %> + -

Ofertas por plato específico

+

- - - + + + @@ -25,16 +26,20 @@ @@ -42,14 +47,14 @@
PlatoFecha inicioFecha fin
- + - + - - - - Enlace + + + +
+ +
-

Ofertas por número de comensales

+

- - + + @@ -59,29 +64,33 @@
Fecha inicioFecha fin
- + - + - - - - Enlace + + + +
+ +
-

Ofertas rapidez comiendo

+

- - + + @@ -91,30 +100,34 @@
Fecha inicioFecha fin
- + - + - Enlace +
+ +
-

Ofertas por franja horaria

+

- - + + @@ -123,16 +136,20 @@ diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp index 4a85df28b..d479bb213 100644 --- a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp @@ -3,50 +3,58 @@ <%@ 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" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por comer veloz

+

-
Fecha inicioFecha fin
- + - + - + - Enlace +
+ +
+
- - + + - - + + - + - + - + - + - + - + - +
Inicio de la oferta
Fin de la oferta
Meta oro
Descuento oro
Meta plata
Descuento plata
Meta bronce
Descuento bronce
Codigo de la oferta
+ +
+ +
<%-- diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp index a344a6221..da696276d 100644 --- a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp @@ -3,29 +3,37 @@ <%@ 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" %> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %> + -

Oferta por franja horária

+

- - + + - - + + - + - +
Inicio de la oferta
Fin de la oferta
Descuento
Codigo de la oferta
+ +
+ +
diff --git a/src/main/webapp/WEB-INF/jsp/welcome.jsp b/src/main/webapp/WEB-INF/jsp/welcome.jsp index 5d48bc8d5..95c506f42 100644 --- a/src/main/webapp/WEB-INF/jsp/welcome.jsp +++ b/src/main/webapp/WEB-INF/jsp/welcome.jsp @@ -14,8 +14,9 @@
- +
diff --git a/src/main/webapp/WEB-INF/tags/pivotal.tag b/src/main/webapp/WEB-INF/tags/pivotal.tag index 23991e12a..3824905bf 100644 --- a/src/main/webapp/WEB-INF/tags/pivotal.tag +++ b/src/main/webapp/WEB-INF/tags/pivotal.tag @@ -5,6 +5,6 @@
" - alt="Sponsored by Pivotal"/>
+ alt="Eat fast, eat cheapy"/>
From 1b211c32d530afcb9a4efbbc847f7109ff7c2e84 Mon Sep 17 00:00:00 2001 From: Javier Date: Sat, 27 Mar 2021 19:47:45 +0100 Subject: [PATCH 06/13] Modificar y eliminar ofertas con seguridad --- .../configuration/SecurityConfiguration.java | 4 +- .../cheapy/repository/ClientRepository.java | 2 +- .../cheapy/service/NuOfferService.java | 6 +- .../cheapy/service/SpeedOfferService.java | 1 - .../cheapy/web/FoodOfferController.java | 90 ++++++++++-- .../cheapy/web/NuOfferController.java | 134 ++++++++---------- .../cheapy/web/SpeedOfferController.java | 82 +++++------ .../cheapy/web/TimeOfferController.java | 133 ++++++++++++----- src/main/resources/db/mysql/data.sql | 24 ++-- .../createOrUpdateFoodOfferForm.jsp | 6 + .../WEB-INF/jsp/foodOffers/foodOffersShow.jsp | 13 +- .../WEB-INF/jsp/nuOffers/nuOffersShow.jsp | 4 +- .../jsp/speedOffers/speedOffersShow.jsp | 7 +- .../createOrUpdateTimeOfferForm.jsp | 3 + .../WEB-INF/jsp/timeOffers/timeOffersShow.jsp | 12 +- 15 files changed, 320 insertions(+), 201 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java index 4c119fe2c..384f9b36b 100644 --- a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java +++ b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java @@ -36,7 +36,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers(HttpMethod.GET, "/", "/oups").permitAll() .antMatchers("/users/new").permitAll() - .antMatchers("/nuOffers/**").hasAnyAuthority("admin","client") + .antMatchers("/nuOffers/**").hasAnyAuthority("admin","cliente") .antMatchers("/timeOffers/**").hasAnyAuthority("admin","client") .antMatchers("/login/**").anonymous() @@ -49,7 +49,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers("/owners/**").hasAnyAuthority("owner", "admin") .antMatchers("/clients/new").permitAll() - .antMatchers("/offers/**").hasAnyAuthority("admin") + .antMatchers("/offers/**").hasAnyAuthority("admin", "cliente") .and().formLogin() .loginPage("/login").permitAll() diff --git a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java index 764b35184..1e04f6f3a 100644 --- a/src/main/java/org/springframework/cheapy/repository/ClientRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/ClientRepository.java @@ -10,5 +10,5 @@ public interface ClientRepository extends CrudRepository { @Query("SELECT client FROM Client client WHERE username =:username") @Transactional(readOnly = true) Client findByUsername(String username); - + } diff --git a/src/main/java/org/springframework/cheapy/service/NuOfferService.java b/src/main/java/org/springframework/cheapy/service/NuOfferService.java index f2a174db9..d09255d64 100644 --- a/src/main/java/org/springframework/cheapy/service/NuOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/NuOfferService.java @@ -4,7 +4,6 @@ package org.springframework.cheapy.service; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cheapy.model.NuOffer; import org.springframework.cheapy.repository.NuOfferRepository; -import java.util.Collection; import java.util.List; import org.springframework.dao.DataAccessException; import org.springframework.stereotype.Service; @@ -15,7 +14,6 @@ public class NuOfferService { private NuOfferRepository nuOfferRepository; - @Autowired public NuOfferService(final NuOfferRepository nuOfferRepository) { this.nuOfferRepository = nuOfferRepository; @@ -27,12 +25,12 @@ public class NuOfferService { } @Transactional - public List findAllNuOffer() { // + public List findAllNuOffer() { return this.nuOfferRepository.findAllNuOffer(); } @Transactional - public void saveNuOffer(final NuOffer nuOffer) throws DataAccessException { // + public void saveNuOffer(final NuOffer nuOffer) throws DataAccessException { this.nuOfferRepository.save(nuOffer); } } diff --git a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java index 36d62b1ab..121874247 100644 --- a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java @@ -1,7 +1,6 @@ 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; diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index af191c66d..f70930878 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -11,9 +11,7 @@ import org.springframework.cheapy.service.FoodOfferService; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -25,15 +23,20 @@ public class FoodOfferController { private final FoodOfferService foodOfferService; private final ClientService clientService; - public FoodOfferController(final FoodOfferService foodOfferService, final ClientService clientService) { this.foodOfferService = foodOfferService; this.clientService = clientService; } - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); + private boolean checkIdentity(final int foodOfferId) { + boolean res = false; + Client client = this.clientService.getCurrentClient(); + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + Client clientOffer = foodOffer.getClient(); + if (client.equals(clientOffer)) { + res = true; + } + return res; } @GetMapping("/foodOffers/new") @@ -47,8 +50,7 @@ public class FoodOfferController { public String processCreationForm(@Valid FoodOffer foodOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; - } - else { + } else { Client client = this.clientService.getCurrentClient(); foodOffer.setClient(client); foodOffer.setType(StatusOffer.hidden); @@ -56,28 +58,88 @@ public class FoodOfferController { return "redirect:/foodOffers/" + foodOffer.getId(); } } - + @GetMapping(value = "/foodOffers/{foodOfferId}/activate") public String activateFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, ModelMap modelMap) { FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); Client client = this.clientService.getCurrentClient(); - if(foodOffer.getClient().equals(client)) { + if (foodOffer.getClient().equals(client)) { foodOffer.setType(StatusOffer.active); - foodOffer.setCode("FO-"+foodOfferId); + foodOffer.setCode("FO-" + foodOfferId); this.foodOfferService.saveFoodOffer(foodOffer); } else { modelMap.addAttribute("message", "You don't have access to this food offer"); } return "redirect:/foodOffers/"; } + @GetMapping("/offers/food/{foodOfferId}") public String processShowForm(@PathVariable("foodOfferId") int foodOfferId, Map model) { - FoodOffer foodOffer=this.foodOfferService.findFoodOfferById(foodOfferId); - + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + model.put("foodOffer", foodOffer); - + return "foodOffers/foodOffersShow"; } + + @GetMapping(value = "/offers/food/{foodOfferId}/edit") + public String updateFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, final ModelMap model) { + + if (!this.checkIdentity(foodOfferId)) { + return "error"; + } + + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + model.addAttribute("foodOffer", foodOffer); + return FoodOfferController.VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/food/{foodOfferId}/edit") + public String updateFoodOffer(@Valid final FoodOffer foodOfferEdit, final BindingResult result, + final ModelMap model) { + + if (!this.checkIdentity(foodOfferEdit.getId())) { + return "error"; + } + + if (result.hasErrors()) { + model.addAttribute("foodOffer", foodOfferEdit); + return FoodOfferController.VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + this.foodOfferService.saveFoodOffer(foodOfferEdit); + return "redirect:/offers/food/" + foodOfferEdit.getId(); + } + } + + @GetMapping(value = "/offers/food/{foodOfferId}/disable") + public String disableFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, final ModelMap model) { + + if (!this.checkIdentity(foodOfferId)) { + return "error"; + } + + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + model.put("foodOffer", foodOffer); + return "foodOffers/foodOffersDisable"; + } + + @PostMapping(value = "/offers/food/{foodOfferId}/disable") + public String disableFoodOfferForm(@PathVariable("foodOfferId") final int foodOfferId, final ModelMap model) { + + if (!this.checkIdentity(foodOfferId)) { + return "error"; + } + + FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); + + foodOffer.setType(StatusOffer.inactive); + + this.foodOfferService.saveFoodOffer(foodOffer); + + return "redirect:/offers"; + + } } diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index ca0c88f19..30a9af776 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -5,57 +5,42 @@ import java.util.Map; import javax.validation.Valid; -import org.springframework.beans.BeanUtils; -import org.springframework.cheapy.model.FoodOffer; import org.springframework.cheapy.model.NuOffer; -import org.springframework.cheapy.model.Owner; -import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; -import org.springframework.cheapy.service.FoodOfferService; import org.springframework.cheapy.model.Client; -import org.springframework.cheapy.model.NuOffer; -import org.springframework.cheapy.model.StatusOffer; import org.springframework.cheapy.service.ClientService; - import org.springframework.cheapy.service.NuOfferService; import org.springframework.stereotype.Controller; -import org.springframework.ui.Model; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; - @Controller public class NuOfferController { - private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "nuOffers/createOrUpdateNuOfferForm"; + private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "nuOffers/createOrUpdateNuOfferForm"; - private final FoodOfferService foodOfferService; - private final NuOfferService nuOfferService; - private final SpeedOfferService speedOfferService; - private final TimeOfferService timeOfferService; + private final NuOfferService nuOfferService; + private final ClientService clientService; - - public NuOfferController(final FoodOfferService foodOfferService, final NuOfferService nuOfferService, final SpeedOfferService speedOfferService, final TimeOfferService timeOfferService) { - this.foodOfferService = foodOfferService; + public NuOfferController(final NuOfferService nuOfferService, final ClientService clientService) { this.nuOfferService = nuOfferService; this.clientService = clientService; - + } - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); + private boolean checkIdentity(final int nuOfferId) { + boolean res = false; + Client client = this.clientService.getCurrentClient(); + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + Client clientOffer = nuOffer.getClient(); + if (client.equals(clientOffer)) { + res = true; + } + return res; } @GetMapping("/nuOffers/new") @@ -69,48 +54,49 @@ public class NuOfferController { public String processCreationForm(@Valid NuOffer nuOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; - } - else { + } else { nuOffer.setType(StatusOffer.hidden); - + Client client = this.clientService.getCurrentClient(); - + nuOffer.setClient(client); - - + this.nuOfferService.saveNuOffer(nuOffer); return "redirect:/nuOffers/" + nuOffer.getId(); } } - @GetMapping(value ="/nuOffers/{nuOfferId}/activate") + + @GetMapping(value = "/nuOffers/{nuOfferId}/activate") public String activateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final ModelMap modelMap) { Client client = this.clientService.getCurrentClient(); - NuOffer nuOffer=this.nuOfferService.findNuOfferById(nuOfferId); - if(nuOffer.getClient().equals(client)) { + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + if (nuOffer.getClient().equals(client)) { nuOffer.setType(StatusOffer.active); - nuOffer.setCode("NU-"+nuOfferId); + nuOffer.setCode("NU-" + nuOfferId); this.nuOfferService.saveNuOffer(nuOffer); - - return "redirect:/nuOffers/" + nuOffer.getId(); + + return "redirect:/nuOffers/" + nuOffer.getId(); } else { - modelMap.addAttribute("message", "You don't have access to this number offer"); - } - return "redirect:/nuOffers/"; - + modelMap.addAttribute("message", "You don't have access to this number offer"); + } + return "redirect:/nuOffers/"; } - - @GetMapping("/offers/nu/{nuOfferId}") + + @GetMapping("/offers/nu/{nuOfferId}") public String processShowForm(@PathVariable("nuOfferId") int nuOfferId, Map model) { - - model.put("nuOffer", nuOffer); + NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); + model.put("nuOffer", nuOffer); return "nuOffers/nuOffersShow"; } - @GetMapping(value = "/offers/nu/{nuOfferId}/edit") - public String updateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { + public String updateNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final ModelMap model) { + + if (!this.checkIdentity(nuOfferId)) { + return "error"; + } NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); model.addAttribute("nuOffer", nuOffer); @@ -118,7 +104,11 @@ public class NuOfferController { } @PostMapping(value = "/offers/nu/{nuOfferId}/edit") - public String updateNuOffer(@Valid final NuOffer nuOfferEdit, final BindingResult result, final Principal principal, final ModelMap model) { + public String updateNuOffer(@Valid final NuOffer nuOfferEdit, final BindingResult result, final ModelMap model) { + + if (!this.checkIdentity(nuOfferEdit.getId())) { + return "error"; + } if (result.hasErrors()) { model.addAttribute("nuOffer", nuOfferEdit); @@ -129,20 +119,14 @@ public class NuOfferController { return "redirect:/offers/nu/" + nuOfferEdit.getId(); } } - - @GetMapping(value = "/offers/nu/{nuOfferId}/disable") - public String disableNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { - // if (!this.comprobarIdentidad(principal, vehiculoId)) { - // return "exception"; - // } - // - // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { - // model.addAttribute("x", true); - // - // } else { - // model.addAttribute("x", false); - // } + @GetMapping(value = "/offers/nu/{nuOfferId}/disable") + public String disableNuOffer(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, + final ModelMap model) { + + if (!this.checkIdentity(nuOfferId)) { + return "error"; + } NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); model.put("nuOffer", nuOffer); @@ -150,23 +134,17 @@ public class NuOfferController { } @PostMapping(value = "/offers/nu/{nuOfferId}/disable") - public String disableNuOfferForm(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, final ModelMap model) { + public String disableNuOfferForm(@PathVariable("nuOfferId") final int nuOfferId, final Principal principal, + final ModelMap model) { + + if (!this.checkIdentity(nuOfferId)) { + return "error"; + } - // if (!this.comprobarIdentidad(principal, vehiculoId)) { - // return "exception"; - // } - // - // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { - // return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; - // - // } else { NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); - nuOffer.setType(StatusOffer.inactive); - this.nuOfferService.saveNuOffer(nuOffer); - - return "redirect:"; + return "redirect:/offers"; } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index 2d80b14d2..08684e333 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -1,26 +1,18 @@ package org.springframework.cheapy.web; - -import java.security.Principal; import java.util.Map; import javax.validation.Valid; import org.springframework.cheapy.model.SpeedOffer; import org.springframework.cheapy.model.StatusOffer; -import org.springframework.cheapy.service.FoodOfferService; -import org.springframework.cheapy.service.NuOfferService; import org.springframework.cheapy.model.Client; -import org.springframework.cheapy.model.SpeedOffer; -import org.springframework.cheapy.model.StatusOffer; import org.springframework.cheapy.service.ClientService; import org.springframework.cheapy.service.SpeedOfferService; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; @@ -36,10 +28,16 @@ public class SpeedOfferController { this.speedOfferService = speedOfferService; this.clientService = clientService; } - - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); + + private boolean checkIdentity(final int speedOfferId) { + boolean res = false; + Client client = this.clientService.getCurrentClient(); + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); + Client clientOffer = speedOffer.getClient(); + if (client.equals(clientOffer)) { + res = true; + } + return res; } @GetMapping("/speedOffers/new") @@ -53,8 +51,7 @@ public class SpeedOfferController { public String processCreationForm(@Valid SpeedOffer speedOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; - } - else { + } else { Client client = this.clientService.getCurrentClient(); speedOffer.setClient(client); speedOffer.setType(StatusOffer.hidden); @@ -62,31 +59,35 @@ public class SpeedOfferController { return "redirect:/speedOffers/" + speedOffer.getId(); } } - + @GetMapping(value = "/speedOffers/{speedOfferId}/activate") public String activateSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, ModelMap modelMap) { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); Client client = this.clientService.getCurrentClient(); - if(speedOffer.getClient().equals(client)) { + if (speedOffer.getClient().equals(client)) { speedOffer.setType(StatusOffer.active); - speedOffer.setCode("SP-"+speedOfferId); + speedOffer.setCode("SP-" + speedOfferId); this.speedOfferService.saveSpeedOffer(speedOffer); } else { modelMap.addAttribute("message", "You don't have access to this speed offer"); } return "redirect:/speedOffers/"; } - - @GetMapping("/offers/speed/{speedOfferId}") + + @GetMapping("/offers/speed/{speedOfferId}") public String processShowForm(@PathVariable("speedOfferId") int speedOfferId, Map model) { - SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); + SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); model.put("speedOffer", speedOffer); return "speedOffers/speedOffersShow"; } @GetMapping(value = "/offers/speed/{speedOfferId}/edit") - public String updateNuOffer(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { + public String updateSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final ModelMap model) { + + if (!this.checkIdentity(speedOfferId)) { + return "error"; + } SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); model.addAttribute("speedOffer", speedOffer); @@ -94,7 +95,11 @@ public class SpeedOfferController { } @PostMapping(value = "/offers/speed/{speedOfferId}/edit") - public String updateNuOffer(@Valid final SpeedOffer speedOfferEdit, final BindingResult result, final Principal principal, final ModelMap model) { + public String updateSpeedOffer(@Valid final SpeedOffer speedOfferEdit, final BindingResult result, final ModelMap model) { + + if (!this.checkIdentity(speedOfferEdit.getId())) { + return "error"; + } if (result.hasErrors()) { model.addAttribute("speedOffer", speedOfferEdit); @@ -108,18 +113,11 @@ public class SpeedOfferController { } @GetMapping(value = "/offers/speed/{speedOfferId}/disable") - public String disableSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { - - // if (!this.comprobarIdentidad(principal, vehiculoId)) { - // return "exception"; - // } - // - // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { - // model.addAttribute("x", true); - // - // } else { - // model.addAttribute("x", false); - // } + public String disableSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, final ModelMap model) { + + if (!this.checkIdentity(speedOfferId)) { + return "error"; + } SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); model.put("speedOffer", speedOffer); @@ -127,23 +125,19 @@ public class SpeedOfferController { } @PostMapping(value = "/offers/speed/{speedOfferId}/disable") - public String disableNuOfferForm(@PathVariable("speedOfferId") final int speedOfferId, final Principal principal, final ModelMap model) { + public String disableSpeedOfferForm(@PathVariable("speedOfferId") final int speedOfferId, final ModelMap model) { + + if (!this.checkIdentity(speedOfferId)) { + return "error"; + } - // if (!this.comprobarIdentidad(principal, vehiculoId)) { - // return "exception"; - // } - // - // if (this.tieneCitasAceptadasYPendientes(vehiculoId)) { - // return "redirect:/cliente/vehiculos/{vehiculoId}/disable"; - // - // } else { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); speedOffer.setType(StatusOffer.inactive); this.speedOfferService.saveSpeedOffer(speedOffer); - return "redirect:"; + return "redirect:/offers"; } } diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index b1bc2e528..6882c57c8 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -1,96 +1,155 @@ package org.springframework.cheapy.web; + import java.util.Map; + import javax.validation.Valid; import org.springframework.cheapy.model.Client; -import org.springframework.cheapy.model.TimeOffer; import org.springframework.cheapy.model.StatusOffer; +import org.springframework.cheapy.model.TimeOffer; import org.springframework.cheapy.service.ClientService; import org.springframework.cheapy.service.TimeOfferService; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.validation.BindingResult; -import org.springframework.web.bind.WebDataBinder; import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.InitBinder; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; - @Controller public class TimeOfferController { - private static final String VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM = "timeOffers/createOrUpdateTimeOfferForm"; + private static final String VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM = "timeOffers/createOrUpdateTimeOfferForm"; private final TimeOfferService timeOfferService; private final ClientService clientService; - - - public TimeOfferController(final TimeOfferService timeOfferService,ClientService clientService) { + public TimeOfferController(final TimeOfferService timeOfferService, ClientService clientService) { this.timeOfferService = timeOfferService; this.clientService = clientService; - - } - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); + } + + private boolean checkIdentity(final int timeOfferId) { + boolean res = false; + Client client = this.clientService.getCurrentClient(); + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + Client clientOffer = timeOffer.getClient(); + if (client.equals(clientOffer)) { + res = true; + } + return res; } @GetMapping("/timeOffers/new") public String initCreationForm(Map model) { TimeOffer timeOffer = new TimeOffer(); model.put("timeOffer", timeOffer); - return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; + return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } @PostMapping("/timeOffers/new") public String processCreationForm(@Valid TimeOffer timeOffer, BindingResult result) { if (result.hasErrors()) { - return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; - } - else { + return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; + } else { timeOffer.setType(StatusOffer.hidden); - + Client client = this.clientService.getCurrentClient(); - + timeOffer.setClient(client); - - + this.timeOfferService.saveTimeOffer(timeOffer); return "redirect:/TimeOffers/" + timeOffer.getId(); } } - @GetMapping(value ="/timeOffers/{timeOfferId}/activate") + + @GetMapping(value = "/timeOffers/{timeOfferId}/activate") public String activateTimeOffer(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap modelMap) { Client client = this.clientService.getCurrentClient(); - TimeOffer timeOffer=this.timeOfferService.findTimeOfferById(timeOfferId); - if(timeOffer.getClient().equals(client)) { + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + if (timeOffer.getClient().equals(client)) { timeOffer.setType(StatusOffer.active); - timeOffer.setCode("TI-"+timeOfferId); + timeOffer.setCode("TI-" + timeOfferId); this.timeOfferService.saveTimeOffer(timeOffer); - - return "redirect:/timeOffers/" + timeOffer.getId(); + + return "redirect:/timeOffers/" + timeOffer.getId(); } else { - modelMap.addAttribute("message", "You don't have access to this time offer"); - } - return "redirect:/timeOffers/"; - + modelMap.addAttribute("message", "You don't have access to this time offer"); + } + return "redirect:/timeOffers/"; } - - @GetMapping("/offers/time/{timeOfferId}") + + @GetMapping("/offers/time/{timeOfferId}") public String processShowForm(@PathVariable("timeOfferId") int timeOfferId, Map model) { - TimeOffer timeOffer=this.timeOfferService.findTimeOfferById(timeOfferId); - + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + model.put("timeOffer", timeOffer); - + return "timeOffers/timeOffersShow"; } - + + @GetMapping(value = "/offers/time/{timeOfferId}/edit") + public String updateTimeOffer(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap model) { + + if (!this.checkIdentity(timeOfferId)) { + return "error"; + } + + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + model.addAttribute("timeOffer", timeOffer); + return TimeOfferController.VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; + } + + @PostMapping(value = "/offers/time/{timeOfferId}/edit") + public String updateTimeOffer(@Valid final TimeOffer timeOfferEdit, final BindingResult result, final ModelMap model) { + + if (!this.checkIdentity(timeOfferEdit.getId())) { + return "error"; + } + + if (result.hasErrors()) { + model.addAttribute("timeOffer", timeOfferEdit); + return TimeOfferController.VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; + + } else { + this.timeOfferService.saveTimeOffer(timeOfferEdit); + return "redirect:/offers/time/" + timeOfferEdit.getId(); + } + + } + + @GetMapping(value = "/offers/time/{timeOfferId}/disable") + public String disableTimeOffer(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap model) { + + if (!this.checkIdentity(timeOfferId)) { + return "error"; + } + + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + model.put("timeOffer", timeOffer); + return "timeOffers/timeOffersDisable"; + } + + @PostMapping(value = "/offers/time/{timeOfferId}/disable") + public String disableTimeOfferForm(@PathVariable("timeOfferId") final int timeOfferId, final ModelMap model) { + + if (!this.checkIdentity(timeOfferId)) { + return "error"; + } + + TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); + + timeOffer.setType(StatusOffer.inactive); + + this.timeOfferService.saveTimeOffer(timeOffer); + + return "redirect:/offers"; + + } } diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index f0e3afa68..57beff1a4 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -9,17 +9,17 @@ 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 users (dtype,username,password,enabled) VALUES ('User','admin','admin', TRUE ); INSERT INTO authorities VALUES ('admin','admin'); -INSERT INTO users (dtype,username,password,enabled) VALUES ('user','manoli','manoli', TRUE ); +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 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 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 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 users (dtype,username,password,enabled) VALUES ('User','pepe','pepe', TRUE ); INSERT INTO authorities VALUES ('pepe','usuario'); INSERT INTO usuarios VALUES (1, 'admin', 'admin', 'admin', 'C/admin', '000000000', 'admin@gmail.com','admin'); @@ -27,11 +27,11 @@ INSERT INTO usuarios VALUES (2, 'Paco', 'Naranjo', '21154416G', 'C/Esperanza', ' 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 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 clients (id, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli'); +INSERT INTO clients (id, email, address, init, finish, telephone, description, code, food, username) VALUES (2,'david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david'); -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', 'FO-1', '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', 'T-1', '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', 'SP-1', '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', 'NU-1', 'active', null,15,'25%',10,'15%',5,'10%' ); +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', 'FO-1', 'active', 1, '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', 'T-1', 'active', 1, '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', 'SP-1', 'active', 1,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', 'NU-1', 'active', 1,15,'25%',10,'15%',5,'10%' ); diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp index ff6097fe2..a1b6d9c95 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp @@ -12,6 +12,9 @@
+ + + @@ -24,6 +27,9 @@ + + +
diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp index 0b7c8785a..6b6fcf130 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp @@ -6,7 +6,7 @@ -

Oferta por plato específico

+

Oferta por plato espec�fico

@@ -36,9 +36,14 @@
- <%-- - + + - Edit Owner --%> + Editar oferta + + + + + Desactivar oferta diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp index 6529c281b..0959918bd 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp @@ -49,13 +49,13 @@ - + Editar oferta - Desactiva oferta + Desactivar oferta diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp index ec071786d..c643afdf6 100644 --- a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp @@ -49,8 +49,13 @@ - + Editar oferta + + + + + Desactivar oferta diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp index 0dc37f439..efe5160c2 100644 --- a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp @@ -12,6 +12,9 @@
+ + + diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp index a344a6221..80d90e44a 100644 --- a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp @@ -6,7 +6,7 @@ -

Oferta por franja horária

+

Oferta por franja horaria

@@ -27,5 +27,15 @@
+ + + + + Editar oferta + + + + + Desactivar oferta From aef8ddf3029fa09173a8ab73577014585b5c03e3 Mon Sep 17 00:00:00 2001 From: Javier Date: Sat, 27 Mar 2021 20:45:16 +0100 Subject: [PATCH 07/13] Actualizacion de entidades --- .../springframework/cheapy/model/Client.java | 70 +++++++++++-------- .../cheapy/model/FoodOffer.java | 22 ++---- .../springframework/cheapy/model/NuOffer.java | 47 +++++++------ .../springframework/cheapy/model/Offer.java | 26 +++---- .../cheapy/model/SpeedOffer.java | 55 ++++++++------- .../cheapy/model/TimeOffer.java | 17 ++--- .../cheapy/web/FoodOfferController.java | 6 +- .../cheapy/web/NuOfferController.java | 6 +- .../cheapy/web/SpeedOfferController.java | 6 +- .../cheapy/web/TimeOfferController.java | 6 +- src/main/resources/db/mysql/data.sql | 12 ++-- .../createOrUpdateFoodOfferForm.jsp | 5 +- .../jsp/foodOffers/foodOffersDisable.jsp | 1 - .../WEB-INF/jsp/foodOffers/foodOffersShow.jsp | 4 -- .../nuOffers/createOrUpdateNuOfferForm.jsp | 2 +- .../createOrUpdateSpeedOfferForm.jsp | 2 +- .../createOrUpdateTimeOfferForm.jsp | 2 +- 17 files changed, 137 insertions(+), 152 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/model/Client.java b/src/main/java/org/springframework/cheapy/model/Client.java index 210e3ed70..23fa89b80 100644 --- a/src/main/java/org/springframework/cheapy/model/Client.java +++ b/src/main/java/org/springframework/cheapy/model/Client.java @@ -14,27 +14,29 @@ import javax.validation.constraints.NotEmpty; @Entity @Table(name = "clients") -public class Client extends BaseEntity{ - /** - * - */ +public class Client extends BaseEntity { + private static final long serialVersionUID = 1L; - // (id, email, address, init, finish, telephone, description, code, food, usuar) + // (id, name, email, address, init, finish, telephone, description, code, food, + // usuar) + + @NotEmpty + private String name; @NotEmpty private String email; - + @NotEmpty private String address; - //@DateTimeFormat(pattern = "HH:mm") - @NotBlank - private String init; + // Hora de apertura del local + @NotBlank + private String init; - //@DateTimeFormat(pattern = "HH:mm") - @NotBlank - private String finish; + // Hora de cierre del local + @NotBlank + private String finish; @NotEmpty @Digits(fraction = 0, integer = 10) @@ -43,38 +45,45 @@ public class Client extends BaseEntity{ @NotEmpty private String description; + // Codigo de activacion de cuenta @NotEmpty private String code; @NotEmpty private String food; - + @OneToOne(cascade = CascadeType.ALL) @JoinColumn(name = "username", referencedColumnName = "username") private User usuar; - + @OneToMany private Set foodOffers; - + @OneToMany private Set nuOffers; - + @OneToMany private Set speedOffers; - + @OneToMany private Set timeOffers; - - - + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + public String getEmail() { return email; } - + public void setEmail(String email) { this.email = email; } - + public String getAddress() { return address; } @@ -83,7 +92,6 @@ public class Client extends BaseEntity{ this.address = address; } - public String getInit() { return init; } @@ -100,14 +108,6 @@ public class Client extends BaseEntity{ this.finish = finish; } - public User getUsername() { - return usuar; - } - - public void setUsername(User username) { - this.usuar = username; - } - public String getTelephone() { return telephone; } @@ -140,6 +140,14 @@ public class Client extends BaseEntity{ this.food = food; } + public User getUsuar() { + return usuar; + } + + public void setUsuar(User usuar) { + this.usuar = usuar; + } + public Set getFoodOffers() { return foodOffers; } diff --git a/src/main/java/org/springframework/cheapy/model/FoodOffer.java b/src/main/java/org/springframework/cheapy/model/FoodOffer.java index 59419f1d1..3cb6a1e56 100644 --- a/src/main/java/org/springframework/cheapy/model/FoodOffer.java +++ b/src/main/java/org/springframework/cheapy/model/FoodOffer.java @@ -17,6 +17,7 @@ package org.springframework.cheapy.model; import javax.persistence.Entity; import javax.persistence.Table; +import javax.validation.constraints.Min; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @@ -24,20 +25,15 @@ import javax.validation.constraints.NotNull; @Table(name = "food_offers") public class FoodOffer extends Offer { - /** - * - */ private static final long serialVersionUID = 1L; //Plato específico @NotBlank private String food; - @NotBlank - private String discount; - @NotNull - private Integer units; // revisar + @Min(0) + private Integer discount; public String getFood() { return food; @@ -47,20 +43,12 @@ public class FoodOffer extends Offer { this.food = food; } - public String getDiscount() { + public Integer getDiscount() { return discount; } - public void setDiscount(String discount) { + public void setDiscount(Integer discount) { this.discount = discount; } - public Integer getUnits() { - return units; - } - - public void setUnits(Integer units) { - this.units = units; - } - } \ No newline at end of file diff --git a/src/main/java/org/springframework/cheapy/model/NuOffer.java b/src/main/java/org/springframework/cheapy/model/NuOffer.java index 6b2e6d8e2..6f250737d 100644 --- a/src/main/java/org/springframework/cheapy/model/NuOffer.java +++ b/src/main/java/org/springframework/cheapy/model/NuOffer.java @@ -4,7 +4,6 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Entity @@ -19,71 +18,73 @@ public class NuOffer extends Offer { private Integer gold; @Column(name = "discount_gold") - @NotBlank - private String discountGold; + @NotNull + @Min(0) + private Integer discountGold; @NotNull @Min(1) private Integer silver; @Column(name = "discount_silver") - @NotBlank - private String discountSilver; + @NotNull + @Min(0) + private Integer discountSilver; @NotNull @Min(1) private Integer bronze; @Column(name = "discount_bronze") - @NotBlank - private String discountBronze; - + @NotNull + @Min(0) + private Integer discountBronze; public Integer getGold() { - return this.gold; + return gold; } - public void setGold(final Integer gold) { + public void setGold(Integer gold) { this.gold = gold; } - public String getDiscountGold() { - return this.discountGold; + public Integer getDiscountGold() { + return discountGold; } - public void setDiscountGold(final String discountGold) { + public void setDiscountGold(Integer discountGold) { this.discountGold = discountGold; } public Integer getSilver() { - return this.silver; + return silver; } - public void setSilver(final Integer silver) { + public void setSilver(Integer silver) { this.silver = silver; } - public String getDiscountSilver() { - return this.discountSilver; + public Integer getDiscountSilver() { + return discountSilver; } - public void setDiscountSilver(final String discountSilver) { + public void setDiscountSilver(Integer discountSilver) { this.discountSilver = discountSilver; } public Integer getBronze() { - return this.bronze; + return bronze; } - public void setBronze(final Integer bronze) { + public void setBronze(Integer bronze) { this.bronze = bronze; } - public String getDiscountBronze() { - return this.discountBronze; + public Integer getDiscountBronze() { + return discountBronze; } - public void setDiscountBronze(final String discountBronze) { + public void setDiscountBronze(Integer discountBronze) { this.discountBronze = discountBronze; } diff --git a/src/main/java/org/springframework/cheapy/model/Offer.java b/src/main/java/org/springframework/cheapy/model/Offer.java index c41ca9040..5ae64feba 100644 --- a/src/main/java/org/springframework/cheapy/model/Offer.java +++ b/src/main/java/org/springframework/cheapy/model/Offer.java @@ -29,13 +29,11 @@ import org.springframework.format.annotation.DateTimeFormat; @MappedSuperclass public class Offer extends BaseEntity { - - /** - * - */ + private static final long serialVersionUID = 1L; - //Clase padre + // Clase padre + @DateTimeFormat(pattern = "dd/MM/yyyy HH:mm") @NotNull @Future @@ -46,15 +44,13 @@ public class Offer extends BaseEntity { @Future private LocalDateTime end; - private String code; @Enumerated(value = EnumType.STRING) - private StatusOffer type; - - + private StatusOffer status; + @ManyToOne - @JoinColumn(name="client_id") + @JoinColumn(name = "client_id") private Client client; public LocalDateTime getStart() { @@ -81,14 +77,14 @@ public class Offer extends BaseEntity { this.code = code; } - public StatusOffer getType() { - return type; + public StatusOffer getStatus() { + return status; } - public void setType(StatusOffer type) { - this.type = type; + public void setStatus(StatusOffer type) { + this.status = type; } - + public Client getClient() { return client; } diff --git a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java index 7db7a366a..84b551829 100644 --- a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java +++ b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java @@ -4,86 +4,87 @@ import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.Table; import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Entity @Table(name = "speed_offers") public class SpeedOffer extends Offer { - //Ofertar por rapidez comiendo + // Ofertar por rapidez comiendo private static final long serialVersionUID = 1L; @NotNull @Min(0) - private Integer gold; // x minutos + private Integer gold; @Column(name = "discount_gold") - @NotBlank - private String discountGold; + @NotNull + @Min(0) + private Integer discountGold; @NotNull @Min(0) - private Integer silver; + private Integer silver; @Column(name = "discount_silver") - @NotBlank - private String discountSilver; + @NotNull + @Min(0) + private Integer discountSilver; @NotNull @Min(0) - private Integer bronze; + private Integer bronze; @Column(name = "discount_bronze") - @NotBlank - private String discountBronze; - + @NotNull + @Min(0) + private Integer discountBronze; public Integer getGold() { - return this.gold; + return gold; } - public void setGold(final Integer gold) { + public void setGold(Integer gold) { this.gold = gold; } - public String getDiscountGold() { - return this.discountGold; + public Integer getDiscountGold() { + return discountGold; } - public void setDiscountGold(final String discountGold) { + public void setDiscountGold(Integer discountGold) { this.discountGold = discountGold; } public Integer getSilver() { - return this.silver; + return silver; } - public void setSilver(final Integer silver) { + public void setSilver(Integer silver) { this.silver = silver; } - public String getDiscountSilver() { - return this.discountSilver; + public Integer getDiscountSilver() { + return discountSilver; } - public void setDiscountSilver(final String discountSilver) { + public void setDiscountSilver(Integer discountSilver) { this.discountSilver = discountSilver; } public Integer getBronze() { - return this.bronze; + return bronze; } - public void setBronze(final Integer bronze) { + public void setBronze(Integer bronze) { this.bronze = bronze; } - public String getDiscountBronze() { - return this.discountBronze; + public Integer getDiscountBronze() { + return discountBronze; } - public void setDiscountBronze(final String discountBronze) { + public void setDiscountBronze(Integer discountBronze) { this.discountBronze = discountBronze; } diff --git a/src/main/java/org/springframework/cheapy/model/TimeOffer.java b/src/main/java/org/springframework/cheapy/model/TimeOffer.java index d9833e0c8..44ae5e3d6 100644 --- a/src/main/java/org/springframework/cheapy/model/TimeOffer.java +++ b/src/main/java/org/springframework/cheapy/model/TimeOffer.java @@ -4,7 +4,6 @@ import java.time.LocalTime; import javax.persistence.Entity; import javax.persistence.Table; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import org.springframework.format.annotation.DateTimeFormat; @@ -12,13 +11,11 @@ import org.springframework.format.annotation.DateTimeFormat; @Entity @Table(name = "time_offers") public class TimeOffer extends Offer { - - /** - * - */ + private static final long serialVersionUID = 1L; - //Oferta por franja horaria + // Oferta por franja horaria + @DateTimeFormat(pattern = "HH:mm") @NotNull private LocalTime init; @@ -27,8 +24,8 @@ public class TimeOffer extends Offer { @NotNull private LocalTime finish; - @NotBlank - private String discount; + @NotNull + private Integer discount; public LocalTime getInit() { return init; @@ -46,11 +43,11 @@ public class TimeOffer extends Offer { this.finish = finish; } - public String getDiscount() { + public Integer getDiscount() { return discount; } - public void setDiscount(String discount) { + public void setDiscount(Integer discount) { this.discount = discount; } diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index f70930878..302b03dbb 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -53,7 +53,7 @@ public class FoodOfferController { } else { Client client = this.clientService.getCurrentClient(); foodOffer.setClient(client); - foodOffer.setType(StatusOffer.hidden); + foodOffer.setStatus(StatusOffer.hidden); this.foodOfferService.saveFoodOffer(foodOffer); return "redirect:/foodOffers/" + foodOffer.getId(); } @@ -64,7 +64,7 @@ public class FoodOfferController { FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); Client client = this.clientService.getCurrentClient(); if (foodOffer.getClient().equals(client)) { - foodOffer.setType(StatusOffer.active); + foodOffer.setStatus(StatusOffer.active); foodOffer.setCode("FO-" + foodOfferId); this.foodOfferService.saveFoodOffer(foodOffer); } else { @@ -135,7 +135,7 @@ public class FoodOfferController { FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); - foodOffer.setType(StatusOffer.inactive); + foodOffer.setStatus(StatusOffer.inactive); this.foodOfferService.saveFoodOffer(foodOffer); diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index 30a9af776..8c53a9a31 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java @@ -55,7 +55,7 @@ public class NuOfferController { if (result.hasErrors()) { return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM; } else { - nuOffer.setType(StatusOffer.hidden); + nuOffer.setStatus(StatusOffer.hidden); Client client = this.clientService.getCurrentClient(); @@ -71,7 +71,7 @@ public class NuOfferController { Client client = this.clientService.getCurrentClient(); NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); if (nuOffer.getClient().equals(client)) { - nuOffer.setType(StatusOffer.active); + nuOffer.setStatus(StatusOffer.active); nuOffer.setCode("NU-" + nuOfferId); this.nuOfferService.saveNuOffer(nuOffer); @@ -142,7 +142,7 @@ public class NuOfferController { } NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId); - nuOffer.setType(StatusOffer.inactive); + nuOffer.setStatus(StatusOffer.inactive); this.nuOfferService.saveNuOffer(nuOffer); return "redirect:/offers"; diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index 08684e333..e19be9272 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -54,7 +54,7 @@ public class SpeedOfferController { } else { Client client = this.clientService.getCurrentClient(); speedOffer.setClient(client); - speedOffer.setType(StatusOffer.hidden); + speedOffer.setStatus(StatusOffer.hidden); this.speedOfferService.saveSpeedOffer(speedOffer); return "redirect:/speedOffers/" + speedOffer.getId(); } @@ -65,7 +65,7 @@ public class SpeedOfferController { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); Client client = this.clientService.getCurrentClient(); if (speedOffer.getClient().equals(client)) { - speedOffer.setType(StatusOffer.active); + speedOffer.setStatus(StatusOffer.active); speedOffer.setCode("SP-" + speedOfferId); this.speedOfferService.saveSpeedOffer(speedOffer); } else { @@ -133,7 +133,7 @@ public class SpeedOfferController { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); - speedOffer.setType(StatusOffer.inactive); + speedOffer.setStatus(StatusOffer.inactive); this.speedOfferService.saveSpeedOffer(speedOffer); diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index 6882c57c8..49d3ad5dd 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -54,7 +54,7 @@ public class TimeOfferController { if (result.hasErrors()) { return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM; } else { - timeOffer.setType(StatusOffer.hidden); + timeOffer.setStatus(StatusOffer.hidden); Client client = this.clientService.getCurrentClient(); @@ -70,7 +70,7 @@ public class TimeOfferController { Client client = this.clientService.getCurrentClient(); TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); if (timeOffer.getClient().equals(client)) { - timeOffer.setType(StatusOffer.active); + timeOffer.setStatus(StatusOffer.active); timeOffer.setCode("TI-" + timeOfferId); this.timeOfferService.saveTimeOffer(timeOffer); @@ -144,7 +144,7 @@ public class TimeOfferController { TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId); - timeOffer.setType(StatusOffer.inactive); + timeOffer.setStatus(StatusOffer.inactive); this.timeOfferService.saveTimeOffer(timeOffer); diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 57beff1a4..ce81f2d0c 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -27,11 +27,11 @@ INSERT INTO usuarios VALUES (2, 'Paco', 'Naranjo', '21154416G', 'C/Esperanza', ' 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 clients (id, email, address, init, finish, telephone, description, code, food, username) VALUES (1,'manoli@gmail.com','C/Betis','10:00','22:00','608726190', 'description 1', 'code1', 'ESPAÑOLA','manoli'); -INSERT INTO clients (id, email, address, init, finish, telephone, description, code, food, username) VALUES (2,'david@gmail.com','C/Sevilla','09:30','22:00','608726190', 'description 2', 'code2', 'americana','david'); +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 food_offers(start, end, code, type, client_id, food, discount, units) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'FO-1', 'active', 1, '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', 'T-1', 'active', 1, '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', 'SP-1', 'active', 1,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', 'NU-1', 'active', 1,15,'25%',10,'15%',5,'10%' ); +INSERT INTO food_offers(start, end, code, status, client_id, food, discount) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'FO-1', 'active', 1, 'macarrones', 15); +INSERT INTO time_offers(start, end, code, status, client_id, init, finish, discount) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'T-1', 'active', 1, '12:00:00', '13:00:00', 10); +INSERT INTO speed_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'SP-1', 'active',1,5,25,10,15,15,10); +INSERT INTO nu_offers(start, end, code, status, client_id, gold, discount_gold, silver, discount_silver, bronze, discount_bronze) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'NU-1', 'active',1,15,25,10,15,5,10); diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp index a1b6d9c95..daeeec363 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp @@ -14,18 +14,17 @@
- + -
- + diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp index 6f14e9ba0..14a7519e0 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersDisable.jsp @@ -13,7 +13,6 @@ - diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp index 6b6fcf130..720046ded 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp @@ -26,10 +26,6 @@ Descuento - - Cantidad - - Codigo de la oferta diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp index 3392a11c5..904bbfffb 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp @@ -14,7 +14,7 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp index 245444234..3327373db 100644 --- a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp @@ -14,7 +14,7 @@
- + diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp index efe5160c2..e483ed81b 100644 --- a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp @@ -14,7 +14,7 @@
- + From 205c9d9a7191acfd602b1bdab8ef5d7272a3250a Mon Sep 17 00:00:00 2001 From: Thiloparn <48439369+Thiloparn@users.noreply.github.com> Date: Sat, 27 Mar 2021 21:39:13 +0100 Subject: [PATCH 08/13] Arreglos para user, cambio de urls y organizacion de jsp , y test de controladores de speed y food Offers --- pom.xml | 5 + .../configuration/SecurityConfiguration.java | 6 +- .../springframework/cheapy/model/Offer.java | 6 +- .../cheapy/model/SpeedOffer.java | 3 - .../springframework/cheapy/model/User.java | 5 - .../cheapy/web/FoodOfferController.java | 19 +-- .../cheapy/web/SpeedOfferController.java | 19 +-- src/main/resources/db/mysql/data.sql | 20 +-- .../food}/createOrUpdateFoodOfferForm.jsp | 0 .../food}/foodOffersShow.jsp | 0 .../nu}/createOrUpdateNuOfferForm.jsp | 0 .../{nuOffers => offers/nu}/nuOffersShow.jsp | 0 .../speed}/createOrUpdateSpeedOfferForm.jsp | 0 .../speed}/speedOffersShow.jsp | 0 .../time}/createOrUpdateTimeOfferForm.jsp | 0 .../time}/timeOffersShow.jsp | 0 .../cheapy/web/FoodOfferControllerTests.java | 137 ++++++++++++++++ .../cheapy/web/SpeedOfferControllerTests.java | 149 ++++++++++++++++++ 18 files changed, 319 insertions(+), 50 deletions(-) rename src/main/webapp/WEB-INF/jsp/{foodOffers => offers/food}/createOrUpdateFoodOfferForm.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{foodOffers => offers/food}/foodOffersShow.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{nuOffers => offers/nu}/createOrUpdateNuOfferForm.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{nuOffers => offers/nu}/nuOffersShow.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{speedOffers => offers/speed}/createOrUpdateSpeedOfferForm.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{speedOffers => offers/speed}/speedOffersShow.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{timeOffers => offers/time}/createOrUpdateTimeOfferForm.jsp (100%) rename src/main/webapp/WEB-INF/jsp/{timeOffers => offers/time}/timeOffersShow.jsp (100%) create mode 100644 src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java create mode 100644 src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java diff --git a/pom.xml b/pom.xml index 38e0cd40b..c0ab78aad 100644 --- a/pom.xml +++ b/pom.xml @@ -69,6 +69,11 @@ org.springframework.security spring-security-taglibs + + org.springframework.security + spring-security-test + test + org.springframework.boot spring-boot-starter-security diff --git a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java index 4c119fe2c..25a12bc0d 100644 --- a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java +++ b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java @@ -44,12 +44,12 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers("/usuarios/new").permitAll() .antMatchers("/admin/**").hasAnyAuthority("admin") - .antMatchers("/speedOffers/**").hasAnyAuthority("admin", "client") - .antMatchers("/foodOffers/**").hasAnyAuthority("admin", "client") .antMatchers("/owners/**").hasAnyAuthority("owner", "admin") .antMatchers("/clients/new").permitAll() - .antMatchers("/offers/**").hasAnyAuthority("admin") + .antMatchers("/offers/**/new").hasAnyAuthority("admin","client") + .antMatchers("/offers/**/activate").hasAnyAuthority("admin","client") + .antMatchers("/offers/**").permitAll() .and().formLogin() .loginPage("/login").permitAll() diff --git a/src/main/java/org/springframework/cheapy/model/Offer.java b/src/main/java/org/springframework/cheapy/model/Offer.java index c41ca9040..f5c92c10d 100644 --- a/src/main/java/org/springframework/cheapy/model/Offer.java +++ b/src/main/java/org/springframework/cheapy/model/Offer.java @@ -29,10 +29,7 @@ import org.springframework.format.annotation.DateTimeFormat; @MappedSuperclass public class Offer extends BaseEntity { - - /** - * - */ + private static final long serialVersionUID = 1L; //Clase padre @@ -46,7 +43,6 @@ public class Offer extends BaseEntity { @Future private LocalDateTime end; - private String code; @Enumerated(value = EnumType.STRING) diff --git a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java index 0ef65d7a2..021a89106 100644 --- a/src/main/java/org/springframework/cheapy/model/SpeedOffer.java +++ b/src/main/java/org/springframework/cheapy/model/SpeedOffer.java @@ -10,9 +10,6 @@ import javax.validation.constraints.NotNull; @Table(name = "speed_offers") public class SpeedOffer extends Offer { - /** - * - */ private static final long serialVersionUID = 1L; @NotNull diff --git a/src/main/java/org/springframework/cheapy/model/User.java b/src/main/java/org/springframework/cheapy/model/User.java index bd5b2dd30..e9c232562 100644 --- a/src/main/java/org/springframework/cheapy/model/User.java +++ b/src/main/java/org/springframework/cheapy/model/User.java @@ -7,7 +7,6 @@ import javax.validation.constraints.NotBlank; @Entity @Table(name = "users") -//@MappedSuperclass public class User{ @Id @@ -18,10 +17,6 @@ public class User{ boolean enabled; - - /** - * - */ private static final long serialVersionUID = 1L; diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index af191c66d..c41974569 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.PostMapping; @Controller public class FoodOfferController { - private static final String VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM = "foodOffers/createOrUpdateFoodOfferForm"; + private static final String VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM = "offers/food/createOrUpdateFoodOfferForm"; private final FoodOfferService foodOfferService; private final ClientService clientService; @@ -31,19 +31,14 @@ public class FoodOfferController { this.clientService = clientService; } - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @GetMapping("/foodOffers/new") + @GetMapping("/offers/food/new") public String initCreationForm(Map model) { FoodOffer foodOffer = new FoodOffer(); model.put("foodOffer", foodOffer); return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; } - @PostMapping("/foodOffers/new") + @PostMapping("/offers/food/new") public String processCreationForm(@Valid FoodOffer foodOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_FOOD_OFFER_CREATE_OR_UPDATE_FORM; @@ -53,11 +48,11 @@ public class FoodOfferController { foodOffer.setClient(client); foodOffer.setType(StatusOffer.hidden); this.foodOfferService.saveFoodOffer(foodOffer); - return "redirect:/foodOffers/" + foodOffer.getId(); + return "redirect:/offers/food/" + foodOffer.getId(); } } - @GetMapping(value = "/foodOffers/{foodOfferId}/activate") + @GetMapping(value = "/offers/food/{foodOfferId}/activate") public String activateFoodOffer(@PathVariable("foodOfferId") final int foodOfferId, ModelMap modelMap) { FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId); Client client = this.clientService.getCurrentClient(); @@ -68,7 +63,7 @@ public class FoodOfferController { } else { modelMap.addAttribute("message", "You don't have access to this food offer"); } - return "redirect:/foodOffers/"; + return "redirect:/offers/food/" + foodOffer.getId(); } @GetMapping("/offers/food/{foodOfferId}") public String processShowForm(@PathVariable("foodOfferId") int foodOfferId, Map model) { @@ -77,7 +72,7 @@ public class FoodOfferController { model.put("foodOffer", foodOffer); - return "foodOffers/foodOffersShow"; + return "offers/food/foodOffersShow"; } } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index f9678e4bc..7b9e071b8 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java @@ -37,7 +37,7 @@ import org.springframework.web.bind.annotation.PostMapping; @Controller public class SpeedOfferController { - private static final String VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM = "speedOffers/createOrUpdateSpeedOfferForm"; + private static final String VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM = "offers/speed/createOrUpdateSpeedOfferForm"; private final SpeedOfferService speedOfferService; private final ClientService clientService; @@ -47,19 +47,14 @@ public class SpeedOfferController { this.clientService = clientService; } - @InitBinder - public void setAllowedFields(WebDataBinder dataBinder) { - dataBinder.setDisallowedFields("id"); - } - - @GetMapping("/speedOffers/new") + @GetMapping("/offers/speed/new") public String initCreationForm(Map model) { SpeedOffer speedOffer = new SpeedOffer(); model.put("speedOffer", speedOffer); return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; } - @PostMapping("/speedOffers/new") + @PostMapping("/offers/speed/new") public String processCreationForm(@Valid SpeedOffer speedOffer, BindingResult result) { if (result.hasErrors()) { return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM; @@ -69,11 +64,11 @@ public class SpeedOfferController { speedOffer.setClient(client); speedOffer.setType(StatusOffer.hidden); this.speedOfferService.saveSpeedOffer(speedOffer); - return "redirect:/speedOffers/" + speedOffer.getId(); + return "redirect:/offers/speed/" + speedOffer.getId(); } } - @GetMapping(value = "/speedOffers/{speedOfferId}/activate") + @GetMapping(value = "/offers/speed/{speedOfferId}/activate") public String activateSpeedOffer(@PathVariable("speedOfferId") final int speedOfferId, ModelMap modelMap) { SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId); Client client = this.clientService.getCurrentClient(); @@ -84,7 +79,7 @@ public class SpeedOfferController { } else { modelMap.addAttribute("message", "You don't have access to this speed offer"); } - return "redirect:/speedOffers/"; + return "redirect:/offers/speed/" + speedOffer.getId(); } @GetMapping("/offers/speed/{speedOfferId}") @@ -92,6 +87,6 @@ public class SpeedOfferController { SpeedOffer speedOffer=this.speedOfferService.findSpeedOfferById(speedOfferId); model.put("speedOffer", speedOffer); - return "speedOffers/speedOffersShow"; + return "offers/speed/speedOffersShow"; } } diff --git a/src/main/resources/db/mysql/data.sql b/src/main/resources/db/mysql/data.sql index 30ae2672e..73fcd9849 100644 --- a/src/main/resources/db/mysql/data.sql +++ b/src/main/resources/db/mysql/data.sql @@ -9,17 +9,17 @@ 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 users (dtype,username,password,enabled) VALUES ('User','admin','admin', TRUE ); 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 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,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 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 users (dtype,username,password,enabled) VALUES ('User','pepe','pepe', TRUE ); INSERT INTO authorities VALUES ('pepe','usuario'); INSERT INTO usuarios VALUES (1, 'admin', 'admin', 'admin', 'C/admin', '000000000', 'admin@gmail.com','admin'); @@ -27,8 +27,8 @@ INSERT INTO usuarios VALUES (2, 'Paco', 'Naranjo', '21154416G', 'C/Esperanza', ' 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 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 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 food_offers(start, end, code, type, client_id, food, discount, units) VALUES ('2021-06-15 12:00:00', '2021-06-16 12:00:00', 'FO-1', 'active', null, 'macarrones', '15%', 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', 'SP-1', 'active', null, 5, '15%', 10, '10%', 15, '5%'); diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/foodOffers/createOrUpdateFoodOfferForm.jsp rename to src/main/webapp/WEB-INF/jsp/offers/food/createOrUpdateFoodOfferForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp rename to src/main/webapp/WEB-INF/jsp/offers/food/foodOffersShow.jsp diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/nuOffers/createOrUpdateNuOfferForm.jsp rename to src/main/webapp/WEB-INF/jsp/offers/nu/createOrUpdateNuOfferForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp rename to src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersShow.jsp diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/speedOffers/createOrUpdateSpeedOfferForm.jsp rename to src/main/webapp/WEB-INF/jsp/offers/speed/createOrUpdateSpeedOfferForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp rename to src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersShow.jsp diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/timeOffers/createOrUpdateTimeOfferForm.jsp rename to src/main/webapp/WEB-INF/jsp/offers/time/createOrUpdateTimeOfferForm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp rename to src/main/webapp/WEB-INF/jsp/offers/time/timeOffersShow.jsp diff --git a/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java new file mode 100644 index 000000000..c2e4a4348 --- /dev/null +++ b/src/test/java/org/springframework/cheapy/web/FoodOfferControllerTests.java @@ -0,0 +1,137 @@ +package org.springframework.cheapy.web; + +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; + +import java.time.LocalDateTime; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.BDDMockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.cheapy.configuration.SecurityConfiguration; +import org.springframework.cheapy.model.Client; +import org.springframework.cheapy.model.FoodOffer; +import org.springframework.cheapy.model.User; +import org.springframework.cheapy.service.ClientService; +import org.springframework.cheapy.service.FoodOfferService; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.security.config.annotation.web.WebSecurityConfigurer; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.web.servlet.MockMvc; + + + +@WebMvcTest(value = FoodOfferController.class, +excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = WebSecurityConfigurer.class), +excludeAutoConfiguration = SecurityConfiguration.class) +class FoodOfferControllerTest { + + private static final int TEST_CLIENT_ID = 1; + private static final int TEST_FOODOFFER_ID = 1; + + @Autowired + private MockMvc mockMvc; + + @MockBean + private FoodOfferService foodOfferService; + + @MockBean + private ClientService clientService; + + private FoodOffer fo1; + + @BeforeEach + void setup() { + User user1 = new User(); + user1.setUsername("user1"); + user1.setPassword("user1"); + Client client1 = new Client(); + client1.setId(TEST_CLIENT_ID); + client1.setEmail("client1"); + client1.setAddress("client1"); + client1.setInit("01:00"); + client1.setFinish("01:01"); + client1.setTelephone("123456789"); + client1.setDescription("client1"); + client1.setCode("client1"); + client1.setFood("client1"); + client1.setUsername(user1); + BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1); + + FoodOffer fo1test = new FoodOffer(); + fo1test.setId(TEST_FOODOFFER_ID); + fo1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30)); + fo1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30)); + fo1test.setFood("fo1test"); + fo1test.setDiscount("fo1test"); + fo1test.setUnits(1); + fo1test.setClient(client1); + this.fo1 = fo1test; + BDDMockito.given(this.foodOfferService.findFoodOfferById(TEST_FOODOFFER_ID)).willReturn(this.fo1); + + } + + @WithMockUser(value = "spring", authorities = "client") + @Test + void testInitCreationForm() throws Exception { + mockMvc.perform(get("/offers/food/new")) + .andExpect(status().isOk()) + .andExpect(model().attributeExists("foodOffer")) + .andExpect(view().name("offers/food/createOrUpdateFoodOfferForm")); + } + + @WithMockUser(value = "spring", authorities = "client") + @Test + void testProcessCreationFormSuccess() throws Exception { + mockMvc.perform(post("/offers/food/new") + .with(csrf()) + .param("start", "23/12/2021 12:30") + .param("end", "23/12/2022 12:30") + .param("food", "food") + .param("discount", "10%") + .param("units", "1")) + .andExpect(status().is3xxRedirection()); + } + + @WithMockUser(value = "spring", authorities = "client") + @Test + void testProcessCreationFormHasErrors() throws Exception { + mockMvc.perform(post("/offers/food/new") + .with(csrf()) + .param("start", "lsqdufhlqhf") + .param("end", "") + .param("food", "") + .param("discount", "") + .param("units", "qsdfy")) + .andExpect(model().attributeHasErrors("foodOffer")) + .andExpect(model().attributeHasFieldErrors("foodOffer", "start")) + .andExpect(model().attributeHasFieldErrors("foodOffer", "end")) + .andExpect(model().attributeHasFieldErrors("foodOffer", "food")) + .andExpect(model().attributeHasFieldErrors("foodOffer", "discount")) + .andExpect(model().attributeHasFieldErrors("foodOffer", "units")) + .andExpect(view().name("offers/food/createOrUpdateFoodOfferForm")); + } + + @WithMockUser(value = "user1", authorities = "client") + @Test + void testActivateSuccess() throws Exception { + mockMvc.perform(get("/offers/food/{foodOfferId}/activate", TEST_FOODOFFER_ID)) + .andExpect(status().is3xxRedirection()) + .andExpect(view().name("redirect:/offers/food/"+TEST_FOODOFFER_ID)); + } + + @WithMockUser(value = "user1", authorities = "client") + @Test + void testActivateHasErrors() throws Exception { + mockMvc.perform(get("/offers/food/{foodOfferId}/activate", TEST_FOODOFFER_ID+1)) + .andExpect(view().name("exception")); + } +} \ No newline at end of file diff --git a/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java new file mode 100644 index 000000000..c20615d3d --- /dev/null +++ b/src/test/java/org/springframework/cheapy/web/SpeedOfferControllerTests.java @@ -0,0 +1,149 @@ +package org.springframework.cheapy.web; + +import static org.springframework.security.test.web.servlet.request.SecurityMockMvcRequestPostProcessors.csrf; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get; +import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.model; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status; +import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.view; + +import java.time.LocalDateTime; + +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; +import org.mockito.BDDMockito; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest; +import org.springframework.boot.test.mock.mockito.MockBean; +import org.springframework.cheapy.configuration.SecurityConfiguration; +import org.springframework.cheapy.model.Client; +import org.springframework.cheapy.model.SpeedOffer; +import org.springframework.cheapy.model.User; +import org.springframework.cheapy.service.ClientService; +import org.springframework.cheapy.service.SpeedOfferService; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.FilterType; +import org.springframework.security.config.annotation.web.WebSecurityConfigurer; +import org.springframework.security.test.context.support.WithMockUser; +import org.springframework.test.web.servlet.MockMvc; + + + +@WebMvcTest(value = SpeedOfferController.class, +excludeFilters = @ComponentScan.Filter(type = FilterType.ASSIGNABLE_TYPE, classes = WebSecurityConfigurer.class), +excludeAutoConfiguration = SecurityConfiguration.class) +class SpeedOfferControllerTest { + + private static final int TEST_CLIENT_ID = 1; + private static final int TEST_SPEEDOFFER_ID = 1; + + @Autowired + private MockMvc mockMvc; + + @MockBean + private SpeedOfferService speedOfferService; + + @MockBean + private ClientService clientService; + + private SpeedOffer sp1; + + @BeforeEach + void setup() { + User user1 = new User(); + user1.setUsername("user1"); + user1.setPassword("user1"); + Client client1 = new Client(); + client1.setId(TEST_CLIENT_ID); + client1.setEmail("client1"); + client1.setAddress("client1"); + client1.setInit("01:00"); + client1.setFinish("01:01"); + client1.setTelephone("123456789"); + client1.setDescription("client1"); + client1.setCode("client1"); + client1.setFood("client1"); + client1.setUsername(user1); + BDDMockito.given(this.clientService.getCurrentClient()).willReturn(client1); + + SpeedOffer sp1test = new SpeedOffer(); + sp1test.setId(TEST_SPEEDOFFER_ID); + sp1test.setStart(LocalDateTime.of(2021, 12, 23, 12, 30)); + sp1test.setEnd(LocalDateTime.of(2022, 12, 23, 12, 30)); + sp1test.setGold(5); + sp1test.setDiscountGold("15%"); + sp1test.setSilver(10); + sp1test.setDiscountGold("10%"); + sp1test.setGold(15); + sp1test.setDiscountGold("5%"); + sp1test.setClient(client1); + this.sp1 = sp1test; + BDDMockito.given(this.speedOfferService.findSpeedOfferById(TEST_SPEEDOFFER_ID)).willReturn(this.sp1); + + } + + @WithMockUser(value = "spring", authorities = "client") + @Test + void testInitCreationForm() throws Exception { + mockMvc.perform(get("/offers/speed/new")) + .andExpect(status().isOk()) + .andExpect(model().attributeExists("speedOffer")) + .andExpect(view().name("offers/speed/createOrUpdateSpeedOfferForm")); + } + + @WithMockUser(value = "spring", authorities = "client") + @Test + void testProcessCreationFormSuccess() throws Exception { + mockMvc.perform(post("/offers/speed/new") + .with(csrf()) + .param("start", "23/12/2021 12:30") + .param("end", "23/12/2022 12:30") + .param("gold", "5") + .param("discountGold", "15%") + .param("silver", "10") + .param("discountSilver", "10%") + .param("bronze", "15") + .param("discountBronze", "5%")) + .andExpect(status().is3xxRedirection()); + } + + @WithMockUser(value = "spring", authorities = "client") + @Test + void testProcessCreationFormHasErrors() throws Exception { + mockMvc.perform(post("/offers/speed/new") + .with(csrf()) + .param("start", "lsqdufhlqhf") + .param("end", "") + .param("gold", "gold") + .param("discountGold", "") + .param("silver", "") + .param("discountSilver", "") + .param("bronze", "") + .param("discountBronze", "")) + .andExpect(model().attributeHasErrors("speedOffer")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "start")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "end")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "gold")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "discountGold")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "silver")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "discountSilver")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "bronze")) + .andExpect(model().attributeHasFieldErrors("speedOffer", "discountBronze")) + .andExpect(view().name("offers/speed/createOrUpdateSpeedOfferForm")); + } + + @WithMockUser(value = "user1", authorities = "client") + @Test + void testActivateSuccess() throws Exception { + mockMvc.perform(get("/offers/speed/{speedOfferId}/activate", TEST_SPEEDOFFER_ID)) + .andExpect(status().is3xxRedirection()) + .andExpect(view().name("redirect:/offers/speed/"+TEST_SPEEDOFFER_ID)); + } + + @WithMockUser(value = "user1", authorities = "client") + @Test + void testActivateHasErrors() throws Exception { + mockMvc.perform(get("/offers/speed/{speedOfferId}/activate", TEST_SPEEDOFFER_ID+1)) + .andExpect(view().name("exception")); + } +} \ No newline at end of file From 702664f615415cad4a53287e2343dea26fe8ca05 Mon Sep 17 00:00:00 2001 From: David Date: Sat, 27 Mar 2021 23:15:30 +0100 Subject: [PATCH 09/13] =?UTF-8?q?Logout=20y=20algunos=20cambios=20m=C3=A1s?= =?UTF-8?q?=20de=20estilos?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cheapy/configuration/SecurityConfiguration.java | 2 +- src/main/webapp/WEB-INF/jsp/error.jsp | 2 +- .../WEB-INF/jsp/foodOffers/foodOffersShow.jsp | 12 +++++++----- .../webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp | 2 +- src/main/webapp/WEB-INF/jsp/offers/offersList.jsp | 8 ++++---- .../WEB-INF/jsp/speedOffers/speedOffersShow.jsp | 2 +- .../WEB-INF/jsp/timeOffers/timeOffersShow.jsp | 4 +++- src/main/webapp/WEB-INF/tags/menu.tag | 13 +++++++------ 8 files changed, 25 insertions(+), 20 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java index 4c119fe2c..11751b513 100644 --- a/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java +++ b/src/main/java/org/springframework/cheapy/configuration/SecurityConfiguration.java @@ -49,7 +49,7 @@ public class SecurityConfiguration extends WebSecurityConfigurerAdapter { .antMatchers("/owners/**").hasAnyAuthority("owner", "admin") .antMatchers("/clients/new").permitAll() - .antMatchers("/offers/**").hasAnyAuthority("admin") + .antMatchers("/offers/**").permitAll() .and().formLogin() .loginPage("/login").permitAll() diff --git a/src/main/webapp/WEB-INF/jsp/error.jsp b/src/main/webapp/WEB-INF/jsp/error.jsp index 3534ac497..a1fcc6296 100644 --- a/src/main/webapp/WEB-INF/jsp/error.jsp +++ b/src/main/webapp/WEB-INF/jsp/error.jsp @@ -5,7 +5,7 @@ -

Algo malo ha pasado...

+

Algo malo ha pasado...

diff --git a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp index f307756d5..69398036d 100644 --- a/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/foodOffers/foodOffersShow.jsp @@ -1,17 +1,18 @@ <%@ 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" %> <%@ 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" %> -

+

- +
+ @@ -36,6 +37,7 @@ +
diff --git a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp index 301184bb3..aa78bbb8d 100644 --- a/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/nuOffers/nuOffersShow.jsp @@ -8,7 +8,7 @@ -

+

diff --git a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp index d326a6b8a..30ee72a07 100644 --- a/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp +++ b/src/main/webapp/WEB-INF/jsp/offers/offersList.jsp @@ -7,7 +7,7 @@ -

+

@@ -47,7 +47,7 @@
-

+

@@ -83,7 +83,7 @@
-

+

@@ -120,7 +120,7 @@
-

+

diff --git a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp index d479bb213..f027ec342 100644 --- a/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/speedOffers/speedOffersShow.jsp @@ -8,7 +8,7 @@ -

+

diff --git a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp index da696276d..be88e4e22 100644 --- a/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp +++ b/src/main/webapp/WEB-INF/jsp/timeOffers/timeOffersShow.jsp @@ -8,10 +8,11 @@ -

+

+ @@ -28,6 +29,7 @@ +
diff --git a/src/main/webapp/WEB-INF/tags/menu.tag b/src/main/webapp/WEB-INF/tags/menu.tag index d402d3729..daa63faa2 100644 --- a/src/main/webapp/WEB-INF/tags/menu.tag +++ b/src/main/webapp/WEB-INF/tags/menu.tag @@ -34,12 +34,13 @@ Ver ofertas + @@ -48,7 +49,7 @@