Search only by airports

sefadegirmenci · Jul 15, 2022 · a3d8b02 · a3d8b02
1 parent 22a5147
commit a3d8b02
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/src/main/java/com/eistgeist/flightsystem/repository/FlightRepository.java b/src/main/java/com/eistgeist/flightsystem/repository/FlightRepository.java
@@ -11,5 +11,6 @@
 
 public interface FlightRepository
         extends MongoRepository<Flight,String> {
-    Optional<List<Flight>> findFlightsByDepartureAirportAirportCodeIgnoreCaseAndArrivalAirportAirportCodeIgnoreCaseAndDepartureDateTimeGreaterThanEqualAndArrivalDateTimeLessThanEqual (String departureAirport, String arrivalAirport, LocalDateTime departureDateTime, LocalDateTime arrivalDateTime);
+    Optional<List<Flight>> findFlightsByDepartureAirportAirportCodeIgnoreCaseAndArrivalAirportAirportCodeIgnoreCaseAndDepartureDateTimeGreaterThanEqualAndArrivalDateTimeLessThanEqual (String departureAirportCode, String arrivalAirportCode, LocalDateTime departureDateTime, LocalDateTime arrivalDateTime);
+    Optional<List<Flight>> findFlightsByDepartureAirportAirportCodeIgnoreCaseAndArrivalAirportAirportCodeIgnoreCase(String departureAirportCode, String arrivalAirportCode);
 }
diff --git a/src/main/java/com/eistgeist/flightsystem/rest/FlightController.java b/src/main/java/com/eistgeist/flightsystem/rest/FlightController.java
@@ -38,7 +38,7 @@ public ResponseEntity<Flight> addFlight(@RequestBody Flight flight){
     }
 
     /* TODO: Change the search logic*/
-    @Operation(summary = "Search a flight by departure and arrival airports")
+    @Operation(summary = "Search a flight by all the fields")
     @GetMapping(value = "search/{departureAirportCode}/{arrivalAirportCode}/{departureDateTimeString}/{arrivalDateTimeString}",produces = {"application/json"})
     public ResponseEntity<List<Flight>> searchFlight(@PathVariable(required = false) String departureAirportCode,
                                                      @PathVariable(required = false) String arrivalAirportCode,
@@ -52,6 +52,13 @@ public ResponseEntity<List<Flight>> searchFlight(@PathVariable(required = false)
         return ResponseEntity.ok(flightService.searchFlight(departureAirportCode, arrivalAirportCode, departureDateTime, arrivalDateTime));
     }
 
+    @Operation(summary = "Search a flight by departure and arrival airports")
+    @GetMapping(value = "search/{departureAirportCode}/{arrivalAirportCode}",produces = {"application/json"})
+    public ResponseEntity<List<Flight>> searchFlightByAirports(@PathVariable(required = false) String departureAirportCode,
+                                                     @PathVariable(required = false) String arrivalAirportCode) {
+        return ResponseEntity.ok(flightService.searchFlightByAirports(departureAirportCode, arrivalAirportCode));
+    }
+
 
 
 }
diff --git a/src/main/java/com/eistgeist/flightsystem/service/FlightService.java b/src/main/java/com/eistgeist/flightsystem/service/FlightService.java
@@ -31,6 +31,11 @@ public List<Flight> searchFlight(String departureAirportCode, String arrivalAirp
                 .orElseThrow(() -> new FlightNotFoundException("Flight not found"));
     }
 
+    public List<Flight> searchFlightByAirports(String departureAirportCode, String arrivalAirportCode) {
+        return flightRepository.findFlightsByDepartureAirportAirportCodeIgnoreCaseAndArrivalAirportAirportCodeIgnoreCase(departureAirportCode, arrivalAirportCode)
+                .orElseThrow(() -> new FlightNotFoundException("Flight not found"));
+    }
+
 
     public Flight addFlight(Flight flight) {
         return flightRepository.save(flight);