Review/nav 87 include refactorings from nav 83 review

pom.xml

@@ -137,12 +137,12 @@
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-api</artifactId>
-            <version>3.0.0-beta2</version>
+            <version>2.23.1</version>
         </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-core</artifactId>
-            <version>3.0.0-beta2</version>
+            <version>2.23.1</version>
         </dependency>
         <!-- io -->
         <dependency>
@@ -155,7 +155,7 @@
             <artifactId>commons-csv</artifactId>
             <version>1.11.0</version>
         </dependency>
-        <!-- api-->
+        <!-- spring boot rest app -->
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
@@ -165,17 +165,8 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>javax.validation</groupId>
-            <artifactId>validation-api</artifactId>
-            <version>2.0.1.Final</version>
-        </dependency>
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>2.2.22</version>
-        </dependency>
     </dependencies>
+
     <repositories>
         <repository>
             <id>maven_central</id>

src/main/java/ch/naviqore/app/controller/RoutingController.java

@@ -1,39 +1,139 @@
 package ch.naviqore.app.controller;
 
-import ch.naviqore.app.model.Connection;
-import ch.naviqore.app.model.EarliestArrival;
+import ch.naviqore.app.dto.Connection;
+import ch.naviqore.app.dto.DtoMapper;
+import ch.naviqore.app.dto.EarliestArrival;
+import ch.naviqore.service.PublicTransitService;
+import ch.naviqore.service.Stop;
+import ch.naviqore.service.TimeType;
+import ch.naviqore.service.config.ConnectionQueryConfig;
+import ch.naviqore.service.exception.StopNotFoundException;
+import ch.naviqore.utils.spatial.GeoCoordinate;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDateTime;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
+
+import static ch.naviqore.app.dto.DtoMapper.map;
 
 @RestController
 @RequestMapping("/routing")
 public class RoutingController {
 
+    private final PublicTransitService service;
+
+    @Autowired
+    public RoutingController(PublicTransitService service) {
+        this.service = service;
+    }
+
     @GetMapping("/connections")
-    public List<Connection> getConnections(@RequestParam String sourceStopId, @RequestParam String targetStopId,
+    public List<Connection> getConnections(@RequestParam(required = false) String sourceStopId,
+                                           @RequestParam(required = false, defaultValue = "-1.0") double sourceLatitude,
+                                           @RequestParam(required = false, defaultValue = "-1.0") double sourceLongitude,
+                                           @RequestParam(required = false) String targetStopId,
+                                           @RequestParam(required = false, defaultValue = "-1.0") double targetLatitude,
+                                           @RequestParam(required = false, defaultValue = "-1.0") double targetLongitude,
                                            @RequestParam(required = false) LocalDateTime departureDateTime,
                                            @RequestParam(required = false, defaultValue = "2147483647") int maxWalkingDuration,
                                            @RequestParam(required = false, defaultValue = "2147483647") int maxTransferNumber,
                                            @RequestParam(required = false, defaultValue = "2147483647") int maxTravelTime,
                                            @RequestParam(required = false, defaultValue = "0") int minTransferTime) {
-        // TODO: Implement the method with  maxWalkingDuration, maxTransferNumber, maxTravelTime, minTransferTime
-        return DummyData.getConnections(sourceStopId, targetStopId, departureDateTime);
+        if (sourceStopId == null) {
+            if (sourceLatitude < 0 || sourceLongitude < 0) {
+                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
+                        "Either sourceStopId or sourceLatitude and sourceLongitude must be provided.");
+            }
+        }
+
+        if (targetStopId == null) {
+            if (targetLatitude < 0 || targetLongitude < 0) {
+                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
+                        "Either targetStopId or targetLatitude and targetLongitude must be provided.");
+            }
+        }
+
+        if (departureDateTime == null) {
+            departureDateTime = LocalDateTime.now();
+        }
+
+        Stop sourceStop = sourceStopId != null ? getStop(sourceStopId) : null;
+        Stop targetStop = targetStopId != null ? getStop(targetStopId) : null;
+
+        GeoCoordinate sourceCoordinate = sourceStop == null ? new GeoCoordinate(sourceLatitude, sourceLongitude) : null;
+        GeoCoordinate targetCoordinate = targetStop == null ? new GeoCoordinate(targetLatitude, targetLongitude) : null;
+
+        ConnectionQueryConfig config = new ConnectionQueryConfig(maxWalkingDuration, minTransferTime, maxTransferNumber,
+                maxTravelTime);
+
+        List<ch.naviqore.service.Connection> connections;
+
+        if (sourceStop != null && targetStop != null) {
+            connections = service.getConnections(sourceStop, targetStop, departureDateTime, TimeType.DEPARTURE, config);
+        } else if (sourceStop != null) {
+            connections = service.getConnections(sourceStop, targetCoordinate, departureDateTime, TimeType.DEPARTURE,
+                    config);
+        } else if (targetStop != null) {
+            connections = service.getConnections(sourceCoordinate, targetStop, departureDateTime, TimeType.DEPARTURE,
+                    config);
+        } else {
+            connections = service.getConnections(sourceCoordinate, targetCoordinate, departureDateTime,
+                    TimeType.DEPARTURE, config);
+        }
+
+        return connections.stream().map(DtoMapper::map).toList();
     }
 
     @GetMapping("/isolines")
