Merge pull request #56 from cheapy-ispp/008-verOfertasActivas

008 ver ofertas activas

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

@@ -28,4 +28,8 @@ public interface FoodOfferRepository extends Repository<FoodOffer, Integer> {
 	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.id =:id")
 	@Transactional(readOnly = true)
 	List<FoodOffer> findByUserId(@Param("id") Integer id);
+	
+	@Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.id =:id AND foodOffer.status!= 'inactive'")
+	@Transactional(readOnly = true)
+	List<FoodOffer> findFoodOfferActOclByUserId(@Param("id") Integer id);
 }

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

@@ -27,4 +27,8 @@ public interface NuOfferRepository extends Repository<NuOffer, Integer> {
 	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.id =:id")
 	@Transactional(readOnly = true)
 	List<NuOffer> findByUserId(@Param("id") Integer id);
+	
+	@Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.id =:id AND nuOffer.status!= 'inactive'")
+	@Transactional(readOnly = true)
+	List<NuOffer> findNuOfferActOclByUserId(@Param("id") Integer id);
 }

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

@@ -29,4 +29,8 @@ public interface SpeedOfferRepository extends Repository<SpeedOffer, Integer> {
 	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.id =:id")
 	@Transactional(readOnly = true)
 	List<SpeedOffer> findByUserId(@Param("id") Integer id);
+	
+	@Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.id =:id AND speedOffer.status!= 'inactive'")
+	@Transactional(readOnly = true)
+	List<SpeedOffer> findSpeedOfferActOclByUserId(@Param("id") Integer id);
 }

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

@@ -26,4 +26,8 @@ public interface TimeOfferRepository extends Repository<TimeOffer, Integer> {
 	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.id =:id")
 	@Transactional(readOnly = true)
 	List<TimeOffer> findByUserId(@Param("id") Integer id);
+	
+	@Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.id =:id AND timeOffer.status!= 'inactive'")
+	@Transactional(readOnly = true)
+	List<TimeOffer> findTimeOfferActOclByUserId(@Param("id") Integer id);
 }

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

@@ -37,4 +37,8 @@ public class FoodOfferService {
 	public List<FoodOffer> findFoodOfferByUserId(final int id) {
 		return this.foodOfferRepository.findByUserId(id);
 	}
+	
+	public List<FoodOffer> findFoodOfferActOclByUserId(final int id) {
+		return this.foodOfferRepository.findFoodOfferActOclByUserId(id);
+	}
 }

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

@@ -47,4 +47,8 @@ public class NuOfferService {
 	public List<NuOffer> findNuOfferByUserId(final int id) {
 		return this.nuOfferRepository.findByUserId(id);
 	}
+	
+	public List<NuOffer> findNuOfferActOclByUserId(final int id) {
+		return this.nuOfferRepository.findNuOfferActOclByUserId(id);
+	}
 }

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

@@ -44,4 +44,8 @@ public class SpeedOfferService {
 	public List<SpeedOffer> findSpeedOfferByUserId(final int id) {
 		return this.speedOfferRepository.findByUserId(id);
 	}
+	
+	public List<SpeedOffer> findSpeedOfferActOclByUserId(final int id) {
+		return this.speedOfferRepository.findSpeedOfferActOclByUserId(id);
+	}
 }

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

@@ -40,4 +40,8 @@ public class TimeOfferService {
 	public List<TimeOffer> findTimeOfferByUserId(final int id) {
 		return this.timeOfferRepository.findByUserId(id);
 	}
+	
+	public List<TimeOffer> findTimeOfferActOclByUserId(final int id) {
+		return this.timeOfferRepository.findTimeOfferActOclByUserId(id);
+	}
 }

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

@@ -104,13 +104,15 @@ public class FoodOfferController {
 	public String processShowForm(@PathVariable("foodOfferId") int foodOfferId, Map<String, Object> model) {
 
 		FoodOffer foodOffer = this.foodOfferService.findFoodOfferById(foodOfferId);
-
+		if(!foodOffer.getStatus().equals(StatusOffer.active)) {
+			return "error";
+		}else {
 		model.put("foodOffer", foodOffer);
 
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 
 		return "offers/food/foodOffersShow";
-
+		}
 	}
 
 	@GetMapping(value = "/offers/food/{foodOfferId}/edit")

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

@@ -133,10 +133,14 @@ public class NuOfferController {
 	@GetMapping("/offers/nu/{nuOfferId}")
 	public String processShowForm(@PathVariable("nuOfferId") int nuOfferId, Map<String, Object> model) {
 		NuOffer nuOffer = this.nuOfferService.findNuOfferById(nuOfferId);
+		if(!nuOffer.getStatus().equals(StatusOffer.active)) {
+			return "error";
+		}else {
 		model.put("nuOffer", nuOffer);
 
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 		return "offers/nu/nuOffersShow";
+		}
 
 	}
 

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

@@ -64,10 +64,10 @@ public class OfertaController {
 
 		int actual = this.clientService.getCurrentClient().getId();
 
-		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferByUserId(actual);
-		List<NuOffer> nuOfferLs = this.nuOfferService.findNuOfferByUserId(actual);
-		List<SpeedOffer> speedOfferLs = this.speedOfferService.findSpeedOfferByUserId(actual);
-		List<TimeOffer> timeOfferLs = this.timeOfferService.findTimeOfferByUserId(actual);
+		List<FoodOffer> foodOfferLs = this.foodOfferService.findFoodOfferActOclByUserId(actual);
+		List<NuOffer> nuOfferLs = this.nuOfferService.findNuOfferActOclByUserId(actual);
+		List<SpeedOffer> speedOfferLs = this.speedOfferService.findSpeedOfferActOclByUserId(actual);
+		List<TimeOffer> timeOfferLs = this.timeOfferService.findTimeOfferActOclByUserId(actual);
 
 		model.put("foodOfferLs", foodOfferLs);
 		model.put("nuOfferLs", nuOfferLs);

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

@@ -125,12 +125,15 @@ public class SpeedOfferController {
 
 	@GetMapping("/offers/speed/{speedOfferId}")
 	public String processShowForm(@PathVariable("speedOfferId") int speedOfferId, Map<String, Object> model) {
-
 		SpeedOffer speedOffer = this.speedOfferService.findSpeedOfferById(speedOfferId);
+		if(!speedOffer.getStatus().equals(StatusOffer.active)) {
+			return "error";
+		}else {
 		model.put("speedOffer", speedOffer);
 
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 		return "offers/speed/speedOffersShow";
+		}
 	}
 
 	@GetMapping(value = "/offers/speed/{speedOfferId}/edit")

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

@@ -121,12 +121,15 @@ public class TimeOfferController {
 	public String processShowForm(@PathVariable("timeOfferId") int timeOfferId, Map<String, Object> model) {
 
 		TimeOffer timeOffer = this.timeOfferService.findTimeOfferById(timeOfferId);
-
+		if(!timeOffer.getStatus().equals(StatusOffer.active)) {
+			return "error";
+		}else {
 		model.put("timeOffer", timeOffer);
 
 		model.put("localDateTimeFormat", DateTimeFormatter.ofPattern("dd/MM/yyyy HH:mm"));
 
 		return "offers/time/timeOffersShow";
+		}
 
 	}