[release] 진행상황 Main 브랜치에 반영

src/main/java/com/wayble/server/ServerApplication.java

@@ -2,6 +2,7 @@
 
 import com.wayble.server.common.client.tmap.TMapProperties;
 import com.wayble.server.direction.external.kric.KricProperties;
+import com.wayble.server.direction.external.opendata.OpenDataProperties;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.boot.autoconfigure.data.elasticsearch.ReactiveElasticsearchRepositoriesAutoConfiguration;
@@ -16,7 +17,7 @@
 )
 @EnableJpaAuditing
 @EnableScheduling
-@EnableConfigurationProperties({TMapProperties.class, KricProperties.class})
+@EnableConfigurationProperties({TMapProperties.class, KricProperties.class, OpenDataProperties.class})
 @EnableElasticsearchRepositories(basePackages = {"com.wayble.server.explore.repository", "com.wayble.server.logging.repository", "com.wayble.server.direction.repository"})
 @EntityScan(basePackages = "com.wayble.server")
 public class ServerApplication {

src/main/java/com/wayble/server/common/config/HttpClientConfig.java

@@ -0,0 +1,31 @@
+package com.wayble.server.common.config;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import java.net.http.HttpClient;
+import java.time.Duration;
+
+@Configuration
+@RequiredArgsConstructor
+public class HttpClientConfig {
+
+    @Value("${http.client.connect-timeout:10}")
+    private int connectTimeout;
+
+    @Value("${http.client.request-timeout:30}")
+    private int requestTimeout;
+
+    @Bean
+    public HttpClient httpClient() {
+        return HttpClient.newBuilder()
+                .connectTimeout(Duration.ofSeconds(connectTimeout))
+                .build();
+    }
+
+    @Bean
+    public Duration httpRequestTimeout() {
+    return Duration.ofSeconds(requestTimeout);
+    }
+}

src/main/java/com/wayble/server/direction/controller/TransportationController.java

@@ -1,8 +1,8 @@
 package com.wayble.server.direction.controller;
 
 import com.wayble.server.common.response.CommonResponse;
-import com.wayble.server.direction.dto.TransportationRequestDto;
-import com.wayble.server.direction.dto.TransportationResponseDto;
+import com.wayble.server.direction.dto.request.TransportationRequestDto;
+import com.wayble.server.direction.dto.response.TransportationResponseDto;
 import com.wayble.server.direction.service.TransportationService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.media.Content;

src/main/java/com/wayble/server/direction/dto/TransportationGraphDto.java

@@ -0,0 +1,12 @@
+package com.wayble.server.direction.dto;
+
+import com.wayble.server.direction.entity.transportation.Edge;
+import org.springframework.data.util.Pair;
+
+import java.util.List;
+import java.util.Map;
+
+public record TransportationGraphDto( // 노드별 연결 정보와 엣지별 가중치를 함께 관리하기 위한 dto
+    Map<Long, List<Edge>> graph, // 노드별 연결 정보
+    Map<Pair<Long, Long>, Integer> weightMap // 엣지별 가중치
+) {}

src/main/java/com/wayble/server/direction/dto/TransportationRequestDto.java → src/main/java/com/wayble/server/direction/dto/request/TransportationRequestDto.java

@@ -1,4 +1,4 @@
-package com.wayble.server.direction.dto;
+package com.wayble.server.direction.dto.request;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 

src/main/java/com/wayble/server/direction/dto/response/BusInfo.java

@@ -0,0 +1,11 @@
+package com.wayble.server.direction.dto.response;
+
+import java.util.List;
+
+public record BusInfo(List<BusArrival> buses, String stationName) {
+    public record BusArrival(
+        String busNumber, 
+        String arrival1, 
+        String arrival2
+    ) {}
+}

src/main/java/com/wayble/server/direction/dto/response/TransportationResponseDto.java

@@ -0,0 +1,57 @@
+package com.wayble.server.direction.dto.response;
+
+import com.wayble.server.direction.entity.DirectionType;
+import org.springframework.lang.Nullable;
+import io.swagger.v3.oas.annotations.media.Schema;
+
+import java.util.List;
+
+@Schema(description = "대중교통 길찾기 응답 DTO")
+public record TransportationResponseDto(
+        List<Step> routes,
+        PageInfo pageInfo
+) {
+    public record Step(
+            DirectionType mode, // 예: START, WALK, SUBWAY, BUS, FINISH
+            @Nullable List<MoveInfo> moveInfo, // 같은 Step으로 이동한 정류장(Node) 정보 (중간 정류장만)
+            @Nullable String routeName,
+            Integer moveNumber, // 같은 Step(route)로 이동한 횟수
+            @Nullable BusInfo busInfo, // 버스일 경우에만 생성, 이외의 경우 null
+            @Nullable SubwayInfo subwayInfo, // 지하철일 경우에만 생성, 이외의 경우 null
+            String from,
+            String to
+    ) {}
+
+    public record PageInfo(
+            Integer nextCursor,
+            boolean hasNext
+    ) {}
+
+    public record MoveInfo(
+            String nodeName // 정류장(Node)의 stationName
+    ){}
+
+    public record BusInfo(
+            boolean isShuttleBus, // routeName에 "마포" 포함시 true
+            @Nullable List<Boolean> isLowFloor, // Open API(busType1,busType2) 기반 저상 여부 리스트
+            @Nullable Integer dispatchInterval // Open API(term) 기반 배차간격
+    ){}
+
+    public record SubwayInfo(
+            List<LocationInfo> wheelchair,
+            List<LocationInfo> elevator,
+            Boolean accessibleRestroom
+    ) {}
+
+    public record LocationInfo(
+            Double latitude,
+            Double longitude
+    ) {}
+
+    // 지하철 시설 정보 묶음 (서비스 내부에서 사용)
+    public record NodeInfo(
+            List<LocationInfo> wheelchair,
+            List<LocationInfo> elevator,
+            Boolean accessibleRestroom
+    ) {}
+}

src/main/java/com/wayble/server/direction/entity/transportation/Edge.java

@@ -21,17 +21,17 @@ public class Edge {
     private DirectionType edgeType;
 
     // 출발 노드
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "start_node_id")
     private Node startNode;
 
     // 도착 노드
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "end_node_id")
     private Node endNode;
 
     // 해당 연결이 속한 노선
