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

src/main/java/com/wayble/server/admin/controller/wayblezone/AdminWaybleZoneViewController.java

@@ -2,6 +2,7 @@
 
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneCreateDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneDetailDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneNavigationDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZonePageDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneUpdateDto;
 import com.wayble.server.admin.service.AdminWaybleZoneService;
@@ -58,10 +59,14 @@ public String getWaybleZoneDetail(HttpSession session, Model model, @PathVariabl
             return "redirect:/admin/wayblezone/wayble-zones?error=notfound";
         }
 
+        // 이전/다음 네비게이션 정보 추가
+        AdminWaybleZoneNavigationDto navigation = adminWaybleZoneService.getNavigationInfo(id);
+
         model.addAttribute("waybleZone", waybleZoneOpt.get());
+        model.addAttribute("navigation", navigation);
         model.addAttribute("adminUsername", session.getAttribute("adminUsername"));
 
-        log.debug("웨이블존 상세 조회 - ID: {}", id);
+        log.debug("웨이블존 상세 조회 - ID: {}, 이전ID: {}, 다음ID: {}", id, navigation.previousId(), navigation.nextId());
 
         return "admin/wayblezone/wayble-zone-detail";
     }

src/main/java/com/wayble/server/admin/dto/wayblezone/AdminWaybleZoneNavigationDto.java

@@ -0,0 +1,7 @@
+package com.wayble.server.admin.dto.wayblezone;
+
+public record AdminWaybleZoneNavigationDto(
+    Long previousId,
+    Long nextId
+) {
+}

src/main/java/com/wayble/server/admin/repository/AdminWaybleZoneRepositoryCustom.java

@@ -1,6 +1,7 @@
 package com.wayble.server.admin.repository;
 
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneDetailDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneNavigationDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneThumbnailDto;
 
 import java.util.List;
@@ -13,4 +14,7 @@ public interface AdminWaybleZoneRepositoryCustom {
 
     // 상세 조회 메서드 (관리자용)
     Optional<AdminWaybleZoneDetailDto> findAdminWaybleZoneDetailById(Long zoneId);
+
+    // 이전/다음 웨이블존 ID 조회 (ID순)
+    AdminWaybleZoneNavigationDto getNavigationInfo(Long currentId);
 }

src/main/java/com/wayble/server/admin/repository/AdminWaybleZoneRepositoryImpl.java

@@ -3,6 +3,7 @@
 import com.querydsl.core.types.Projections;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneDetailDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneNavigationDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneThumbnailDto;
 import com.wayble.server.common.entity.Address;
 import com.wayble.server.wayblezone.entity.WaybleZone;
@@ -102,4 +103,23 @@ public Optional<AdminWaybleZoneDetailDto> findAdminWaybleZoneDetailById(Long zon
 
         return Optional.of(detailDto);
     }
+
+    @Override
+    public AdminWaybleZoneNavigationDto getNavigationInfo(Long currentId) {
+        // 이전 ID 조회 (현재 ID보다 작은 ID 중 가장 큰 값)
+        Long previousId = queryFactory
+                .select(waybleZone.id.max())
+                .from(waybleZone)
+                .where(waybleZone.id.lt(currentId))
+                .fetchOne();
+
+        // 다음 ID 조회 (현재 ID보다 큰 ID 중 가장 작은 값)
+        Long nextId = queryFactory
+                .select(waybleZone.id.min())
+                .from(waybleZone)
+                .where(waybleZone.id.gt(currentId))
+                .fetchOne();
+
+        return new AdminWaybleZoneNavigationDto(previousId, nextId);
+    }
 }

src/main/java/com/wayble/server/admin/service/AdminWaybleZoneService.java

@@ -2,6 +2,7 @@
 
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneCreateDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneDetailDto;
+import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneNavigationDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZonePageDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneThumbnailDto;
 import com.wayble.server.admin.dto.wayblezone.AdminWaybleZoneUpdateDto;
@@ -59,6 +60,10 @@ public Optional<AdminWaybleZoneDetailDto> findWaybleZoneById(Long waybleZoneId)
         return adminWaybleZoneRepository.findAdminWaybleZoneDetailById(waybleZoneId);
     }
 
