From ad6ec2e2c4236e7258a8386d6ae3a67bca4ce893 Mon Sep 17 00:00:00 2001 From: grata Date: Sat, 6 May 2023 10:55:56 +0200 Subject: [PATCH] added method @GetMapping("/{user}/{id}") --- .../controller/WaypointVisitedController.java | 12 +++++++----- .../progetto152/services/WaypointVisitedService.java | 12 ++++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/src/main/java/ch/progetto152/controller/WaypointVisitedController.java b/src/main/java/ch/progetto152/controller/WaypointVisitedController.java index 1696ec8..79ef12a 100644 --- a/src/main/java/ch/progetto152/controller/WaypointVisitedController.java +++ b/src/main/java/ch/progetto152/controller/WaypointVisitedController.java @@ -38,12 +38,14 @@ public class WaypointVisitedController { } @GetMapping("/{user}/{id}") - public ResponseEntity getWaypointVisitedByWaypointIdAndUserId(@PathVariable("user") Long user, @PathVariable("id") Long id) { - Boolean waypointVisited = waypointVisitedService.getWaypointsVisitedByWaypointIdAndUserId(id, user); - if (waypointVisited != null) { - return new ResponseEntity<>(waypointVisited, HttpStatus.OK); - } else { + public ResponseEntity getWaypointVisitedByWaypointIdAndUserId(@PathVariable("user") Long userId, @PathVariable("id") Long waypointId) { + Boolean waypointVisited = waypointVisitedService.getWaypointsVisitedByWaypointIdAndUserId(waypointId, userId); + if (waypointVisited == null) { return new ResponseEntity<>(HttpStatus.NOT_FOUND); + } else if (!waypointVisited) { + return new ResponseEntity<>(false, HttpStatus.NOT_FOUND); + } else { + return new ResponseEntity<>(true, HttpStatus.OK); } } diff --git a/src/main/java/ch/progetto152/services/WaypointVisitedService.java b/src/main/java/ch/progetto152/services/WaypointVisitedService.java index bb3e7dc..ba03c33 100644 --- a/src/main/java/ch/progetto152/services/WaypointVisitedService.java +++ b/src/main/java/ch/progetto152/services/WaypointVisitedService.java @@ -35,10 +35,6 @@ public class WaypointVisitedService { return waypointVisitedRepository.findWaypointsVisitedEntitiesByWaypointId(id).orElse(null); } - public WaypointsVisitedEntity getWaypointsVisitedByUserIdAndWaypointId(Long userId, Long waypointId) { - return waypointVisitedRepository.findWaypointsVisitedEntitiesByUserIdAndWaypointId(userId, waypointId).orElse(null); - } - public WaypointsVisitedEntity createWaypoint(WaypointsVisitedEntity waypoint) { if (errorChecking.checkWaypointVisited(waypoint)) { return waypointVisitedRepository.save(waypoint); @@ -67,4 +63,12 @@ public class WaypointVisitedService { } + public Boolean getWaypointsVisitedByWaypointIdAndUserId(Long waypointId, Long userId) { + WaypointsVisitedEntity waypointsVisited = waypointVisitedRepository.findWaypointsVisitedEntitiesByUserIdAndWaypointId(userId, waypointId).orElse(null); + if (waypointsVisited != null) { + return true; + } else { + return false; + } + } }