Changeset eed0bf8 for trip-planner/src/main

Timestamp:

10/18/21 00:19:16 (3 years ago)

Author:

Ema <ema_spirova@…>

Branches:

master

Children:

188ee53

Parents:

fa375fe

Message:

editing location-form on frontend and backend

Location:

trip-planner/src/main/java/finki/diplomska/tripplanner

Files:

• repository/jpa/JpaLocationRepository.java (modified) (1 diff)
• service/LocationService.java (modified) (1 diff)
• service/impl/LocationServiceImpl.java (modified) (2 diffs)
• web/rest/LocationRestController.java (modified) (1 diff)

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

@@ -44 +44 @@
             "GROUP BY l.id_location ORDER BY CASE l.priority WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END", nativeQuery = true)
     List<Location> findLocationsFromCountry(@Param("locName") String ime, @Param("companion") String companion, @Param("region") String region, @Param("categories") List<String> categories);
+
+    @Query(value = "SELECT  * FROM locations AS l  " +
+            "LEFT JOIN recommended_companion AS rc ON l.id_location = rc.id_location " +
+            "LEFT JOIN companions AS com ON rc.id_companion = com.id_companion " +
+            "LEFT JOIN locations_belong lb ON l.id_location = lb.id_location " +
+            "LEFT JOIN categories AS cate ON lb.id_category = cate.id_category " +
+            "LEFT JOIN regions AS r" +
+            " ON l.id_region = r.id_region" +
+            " LEFT JOIN cities AS cit" +
+            " ON r.id_region = cit.id_region AND cit.id_city = l.id_city " +
+            "WHERE cit.id_city = :locationId and com.id_companion = :companionId and cate.id_category in (:categories) " +
+            "GROUP BY l.id_location " +
+            "ORDER BY CASE l.priority WHEN 'high' THEN 1 WHEN 'medium' THEN 2 WHEN 'low' THEN 3 END", nativeQuery = true)
+    List<Location> findLocationsFromForm(@Param("locationId") Long locationId, @Param("companionId") Long companionId, @Param("categories") List<Long> categories);
 }

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

@@ -15 +15 @@
     List<Location> scheduleLocations(String locName, String companion,String region, List<String> categories, int numberOfDays);
     Optional<Location> findById(Long id);
+
+    List<Location> findLocations(Long locationId, Long companionId, Long lengthOfStay, String categoryIds);
 }

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

@@ -8 +8 @@
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 
@@ -46 +47 @@
     public Optional<Location> findById(Long id) {
         return this.locationRepository.findById(id);
+    }
+
+    @Override
+    public List<Location> findLocations(Long locationId, Long companionId, Long lengthOfStay, String categoryIds) {
+        List<Long> categories = null;
+        if(categoryIds != null && !categoryIds.isEmpty()){
+            List<String> ids = Arrays.asList(categoryIds.split(","));
+            categories = ids.stream().map(Long::valueOf).collect(Collectors.toList());
+        }
+        List<Location> foundLocations = locationRepository.findLocationsFromForm(locationId, companionId, categories);
+        return foundLocations;
     }
 

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

@@ -34 +34 @@
     }
 
-    @PostMapping(value = "/trip/locations")
-    public List<Location> allLocationsAfterSubmittedForm(@RequestParam(required = false) String locName,
-                                                         @RequestParam(required = false)  String companion,
-                                                         @RequestParam(required = false) String region,
-                                                         @RequestParam(required = false) List<String> categories,
-                                                         @RequestParam(required = false)  int numberOfDays)  {
-        List<Location> generatedLocations = this.locationService.scheduleLocations(locName, companion, region, categories, numberOfDays);
+    @GetMapping(value = "/trip/locations")
+    public List<Location> allLocationsAfterSubmittedForm(@RequestParam(required = false) Long locationId,
+                                                         @RequestParam(required = false)  Long companionId,
+                                                         @RequestParam(required = false) Long lengthOfStay,
+                                                         @RequestParam(required = false) String categoryIds)  {
+        return this.locationService.findLocations(locationId, companionId, lengthOfStay, categoryIds);
+        /* List<Location> generatedLocations = this.locationService.scheduleLocations(locName, companion, region, categories, numberOfDays);
         if(locName.equals("Macedonia")){
             return generatedLocations;
         }else{
             return generatedLocations;
-        }
+        }*/
     }
 }