Changeset 8d391a1 for trip-planner

Timestamp:

11/26/21 20:07:18 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

1ad8e64

Parents:

e29cc2e

Message:

disabling to add location if it already exists in the planner

Location:

trip-planner/src

Files:

• main/java/finki/diplomska/tripplanner/repository/jpa/JpaLocationRepository.java (modified) (1 diff)
• main/java/finki/diplomska/tripplanner/service/LocationService.java (modified) (2 diffs)
• main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java (modified) (1 diff)
• main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java (modified) (2 diffs)
• test/api.http (modified) (1 diff)

trip-planner/src/main/java/finki/diplomska/tripplanner/repository/jpa/JpaLocationRepository.java

@@ -84 +84 @@
     List<Location> getAllLocationsForPlanner(@Param("plannerId") Long plannerId);
 
+
+    @Query(value = "SELECT l.id_location " +
+            "FROM locations AS l " +
+            "WHERE l.id_location IN " +
+            "(SELECT pl.id_location FROM planners_contain AS pl WHERE pl.id_planner = :plannerId)", nativeQuery = true)
+    List<Long> getAllLocationIdsForPlanner(@Param("plannerId") Long plannerId);
+
     @Query(value = "SELECT *, if(l.id_city is NOT NULL, c.city_name, l.location_name) as result " +
             "FROM locations AS l " +

trip-planner/src/main/java/finki/diplomska/tripplanner/service/LocationService.java

@@ -5 +5 @@
 import finki.diplomska.tripplanner.models.Planner;
 import finki.diplomska.tripplanner.models.dto.PlannerLocationDto;
+import org.springframework.data.repository.query.Param;
 
 import java.util.List;
@@ -23 +24 @@
     List<Location> getWeekendGetaways();
     List<Location> getVillages();
+    List<Long> getAllLocationIdsForPlanner(Long plannerId);
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/service/impl/LocationServiceImpl.java

@@ -179 +179 @@
     }
 
+    @Override
+    public List<Long> getAllLocationIdsForPlanner(Long plannerId) {
+        return this.locationRepository.getAllLocationIdsForPlanner(plannerId);
+    }
+
 
 }

trip-planner/src/main/java/finki/diplomska/tripplanner/web/rest/LocationRestController.java

@@ -5 +5 @@
 import finki.diplomska.tripplanner.service.LocationService;
 import finki.diplomska.tripplanner.service.PlannerService;
+import org.springframework.data.repository.query.Param;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -71 +72 @@
         return this.locationService.getVillages();
     }
+
+    @GetMapping(value = "/planner/locationIds")
+    public List<Long> getAllLocationIdsForPlanner(@RequestParam Long plannerId){
+        return this.locationService.getAllLocationIdsForPlanner(plannerId);
+    }
 }

trip-planner/src/test/api.http

@@ -61 +61 @@
 
 ###
+GET http://localhost:8080/api/planner/locationIds?plannerId=2
+Content-Type: application/x-www-form-urlencoded
+
+###
 GET http://localhost:8080/api/weekend
 Content-Type: application/x-www-form-urlencoded