Change flight search mechanism

sefadegirmenci · Jul 14, 2022 · a09d961 · a09d961
1 parent 0104daa
commit a09d961
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 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,5 @@
 
 public interface FlightRepository
         extends MongoRepository<Flight,String> {
-    Optional<List<Flight>> findFlightsByArrivalAirportIgnoreCaseAndDepartureAirportIgnoreCaseAndDepartureDateTimeGreaterThanEqualAndArrivalDateTimeLessThanEqual (Airport arrivalAirport, Airport departureAirport, LocalDateTime departureDateTime, LocalDateTime arrivalDateTime);
+    Optional<List<Flight>> findFlightsByDepartureAirportAirportCodeIgnoreCaseAndArrivalAirportAirportCodeIgnoreCaseAndDepartureDateTimeGreaterThanEqualAndArrivalDateTimeLessThanEqual (String departureAirport, String arrivalAirport, LocalDateTime departureDateTime, LocalDateTime arrivalDateTime);
 }
diff --git a/src/main/java/com/eistgeist/flightsystem/service/FlightService.java b/src/main/java/com/eistgeist/flightsystem/service/FlightService.java
@@ -26,11 +26,8 @@ public List<Flight> getFlights(){
         return flightRepository.findAll();
     }
     public List<Flight> searchFlight(String departureAirportCode, String arrivalAirportCode, LocalDateTime departureDateTime, LocalDateTime arrivalDateTime) {
-        Airport departureAirport = airportRepository.findAirportByAirportCodeIgnoreCase(departureAirportCode)
-                .orElseThrow(() -> new AirportNotFoundException("Departure airport not found"));
-        Airport arrivalAirport = airportRepository.findAirportByAirportCodeIgnoreCase(arrivalAirportCode)
-                .orElseThrow(() -> new AirportNotFoundException("Arrival airport not found"));
-        return flightRepository.findFlightsByArrivalAirportIgnoreCaseAndDepartureAirportIgnoreCaseAndDepartureDateTimeGreaterThanEqualAndArrivalDateTimeLessThanEqual(departureAirport, arrivalAirport, departureDateTime, arrivalDateTime)
+        return flightRepository.findFlightsByDepartureAirportAirportCodeIgnoreCaseAndArrivalAirportAirportCodeIgnoreCaseAndDepartureDateTimeGreaterThanEqualAndArrivalDateTimeLessThanEqual
+                        (departureAirportCode, arrivalAirportCode, departureDateTime, arrivalDateTime)
                 .orElseThrow(() -> new FlightNotFoundException("Flight not found"));
     }