-    public List<EarliestArrival> getIsolines(@RequestParam String sourceStopId,
+    public List<EarliestArrival> getIsolines(@RequestParam(required = false) String sourceStopId,
+                                             @RequestParam(required = false, defaultValue = "-1.0") double sourceLatitude,
+                                             @RequestParam(required = false, defaultValue = "-1.0") double sourceLongitude,
                                              @RequestParam(required = false) LocalDateTime departureDateTime,
                                              @RequestParam(required = false, defaultValue = "2147483647") int maxWalkingDuration,
                                              @RequestParam(required = false, defaultValue = "2147483647") int maxTransferNumber,
                                              @RequestParam(required = false, defaultValue = "2147483647") int maxTravelTime,
                                              @RequestParam(required = false, defaultValue = "0") int minTransferTime) {
-        // TODO: Implement the method with maxWalkingDuration, maxTransferNumber, minTransferTime
-        return DummyData.getIsolines(sourceStopId, departureDateTime, maxTravelTime);
+        if (sourceStopId == null) {
+            if (sourceLatitude < 0 || sourceLongitude < 0) {
+                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
+                        "Either sourceStopId or sourceLatitude and sourceLongitude must be provided.");
+            }
+            throw new ResponseStatusException(HttpStatus.NOT_IMPLEMENTED,
+                    "Location based routing is not implemented yet.");
+        }
+
+        Stop sourceStop = getStop(sourceStopId);
+        ConnectionQueryConfig config = new ConnectionQueryConfig(maxWalkingDuration, minTransferTime, maxTransferNumber,
+                maxTravelTime);
+
+        Map<Stop, ch.naviqore.service.Connection> connections = service.getIsolines(sourceStop, departureDateTime,
+                config);
+
+        List<EarliestArrival> arrivals = new ArrayList<>();
+
+        for (Map.Entry<Stop, ch.naviqore.service.Connection> entry : connections.entrySet()) {
+            Stop stop = entry.getKey();
+            ch.naviqore.service.Connection connection = entry.getValue();
+            arrivals.add(map(stop, connection));
+        }
+
+        return arrivals;
+    }
+
+    private ch.naviqore.service.Stop getStop(String stopId) {
+        try {
+            return service.getStopById(stopId);
+        } catch (StopNotFoundException e) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Stop not found", e);
+        }
     }
 
 }

src/main/java/ch/naviqore/app/controller/ScheduleController.java

@@ -1,43 +1,94 @@
 package ch.naviqore.app.controller;
 
-import ch.naviqore.app.model.Departure;
-import ch.naviqore.app.model.DistanceToStop;
-import ch.naviqore.app.model.SearchType;
-import ch.naviqore.app.model.Stop;
+import ch.naviqore.app.dto.*;
+import ch.naviqore.service.ScheduleInformationService;
+import ch.naviqore.service.exception.StopNotFoundException;
+import ch.naviqore.utils.spatial.GeoCoordinate;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.server.ResponseStatusException;
 
 import java.time.LocalDateTime;
 import java.util.List;
 
+import static ch.naviqore.app.dto.DtoMapper.map;
+
 @RestController
 @RequestMapping("/schedule")