-    @ManyToOne
+    @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "route_id")
     private Route route;
 

src/main/java/com/wayble/server/direction/entity/transportation/Facility.java

@@ -38,7 +38,7 @@ public class Facility {
     @OneToMany(mappedBy = "facility", cascade = CascadeType.ALL, fetch = FetchType.LAZY)
     private List<Elevator> elevators;
 
-    @OneToOne
+    @OneToOne(fetch = FetchType.LAZY)
     @MapsId
     @JoinColumn(name = "id")
     private Node node;

src/main/java/com/wayble/server/direction/entity/transportation/Node.java

@@ -6,6 +6,8 @@
 import java.util.List;
 import java.util.Objects;
 
+import org.hibernate.annotations.BatchSize;
+
 import com.wayble.server.direction.entity.DirectionType;
 
 @Entity
@@ -32,23 +34,24 @@ public class Node {
     private Double longitude;
 
     // 출발 edge 리스트 (정류장에서 출발)
-    @OneToMany(mappedBy = "startNode")
+    @OneToMany(mappedBy = "startNode", fetch = FetchType.LAZY)
+    @BatchSize(size = 100)
     private List<Edge> outgoingEdges;
 
     // 도착 Edge 리스트 (정류장으로 도착)
-    @OneToMany(mappedBy = "endNode")
+    @OneToMany(mappedBy = "endNode", fetch = FetchType.LAZY)
+    @BatchSize(size = 100)
     private List<Edge> incomingEdges;
 
     // 이 정류장이 기점/종점인 노선
-    @OneToMany(mappedBy = "startNode")
+    @OneToMany(mappedBy = "startNode", fetch = FetchType.LAZY)
+    @BatchSize(size = 100)
     private List<Route> startRoutes;
 
-    @OneToMany(mappedBy = "endNode")
+    @OneToMany(mappedBy = "endNode", fetch = FetchType.LAZY)
+    @BatchSize(size = 100)
     private List<Route> endRoutes;
 
-    @OneToOne(mappedBy = "node")
-    private Facility facility_id;
-
     public Node(Long id, String stationName, DirectionType nodeType, double latitude, double longitude) {
         this.id = id;
         this.stationName = stationName;
@@ -57,6 +60,10 @@ public Node(Long id, String stationName, DirectionType nodeType, double latitude
         this.longitude = longitude;
     }
 
+    public static Node createNode(Long id, String stationName, DirectionType nodeType, double latitude, double longitude) {
+        return new Node(id, stationName, nodeType, latitude, longitude);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;

src/main/java/com/wayble/server/direction/external/opendata/OpenDataProperties.java

@@ -0,0 +1,16 @@
+package com.wayble.server.direction.external.opendata;
+
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "opendata.api")
+public record OpenDataProperties(
+        String key,
+        String baseUrl,
+        String encodedKey,
+        Endpoints endpoints,
+        int timeout,
+        String userAgent,
+        String accept
+) {
+    public record Endpoints(String arrivals, String stationByName) {}
+}

src/main/java/com/wayble/server/direction/external/opendata/dto/Arrival.java

@@ -0,0 +1,7 @@
+package com.wayble.server.direction.external.opendata.dto;
+
+public record Arrival (    
+    Integer busType1, // 1이면 저상
+    Integer busType2, // 1이면 저상
+    Integer term     // 배차 간격
+) {}

src/main/java/com/wayble/server/direction/external/opendata/dto/OpenDataResponse.java

@@ -0,0 +1,39 @@
+package com.wayble.server.direction.external.opendata.dto;
+
+import java.util.List;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record OpenDataResponse ( // 버스 정류장 id를 기반으로 배차시간, 저상버스 여부를 확인하는 엔드포인트
+    @JsonProperty("comMsgHeader") ComMsgHeader comMsgHeader,
+    @JsonProperty("msgHeader") MsgHeader msgHeader,
+    @JsonProperty("msgBody") MsgBody msgBody
+) {
+    public record ComMsgHeader(
+        @JsonProperty("errMsg") String errMsg,
+        @JsonProperty("responseTime") String responseTime,
+        @JsonProperty("requestMsgID") String requestMsgID,
+        @JsonProperty("responseMsgID") String responseMsgID,
+        @JsonProperty("successYN") String successYN,
+        @JsonProperty("returnCode") String returnCode
+    ) {}
+    public record MsgHeader(
+        @JsonProperty("headerMsg") String headerMsg,
+        @JsonProperty("headerCd") String headerCd,
+        @JsonProperty("itemCount") Integer itemCount
+    ) {}
+
+    public record MsgBody(
+        @JsonProperty("itemList") List<Item> itemList
+    ) {}
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public record Item(
+        @JsonProperty("busType1") String busType1,
+        @JsonProperty("busType2") String busType2,
+        @JsonProperty("term") String term,
+        @JsonProperty("busRouteId") String busRouteId
+    ) {}
+}

src/main/java/com/wayble/server/direction/external/opendata/dto/StationSearchResponse.java

@@ -0,0 +1,21 @@
+package com.wayble.server.direction.external.opendata.dto;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record StationSearchResponse( // 버스 정류장 id를 검색하는 엔드포인트
+        StationSearchMsgBody msgBody
+) {
+    public record StationSearchMsgBody(
+            List<StationItem> itemList
+    ) {}
+
+    @JsonIgnoreProperties(ignoreUnknown = true)
+    public record StationItem(
+            String stId,
+            String stNm,
+            String tmX,
+            String tmY
+    ) {}
+}

src/main/java/com/wayble/server/direction/repository/EdgeRepository.java

@@ -2,6 +2,16 @@
 
 import com.wayble.server.direction.entity.transportation.Edge;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
+@Repository
 public interface EdgeRepository extends JpaRepository<Edge, Long> {
+    @Query("SELECT DISTINCT e FROM Edge e " +
+           "JOIN FETCH e.startNode " +
+           "JOIN FETCH e.endNode " +
+           "LEFT JOIN FETCH e.route")
+    List<Edge> findAllWithNodesAndRoute();
 }

src/main/java/com/wayble/server/direction/repository/RouteRepository.java

@@ -0,0 +1,9 @@
+package com.wayble.server.direction.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import com.wayble.server.direction.entity.transportation.Route;
+
+public interface RouteRepository extends JpaRepository<Route, Long>{
+
+}