+    public AdminWaybleZoneNavigationDto getNavigationInfo(Long currentId) {
+        return adminWaybleZoneRepository.getNavigationInfo(currentId);
+    }
+
     @Transactional
     public Long createWaybleZone(AdminWaybleZoneCreateDto adminWaybleZoneCreateDto) {
         try {

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

@@ -31,6 +31,11 @@ public WebClient tMapWebClient() {
     public WebClient kricWebClient() {
         return WebClient.builder()
                 .baseUrl(kricProperties.baseUrl())
+                .codecs(configurer -> configurer.defaultCodecs().maxInMemorySize(2 * 1024 * 1024))
+                .filter((request, next) -> next.exchange(request)
+                        .timeout(java.time.Duration.ofSeconds(15))
+                        .retryWhen(reactor.util.retry.Retry.backoff(3, java.time.Duration.ofSeconds(1))
+                                .filter(throwable -> throwable instanceof org.springframework.web.reactive.function.client.WebClientRequestException)))
                 .build();
     }
 }

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

@@ -20,7 +20,7 @@ public record Step(
             DirectionType mode, // 예: START, WALK, SUBWAY, BUS, FINISH
             @Nullable List<MoveInfo> moveInfo, // 같은 Step으로 이동한 정류장(Node) 정보 (중간 정류장만)
             @Nullable String routeName,
-            Integer moveNumber, // 같은 Step(route)로 이동한 횟수
+            Integer moveNumber, // 같은 Step(route)로 이동한 횟수 또는 WALK step의 경우 거리(미터 단위)
             @Nullable BusInfo busInfo, // 버스일 경우에만 생성, 이외의 경우 null
             @Nullable SubwayInfo subwayInfo, // 지하철일 경우에만 생성, 이외의 경우 null
             String from,
@@ -43,8 +43,8 @@ public record BusInfo(
     ){}
 
     public record SubwayInfo(
-            List<LocationInfo> wheelchair,
-            List<LocationInfo> elevator,
+            List<String> wheelchair,
+            List<String> elevator,
             Boolean accessibleRestroom
     ) {}
 
@@ -55,8 +55,8 @@ public record LocationInfo(
 
     // 지하철 시설 정보 묶음 (서비스 내부에서 사용)
     public record NodeInfo(
-            List<LocationInfo> wheelchair,
-            List<LocationInfo> elevator,
+            List<String> wheelchair,
+            List<String> elevator,
             Boolean accessibleRestroom
     ) {}
 }

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

@@ -16,7 +16,6 @@
 @Table(name = "facility")
 public class Facility {
     @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
     @Column(name="stationName")

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

@@ -6,6 +6,8 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.util.List;
+
 @Entity
 @Getter
 @Builder(access = AccessLevel.PRIVATE)
@@ -33,4 +35,8 @@ public class Route {
     @ManyToOne
     @JoinColumn(name = "end_node_id")
     private Node endNode;
+
+    // 휠체어 정보
+    @OneToMany(mappedBy = "route", fetch = FetchType.LAZY)
+    private List<Wheelchair> wheelchairs;
 }

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

@@ -0,0 +1,24 @@
+package com.wayble.server.direction.entity.transportation;
+
+import jakarta.persistence.*;
+import lombok.*;
+
+@Entity
+@Getter
+@Builder
+@AllArgsConstructor(access = AccessLevel.PROTECTED)
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Table(name = "wheelchair")
+public class Wheelchair {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "route_id", nullable = false)
+    private Route route;
+
+    @Column(name = "wheelchair_location", nullable = false)
+    private String wheelchairLocation; // 1-4 등
+
+}

src/main/java/com/wayble/server/direction/external/kric/dto/KricToiletRawItem.java

@@ -3,6 +3,15 @@
 import lombok.Getter;
 
 public record KricToiletRawItem(
+        String railOprIsttCd,
+        String lnCd,
         String stinCd,
-        String toltNum
+        String grndDvNm,
+        String stinFlor,
+        String gateInotDvNm,
+        String exitNo,
+        String dtlLoc,
+        String mlFmlDvNm,
+        String toltNum,
+        String diapExchNum
 ) {}

src/main/java/com/wayble/server/direction/external/kric/dto/KricToiletRawResponse.java

@@ -3,5 +3,5 @@
 import java.util.List;
 
 public record KricToiletRawResponse(
-        KricToiletRawBody body
+        List<KricToiletRawItem> body
 ) {}

src/main/java/com/wayble/server/direction/init/GraphInit.java

@@ -40,7 +40,7 @@ public void init() {
 
         try {
             // 그래프
-            try (InputStream graphStream = getClass().getResourceAsStream("/seocho_pedestrian.json")) {
+            try (InputStream graphStream = getClass().getResourceAsStream("/seocho_gongdeok_pedestrian.json")) {
                 if (graphStream == null) {
                     throw new ApplicationException(WalkingErrorCase.GRAPH_FILE_NOT_FOUND);
                 }

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

@@ -6,7 +6,12 @@
 import java.util.Optional;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface FacilityRepository extends JpaRepository<Facility, Long> {
-    Optional<Facility> findByNodeId(Long nodeId);
+    @Query("SELECT f FROM Facility f " +
+           "LEFT JOIN FETCH f.lifts " +
+           "WHERE f.id = :nodeId")
+    Optional<Facility> findByNodeId(@Param("nodeId") Long nodeId);
 }

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

@@ -0,0 +1,15 @@
+package com.wayble.server.direction.repository;
+
+import com.wayble.server.direction.entity.transportation.Wheelchair;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface WheelchairInfoRepository extends JpaRepository<Wheelchair, Long> {
+
+    @Query("SELECT w FROM Wheelchair w WHERE w.route.routeId = :routeId")
+    List<Wheelchair> findByRouteId(@Param("routeId") Long routeId);
+}