+@Log4j2
 public class ScheduleController {
 
+    private final ScheduleInformationService service;
+
+    @Autowired
+    public ScheduleController(ScheduleInformationService service) {
+        this.service = service;
+    }
+
+    private static void validateLimit(int limit) {
+        if (limit <= 0) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Limit must be greater than 0");
+        }
+    }
+
     @GetMapping("/stops/autocomplete")
     public List<Stop> getAutoCompleteStops(@RequestParam String query,
                                            @RequestParam(required = false, defaultValue = "10") int limit,
-                                           @RequestParam(required = false, defaultValue = "FUZZY") SearchType type) {
-        return DummyData.searchStops(query, limit, type);
+                                           @RequestParam(required = false, defaultValue = "STARTS_WITH") SearchType searchType) {
+        validateLimit(limit);
+        return service.getStops(query, map(searchType)).stream().map(DtoMapper::map).limit(limit).toList();
     }
 
     @GetMapping("/stops/nearest")
     public List<DistanceToStop> getNearestStops(@RequestParam double latitude, @RequestParam double longitude,
                                                 @RequestParam(required = false, defaultValue = "1000") int maxDistance,
                                                 @RequestParam(required = false, defaultValue = "10") int limit) {
-        return DummyData.getNearestStops(latitude, longitude, maxDistance, limit);
+        validateLimit(limit);
+        if (maxDistance < 0) {
+            throw new ResponseStatusException(HttpStatus.BAD_REQUEST, "Max distance can not be negative");
+        }
+
+        return service.getNearestStops(new GeoCoordinate(latitude, longitude), maxDistance, limit)
+                .stream()
+                .map(stop -> map(stop, latitude, longitude))
+                .toList();
     }
 
     @GetMapping("/stops/{stopId}")
     public Stop getStop(@PathVariable String stopId) {
-        return DummyData.getStop(stopId);
+        try {
+            return map(service.getStopById(stopId));
+        } catch (StopNotFoundException e) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Stop not found", e);
+        }
     }
 
     @GetMapping("/stops/{stopId}/departures")
     public List<Departure> getDepartures(@PathVariable String stopId,
                                          @RequestParam(required = false) LocalDateTime departureDateTime,
                                          @RequestParam(required = false, defaultValue = "10") int limit,
                                          @RequestParam(required = false) LocalDateTime untilDateTime) {
-        return DummyData.getDepartures(stopId, departureDateTime, limit, untilDateTime);
-    }
+        validateLimit(limit);
+        if (departureDateTime == null) {
+            departureDateTime = LocalDateTime.now();
+        }
+        if (untilDateTime != null) {
+            if (untilDateTime.isBefore(departureDateTime)) {
+                throw new ResponseStatusException(HttpStatus.BAD_REQUEST,
+                        "Until date time must be after departure date time");
+            }
+        }
 
+        try {
+            return service.getNextDepartures(service.getStopById(stopId), departureDateTime, untilDateTime, limit)
+                    .stream()
+                    .map(DtoMapper::map)
+                    .toList();
+        } catch (StopNotFoundException e) {
+            throw new ResponseStatusException(HttpStatus.NOT_FOUND, "Stop not found", e);
+        }
+
+    }
 }

src/main/java/ch/naviqore/app/dto/Connection.java

@@ -0,0 +1,16 @@
+package ch.naviqore.app.dto;
+
+import lombok.*;
+
+import java.util.List;
+
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+@EqualsAndHashCode
+@ToString
+@Getter
+public class Connection {
+
+    private final List<Leg> legs;
+
+}
+

src/main/java/ch/naviqore/app/dto/Departure.java

@@ -0,0 +1,15 @@
+package ch.naviqore.app.dto;
+
+import lombok.*;
+
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+@EqualsAndHashCode
+@ToString
+@Getter
+public class Departure {
+
+    private final StopTime stopTime;
+    private final Trip trip;
+
+}
+

src/main/java/ch/naviqore/app/dto/DistanceToStop.java

@@ -0,0 +1,15 @@
+package ch.naviqore.app.dto;
+
+import lombok.*;
+
+@RequiredArgsConstructor(access = AccessLevel.PACKAGE)
+@EqualsAndHashCode
+@ToString
+@Getter
+public class DistanceToStop {
+
+    private final Stop stop;
+    private final double distance;
+
+}
+