From e2f4234913efd5babc1f0783746eb3e21bc7d374 Mon Sep 17 00:00:00 2001 From: Abraham Date: Sat, 3 Apr 2021 12:39:04 +0200 Subject: [PATCH 1/2] listar mis ofertas cambiar la llamada al repositorio solo pillar las activas y ocultas --- .../cheapy/repository/FoodOfferRepository.java | 4 ++++ .../cheapy/repository/NuOfferRepository.java | 4 ++++ .../cheapy/repository/SpeedOfferRepository.java | 4 ++++ .../cheapy/repository/TimeOfferRepository.java | 4 ++++ .../springframework/cheapy/service/FoodOfferService.java | 4 ++++ .../springframework/cheapy/service/NuOfferService.java | 4 ++++ .../springframework/cheapy/service/SpeedOfferService.java | 4 ++++ .../springframework/cheapy/service/TimeOfferService.java | 4 ++++ .../org/springframework/cheapy/web/OfertaController.java | 8 ++++---- 9 files changed, 36 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java index 2e9ca093b..099f6788c 100644 --- a/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/FoodOfferRepository.java @@ -28,4 +28,8 @@ public interface FoodOfferRepository extends Repository { @Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.id =:id") @Transactional(readOnly = true) List findByUserId(@Param("id") Integer id); + + @Query("SELECT foodOffer FROM FoodOffer foodOffer WHERE foodOffer.client.id =:id AND foodOffer.status!= 'inactive'") + @Transactional(readOnly = true) + List findFoodOfferActOclByUserId(@Param("id") Integer id); } diff --git a/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java index 8e59df4dc..d895c5916 100644 --- a/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/NuOfferRepository.java @@ -27,4 +27,8 @@ public interface NuOfferRepository extends Repository { @Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.id =:id") @Transactional(readOnly = true) List findByUserId(@Param("id") Integer id); + + @Query("SELECT nuOffer FROM NuOffer nuOffer WHERE nuOffer.client.id =:id AND nuOffer.status!= 'inactive'") + @Transactional(readOnly = true) + List findNuOfferActOclByUserId(@Param("id") Integer id); } diff --git a/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java index e4df0426c..4c7465368 100644 --- a/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/SpeedOfferRepository.java @@ -29,4 +29,8 @@ public interface SpeedOfferRepository extends Repository { @Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.id =:id") @Transactional(readOnly = true) List findByUserId(@Param("id") Integer id); + + @Query("SELECT speedOffer FROM SpeedOffer speedOffer WHERE speedOffer.client.id =:id AND speedOffer.status!= 'inactive'") + @Transactional(readOnly = true) + List findSpeedOfferActOclByUserId(@Param("id") Integer id); } diff --git a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java index 1cd4c5e34..d891e0953 100644 --- a/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java +++ b/src/main/java/org/springframework/cheapy/repository/TimeOfferRepository.java @@ -26,4 +26,8 @@ public interface TimeOfferRepository extends Repository { @Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.id =:id") @Transactional(readOnly = true) List findByUserId(@Param("id") Integer id); + + @Query("SELECT timeOffer FROM TimeOffer timeOffer WHERE timeOffer.client.id =:id AND timeOffer.status!= 'inactive'") + @Transactional(readOnly = true) + List findTimeOfferActOclByUserId(@Param("id") Integer id); } diff --git a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java index c11c9e8a6..a555e5c6c 100644 --- a/src/main/java/org/springframework/cheapy/service/FoodOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/FoodOfferService.java @@ -37,4 +37,8 @@ public class FoodOfferService { public List findFoodOfferByUserId(final int id) { return this.foodOfferRepository.findByUserId(id); } + + public List findFoodOfferActOclByUserId(final int id) { + return this.foodOfferRepository.findFoodOfferActOclByUserId(id); + } } diff --git a/src/main/java/org/springframework/cheapy/service/NuOfferService.java b/src/main/java/org/springframework/cheapy/service/NuOfferService.java index 5268ac2db..7bbb48aaa 100644 --- a/src/main/java/org/springframework/cheapy/service/NuOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/NuOfferService.java @@ -47,4 +47,8 @@ public class NuOfferService { public List findNuOfferByUserId(final int id) { return this.nuOfferRepository.findByUserId(id); } + + public List findNuOfferActOclByUserId(final int id) { + return this.nuOfferRepository.findNuOfferActOclByUserId(id); + } } diff --git a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java index 6063b7426..384ec046c 100644 --- a/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/SpeedOfferService.java @@ -44,4 +44,8 @@ public class SpeedOfferService { public List findSpeedOfferByUserId(final int id) { return this.speedOfferRepository.findByUserId(id); } + + public List findSpeedOfferActOclByUserId(final int id) { + return this.speedOfferRepository.findSpeedOfferActOclByUserId(id); + } } diff --git a/src/main/java/org/springframework/cheapy/service/TimeOfferService.java b/src/main/java/org/springframework/cheapy/service/TimeOfferService.java index e23fa5151..154fb9bc8 100644 --- a/src/main/java/org/springframework/cheapy/service/TimeOfferService.java +++ b/src/main/java/org/springframework/cheapy/service/TimeOfferService.java @@ -40,4 +40,8 @@ public class TimeOfferService { public List findTimeOfferByUserId(final int id) { return this.timeOfferRepository.findByUserId(id); } + + public List findTimeOfferActOclByUserId(final int id) { + return this.timeOfferRepository.findTimeOfferActOclByUserId(id); + } } diff --git a/src/main/java/org/springframework/cheapy/web/OfertaController.java b/src/main/java/org/springframework/cheapy/web/OfertaController.java index 2ae80261c..60567c491 100644 --- a/src/main/java/org/springframework/cheapy/web/OfertaController.java +++ b/src/main/java/org/springframework/cheapy/web/OfertaController.java @@ -64,10 +64,10 @@ public class OfertaController { int actual = this.clientService.getCurrentClient().getId(); - List foodOfferLs = this.foodOfferService.findFoodOfferByUserId(actual); - List nuOfferLs = this.nuOfferService.findNuOfferByUserId(actual); - List speedOfferLs = this.speedOfferService.findSpeedOfferByUserId(actual); - List timeOfferLs = this.timeOfferService.findTimeOfferByUserId(actual); + List foodOfferLs = this.foodOfferService.findFoodOfferActOclByUserId(actual); + List nuOfferLs = this.nuOfferService.findNuOfferActOclByUserId(actual); + List speedOfferLs = this.speedOfferService.findSpeedOfferActOclByUserId(actual); + List timeOfferLs = this.timeOfferService.findTimeOfferActOclByUserId(actual); model.put("foodOfferLs", foodOfferLs); model.put("nuOfferLs", nuOfferLs); From e88a9926819390f565f08cc58f450bf244c38ef5 Mon Sep 17 00:00:00 2001 From: Abraham Date: Sat, 3 Apr 2021 13:07:51 +0200 Subject: [PATCH 2/2] poner seguridad en los show --- .../org/springframework/cheapy/web/FoodOfferController.java | 6 ++++-- .../org/springframework/cheapy/web/NuOfferController.java | 4 ++++ .../springframework/cheapy/web/SpeedOfferController.java | 5 ++++- .../org/springframework/cheapy/web/TimeOfferController.java | 5 ++++- 4 files changed, 16 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java index 3cd695532..99bc97f66 100644 --- a/src/main/java/org/springframework/cheapy/web/FoodOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/FoodOfferController.java @@ -104,13 +104,15 @@ public class FoodOfferController { public String processShowForm(@PathVariable("foodOfferId") int foodOfferId, Map 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") diff --git a/src/main/java/org/springframework/cheapy/web/NuOfferController.java b/src/main/java/org/springframework/cheapy/web/NuOfferController.java index 7c8826521..47e92d255 100644 --- a/src/main/java/org/springframework/cheapy/web/NuOfferController.java +++ b/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 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"; + } } diff --git a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java b/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java index 5b7e5aada..270e475aa 100644 --- a/src/main/java/org/springframework/cheapy/web/SpeedOfferController.java +++ b/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 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") diff --git a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java index 5b58bed76..2a19b98d7 100644 --- a/src/main/java/org/springframework/cheapy/web/TimeOfferController.java +++ b/src/main/java/org/springframework/cheapy/web/TimeOfferController.java @@ -121,12 +121,15 @@ public class TimeOfferController { public String processShowForm(@PathVariable("timeOfferId") int timeOfferId, Map 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"; + } }