From f3f1103a709114a378e57091a17d47f09e8441a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Joe=20Ku=CC=88ng?= <joekueng05@gmail.com>
Date: Sat, 6 May 2023 10:43:49 +0200
Subject: [PATCH] changes

---
 .idea/vcs.xml                                        |  1 +
 .../controller/WaypointVisitedController.java        | 12 ++++++++++++
 .../repository/WaypointVisitedRepository.java        |  1 +
 .../progetto152/services/WaypointVisitedService.java |  6 ++++++
 4 files changed, 20 insertions(+)

diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 35eb1dd..8306744 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,5 +2,6 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/ch/progetto152/controller/WaypointVisitedController.java b/src/main/java/ch/progetto152/controller/WaypointVisitedController.java
index 56e362f..1696ec8 100644
--- a/src/main/java/ch/progetto152/controller/WaypointVisitedController.java
+++ b/src/main/java/ch/progetto152/controller/WaypointVisitedController.java
@@ -25,6 +25,8 @@ public class WaypointVisitedController {
         return new ResponseEntity<>(waypointVisited, HttpStatus.OK);
     }
 
+
+
     @GetMapping("/{id}")
     public ResponseEntity<WaypointsVisitedEntity> getWaypointVisitedByWaypointId(@PathVariable("id") Long id) {
         WaypointsVisitedEntity waypointVisited = waypointVisitedService.getWaypointsVisitedByWaypointId(id);
@@ -35,6 +37,16 @@ public class WaypointVisitedController {
         }
     }
 
+    @GetMapping("/{user}/{id}")
+    public ResponseEntity<Boolean> 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 {
+            return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        }
+    }
+
     @GetMapping("/user/{id}")
     public ResponseEntity<WaypointsVisitedEntity> getWaypointVisitedByUserId(@PathVariable("id") Long id) {
         WaypointsVisitedEntity waypointVisited = waypointVisitedService.getWaypointsVisitedByUserId(id);
diff --git a/src/main/java/ch/progetto152/repository/WaypointVisitedRepository.java b/src/main/java/ch/progetto152/repository/WaypointVisitedRepository.java
index 9f61413..4e7f115 100644
--- a/src/main/java/ch/progetto152/repository/WaypointVisitedRepository.java
+++ b/src/main/java/ch/progetto152/repository/WaypointVisitedRepository.java
@@ -8,4 +8,5 @@ import java.util.Optional;
 public interface WaypointVisitedRepository extends JpaRepository<WaypointsVisitedEntity, Long> {
     Optional<WaypointsVisitedEntity> findWaypointsVisitedEntitiesByUserId(Long id);
     Optional<WaypointsVisitedEntity> findWaypointsVisitedEntitiesByWaypointId(Long id);
+    Optional<WaypointsVisitedEntity> findWaypointsVisitedEntitiesByUserIdAndWaypointId(Long userId, Long waypointId);
 }
diff --git a/src/main/java/ch/progetto152/services/WaypointVisitedService.java b/src/main/java/ch/progetto152/services/WaypointVisitedService.java
index 0f5aced..bb3e7dc 100644
--- a/src/main/java/ch/progetto152/services/WaypointVisitedService.java
+++ b/src/main/java/ch/progetto152/services/WaypointVisitedService.java
@@ -35,6 +35,10 @@ 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);
@@ -61,4 +65,6 @@ public class WaypointVisitedService {
         waypointVisitedRepository.deleteById(id);
         return true;
     }
+
+
 }