From 1c89f07d0e4be575362e7d651799410d565c2a2b Mon Sep 17 00:00:00 2001
From: abemorcardc <abemorcar@alum.us.es>
Date: Sat, 3 Apr 2021 12:41:20 +0200
Subject: [PATCH 1/2] Corregido test, y eliminados campos de form que no hacian
 falta

---
 .../webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp   | 2 --
 src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp  | 6 ------
 .../webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp | 7 -------
 .../webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp   | 3 ---
 .../springframework/cheapy/web/NuOfferControllerTests.java | 4 ++--
 5 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
index e7c0d50e5..45861d2c3 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/food/foodOffersDisable.jsp
@@ -13,8 +13,6 @@
       		
       		<form:form modelAttribute="foodOffer" class="form-horizontal">
             
-	            <input type="hidden" name="food" value="${foodOffer.food}" />
-	            <input type="hidden" name="discount" value="${foodOffer.discount}" />
 				<div class="btns-edit">
         			<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
         			<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
index 4da1c4c8f..f46b57f67 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/nu/nuOffersDisable.jsp
@@ -12,12 +12,6 @@
         <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		 <form:form modelAttribute="nuOffer" class="form-horizontal">
-	            <input type="hidden" name="gold" value="${nuOffer.gold}" />
-	            <input type="hidden" name="discountGold" value="${nuOffer.discountGold}" />
-	            <input type="hidden" name="silver" value="${nuOffer.silver}" />
-	            <input type="hidden" name="discountSilver" value="${nuOffer.discountSilver}" />
-	            <input type="hidden" name="bronze" value="${nuOffer.bronze}" />
-	            <input type="hidden" name="discountBronze" value="${nuOffer.discountBronze}" />
 
         		<div class="btns-edit">
         			<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
diff --git a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
index 5b532e3f1..66c5a0f07 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/speed/speedOffersDisable.jsp
@@ -13,13 +13,6 @@
       		
       		 <form:form modelAttribute="speedOffer" class="form-horizontal">
 
-	            <input type="hidden" name="gold" value="${speedOffer.gold}" />
-	            <input type="hidden" name="discountGold" value="${speedOffer.discountGold}" />
-	            <input type="hidden" name="silver" value="${speedOffer.silver}" />
-	            <input type="hidden" name="discountSilver" value="${speedOffer.discountSilver}" />
-	            <input type="hidden" name="bronze" value="${speedOffer.bronze}" />
-	            <input type="hidden" name="discountBronze" value="${speedOffer.discountBronze}" />
-
         		<div class="btns-edit">
         			<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
         			<span class="glyphicon glyphicon glyphicon-trash" aria-hidden="true" style="padding: 5px"> </span>
diff --git a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
index 224184eb6..b19346a70 100644
--- a/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
+++ b/src/main/webapp/WEB-INF/jsp/offers/time/timeOffersDisable.jsp
@@ -12,9 +12,6 @@
         <h2 class="text-center" style="font-family: 'Lobster'; font-size: 30px; color: rgb(0, 64, 128); padding:30px"><em>¿Está seguro de que quiere eliminar su oferta?</em></h2>
       		
       		<form:form modelAttribute="timeOffer" class="form-horizontal">
-	            <input type="hidden" name="init" value="${timeOffer.init}" />
-	            <input type="hidden" name="finish" value="${timeOffer.finish}" />
-	            <input type="hidden" name="discount" value="${timeOffer.discount}" />
 
         		<div class="btns-edit">
         			<button type="submit" style="font-family: 'Lobster'; font-size: 20px;">
diff --git a/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java b/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java
index 7b0b80f77..31ec0d75b 100644
--- a/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java
+++ b/src/test/java/org/springframework/cheapy/web/NuOfferControllerTests.java
@@ -97,11 +97,11 @@ class NuOfferControllerTest {
 				.with(SecurityMockMvcRequestPostProcessors.csrf())
 				.param("start", "23/12/2021 12:30")
 				.param("end", "23/12/2022 12:30")
-				.param("gold", "5")
+				.param("gold", "15")
 				.param("discountGold", "15")
 				.param("silver", "10")
 				.param("discountSilver", "10")
-				.param("bronze", "15")
+				.param("bronze", "5")
 				.param("discountBronze", "5"))
 				.andExpect(status().is3xxRedirection());
 	}

From b65f329f311fdc8bd9d3f108c060b3518250bf27 Mon Sep 17 00:00:00 2001
From: abemorcardc <abemorcar@alum.us.es>
Date: Sat, 3 Apr 2021 13:03:02 +0200
Subject: [PATCH 2/2] Corregido los controladores de las ofertas para aplicar
 las validaciones

---
 .../org/springframework/cheapy/web/NuOfferController.java   | 6 +++---
 .../springframework/cheapy/web/SpeedOfferController.java    | 6 +++---
 .../org/springframework/cheapy/web/TimeOfferController.java | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java
index 7c8826521..fa2c9e28e 100644
--- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java
+++ b/src/main/java/org/springframework/cheapy/web/NuOfferController.java
@@ -174,15 +174,15 @@ public class NuOfferController {
 			return NuOfferController.VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
 
 		} else {
-			if(!this.checkDates(nuOffer)) {
+			if(!this.checkDates(nuOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
 			}
-			if(!this.checkConditions(nuOffer)) {
+			if(!this.checkConditions(nuOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
 			}
-			if(!this.checkDiscounts(nuOffer)) {
+			if(!this.checkDiscounts(nuOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_NU_OFFER_CREATE_OR_UPDATE_FORM;
 			}
diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java
index 5b7e5aada..a6ec32949 100644
--- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java
+++ b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java
@@ -167,15 +167,15 @@ public class SpeedOfferController {
 			return SpeedOfferController.VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
 
 		} else {
-			if(!this.checkDates(speedOffer)) {
+			if(!this.checkDates(speedOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
 			}
-			if(!this.checkConditions(speedOffer)) {
+			if(!this.checkConditions(speedOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
 			}
-			if(!this.checkDiscounts(speedOffer)) {
+			if(!this.checkDiscounts(speedOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_SPEED_OFFER_CREATE_OR_UPDATE_FORM;
 			}
diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java
index 5b58bed76..780854600 100644
--- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java
+++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java
@@ -165,11 +165,11 @@ public class TimeOfferController {
 			return TimeOfferController.VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
 
 		} else {
-			if(!this.checkDates(timeOffer)) {
+			if(!this.checkDates(timeOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
 			}
-			if(!this.checkTimes(timeOffer)) {
+			if(!this.checkTimes(timeOfferEdit)) {
 				//Poner aqui mensaje de error
 				return VIEWS_TIME_OFFER_CREATE_OR_UPDATE_FORM;
 			}