Add direct connections API endpoint and update repository

Author: teetangh

src/main/java/org/couchbase/quickstart/springdata/controller/AirportController.java

@@ -3,14 +3,17 @@
 import java.util.Optional;
 
 import javax.validation.Valid;
+import java.util.stream.Collectors;
 
 import org.couchbase.quickstart.springdata.models.Airport;
 import org.couchbase.quickstart.springdata.services.AirportService;
+import org.couchbase.quickstart.springdata.models.Route;
 import org.springframework.dao.DataRetrievalFailureException;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -123,13 +126,15 @@ public ResponseEntity<Page<Airport>> listAirports(@RequestParam(defaultValue = "
     }
 
     @GetMapping("/direct-connections")
-    public ResponseEntity<Page<Airport>> listDirectConnections(
-            @RequestParam String airport,
+    public ResponseEntity<Page<String>> listDirectConnections(
+            @RequestParam String airportCode,
             @RequestParam(defaultValue = "0") int page,
             @RequestParam(defaultValue = "10") int size) {
         try {
-            Page<Airport> airports = airportService.getDirectConnections(airport, PageRequest.of(page, size));
-            return new ResponseEntity<>(airports, HttpStatus.OK);
+            Page<Route> airports = airportService.getDirectConnections(airportCode, PageRequest.of(page, size));
+            Page<String> directConnections = airports.map(Route::getDestinationAirport);
+            return new ResponseEntity<>(directConnections, HttpStatus.OK);
+
         } catch (Exception e) {
             log.error(INTERNAL_SERVER_ERROR, e);
             return new ResponseEntity<>(HttpStatus.INTERNAL_SERVER_ERROR);

src/main/java/org/couchbase/quickstart/springdata/repository/AirportRepository.java

@@ -1,6 +1,7 @@
 package org.couchbase.quickstart.springdata.repository;
 
 import org.couchbase.quickstart.springdata.models.Airport;
+import org.couchbase.quickstart.springdata.models.Route;
 import org.springframework.data.couchbase.repository.Collection;
 import org.springframework.data.couchbase.repository.CouchbaseRepository;
 import org.springframework.data.couchbase.repository.Query;
@@ -21,10 +22,10 @@ public interface AirportRepository extends CouchbaseRepository<Airport, String>
     @Query("#{#n1ql.selectEntity}")
     Page<Airport> findAll(Pageable pageable);
 
-    @Query("SELECT DISTINCT META(airport).id AS __id,airport.* " +
+    @Query("SELECT DISTINCT META(route).id as __id,route.* " +
             "FROM airport as airport " +
             "JOIN route as route ON airport.faa = route.sourceairport " +
             "WHERE airport.faa = $1 AND route.stops = 0")
-    Page<Airport> getDirectConnections(String targetAirportCode, Pageable pageable);
+    Page<Route> getDirectConnections(String targetAirportCode, Pageable pageable);
 
 }

src/main/java/org/couchbase/quickstart/springdata/services/AirportService.java

@@ -3,6 +3,7 @@
 import java.util.Optional;
 
 import org.couchbase.quickstart.springdata.models.Airport;
+import org.couchbase.quickstart.springdata.models.Route;
 import org.couchbase.quickstart.springdata.repository.AirportRepository;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
@@ -42,7 +43,7 @@ public Airport updateAirport(String id, Airport airport) {
         return airportRepository.save(airport);
     }
 
-    public Page<Airport> getDirectConnections(String id, Pageable pageable) {
+    public Page<Route> getDirectConnections(String id, Pageable pageable) {
         return airportRepository.getDirectConnections(id, pageable);
     }