[release] 진행 상황을 main으로 머지

src/main/java/com/wayble/server/auth/exception/AuthErrorCase.java

@@ -0,0 +1,15 @@
+package com.wayble.server.auth.exception;
+
+import com.wayble.server.common.exception.ErrorCase;
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@Getter
+@RequiredArgsConstructor
+public enum AuthErrorCase implements ErrorCase {
+    UNAUTHORIZED(401, 7001, "인증 정보가 없거나 userId를 추출할 수 없습니다.");
+
+    private final Integer httpStatusCode;
+    private final Integer errorCode;
+    private final String message;
+}

src/main/java/com/wayble/server/auth/resolver/CurrentUserArgumentResolver.java

@@ -1,45 +1,65 @@
 package com.wayble.server.auth.resolver;
 
+import com.wayble.server.auth.exception.AuthErrorCase;
+import com.wayble.server.common.config.security.jwt.JwtTokenProvider;
+import com.wayble.server.common.exception.ApplicationException;
+import jakarta.servlet.http.HttpServletRequest;
+import lombok.RequiredArgsConstructor;
 import org.springframework.core.MethodParameter;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Component;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.support.WebDataBinderFactory;
 import org.springframework.web.context.request.NativeWebRequest;
 import org.springframework.web.method.support.HandlerMethodArgumentResolver;
 import org.springframework.web.method.support.ModelAndViewContainer;
 
 @Component
+@RequiredArgsConstructor
 public class CurrentUserArgumentResolver implements HandlerMethodArgumentResolver {
 
+    private final JwtTokenProvider jwtTokenProvider;
+
     @Override
     public boolean supportsParameter(MethodParameter parameter) {
         return parameter.hasParameterAnnotation(CurrentUser.class)
                 && Long.class.equals(parameter.getParameterType());
     }
 
     @Override
-    public Object resolveArgument(MethodParameter parameter,
-                                  ModelAndViewContainer mav,
-                                  NativeWebRequest webRequest,
-                                  WebDataBinderFactory binderFactory) {
+    public Object resolveArgument(
+            MethodParameter parameter,
+            ModelAndViewContainer mav,
+            NativeWebRequest webRequest,
+            WebDataBinderFactory binderFactory
+    ) {
         Authentication auth = SecurityContextHolder.getContext().getAuthentication();
-        if (auth == null) {
-            throw new IllegalStateException("인증 정보가 없습니다.");
+        if (auth != null) {
+            Object principal = auth.getPrincipal();
+            if (principal instanceof Long l) { return l; }
+            if (principal instanceof Integer i) { return i.longValue(); }
+            if (principal instanceof String s && s.chars().allMatch(Character::isDigit)) {
+                return Long.parseLong(s);
+            }
+            String name = auth.getName();
+            if (name != null && name.chars().allMatch(Character::isDigit)) {
+                return Long.parseLong(name);
+            }
         }
 
-        Object principal = auth.getPrincipal();
-        if (principal instanceof Long l) return l;
-        if (principal instanceof Integer i) return i.longValue();
-        if (principal instanceof String s) {
+        HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class);
+        String authz = request != null ? request.getHeader("Authorization") : null;
+        if (StringUtils.hasText(authz) && authz.startsWith("Bearer ")) {
+            String token = authz.substring(7);
             try {
-                return Long.parseLong(s);
-            } catch (NumberFormatException ignored) {}
-        }
-        try {
-            return Long.parseLong(auth.getName());
-        } catch (Exception e) {
-            throw new IllegalStateException("userId를 추출할 수 없습니다.", e);
+                Long userId = jwtTokenProvider.getUserId(token);
+                if (userId != null) { return userId; }
+            } catch (IllegalArgumentException e) {
+                throw new ApplicationException(AuthErrorCase.UNAUTHORIZED);
+            }
         }
+
+        throw new ApplicationException(AuthErrorCase.UNAUTHORIZED);
     }
 }

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

@@ -1,7 +1,9 @@
 package com.wayble.server.direction.dto.response;
 
-import com.wayble.server.direction.entity.DirectionType;
 import org.springframework.lang.Nullable;
+
+import com.wayble.server.direction.entity.type.DirectionType;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 
 import java.util.List;

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

@@ -1,6 +1,6 @@
 package com.wayble.server.direction.entity.transportation;
 
-import com.wayble.server.direction.entity.DirectionType;
+import com.wayble.server.direction.entity.type.DirectionType;
 
 import jakarta.persistence.*;
 import lombok.*;

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

@@ -14,11 +14,8 @@ public class Elevator {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @Column(name = "latitude", columnDefinition = "DECIMAL(10,7)", nullable = false)
-    private Double latitude;
-
-    @Column(name = "longitude", columnDefinition = "DECIMAL(10,7)", nullable = false)
-    private Double longitude;
+    @Column(name = "location", nullable = false)
+    private String location;
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "facility_id", nullable = false)

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

@@ -8,7 +8,7 @@
 
 import org.hibernate.annotations.BatchSize;
 
-import com.wayble.server.direction.entity.DirectionType;
+import com.wayble.server.direction.entity.type.DirectionType;
 
 @Entity
 @Getter

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

@@ -1,7 +1,7 @@
 package com.wayble.server.direction.entity.transportation;
 
-import com.wayble.server.direction.entity.DirectionType;
 import com.wayble.server.direction.entity.transportation.*;
+import com.wayble.server.direction.entity.type.DirectionType;
 
 import jakarta.persistence.*;
 import lombok.*;

src/main/java/com/wayble/server/direction/entity/DirectionType.java → src/main/java/com/wayble/server/direction/entity/type/DirectionType.java

@@ -1,4 +1,4 @@
-package com.wayble.server.direction.entity;
+package com.wayble.server.direction.entity.type;
 
 public enum DirectionType {
     BUS, SUBWAY, WALK,

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

@@ -0,0 +1,15 @@
+package com.wayble.server.direction.repository;
+
+import com.wayble.server.direction.entity.transportation.Elevator;
+import com.wayble.server.direction.entity.transportation.Facility;
+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;
+
+public interface ElevatorRepository extends JpaRepository<Elevator, Long> {
+    @Query("SELECT e FROM Elevator e WHERE e.facility = :facility")
+    List<Elevator> findByFacility(@Param("facility") Facility facility);
+}
+

src/main/java/com/wayble/server/direction/service/FacilityService.java

@@ -4,10 +4,15 @@
 import com.wayble.server.direction.entity.transportation.Facility;
 import com.wayble.server.direction.entity.transportation.Node;
 import com.wayble.server.direction.entity.transportation.Wheelchair;
+import com.wayble.server.direction.entity.transportation.Elevator;
+
 import com.wayble.server.direction.external.kric.dto.KricToiletRawItem;
 import com.wayble.server.direction.external.kric.dto.KricToiletRawResponse;
+
+import com.wayble.server.direction.repository.ElevatorRepository;
 import com.wayble.server.direction.repository.FacilityRepository;
 import com.wayble.server.direction.repository.NodeRepository;
+import com.wayble.server.direction.repository.RouteRepository;
 import com.wayble.server.direction.repository.WheelchairInfoRepository;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -28,6 +33,7 @@
 @Slf4j
 @RequiredArgsConstructor
 public class FacilityService {
+    private final ElevatorRepository elevatorRepository;
     private final FacilityRepository facilityRepository;
     private final NodeRepository nodeRepository;
     private final WheelchairInfoRepository wheelchairInfoRepository;
@@ -54,8 +60,6 @@ public TransportationResponseDto.NodeInfo getNodeInfo(Long nodeId, Long routeId)
                 }
             }
 
-            elevator = new ArrayList<>();
-
             Facility facility = facilityRepository.findByNodeId(nodeId).orElse(null);
             if (facility != null) {
                 String stinCd = facility.getStinCd();
@@ -65,6 +69,8 @@ public TransportationResponseDto.NodeInfo getNodeInfo(Long nodeId, Long routeId)
                 if (stinCd != null && railOprLsttCd != null && lnCd != null) {
                     Map<String, Boolean> toiletInfo = getToiletInfo(facility);
                     accessibleRestroom = toiletInfo.getOrDefault(stinCd, false);
+
+                    elevator = getElevatorInfo(facility, routeId);
                 } else {
                     log.error("Facility 정보 누락 - nodeId: {}, stinCd: {}, railOprLsttCd: {}, lnCd: {}", 
                         nodeId, stinCd, railOprLsttCd, lnCd);
@@ -132,4 +138,29 @@ private Map<String, Boolean> getToiletInfo(Facility facility) {
 
         return stationToiletMap;
     }
-}
+
+    private List<String> getElevatorInfo(Facility facility, Long routeId) {
+        List<String> elevatorLocations = new ArrayList<>();
+
+        try {
+            List<Elevator> elevators = elevatorRepository.findByFacility(facility);
+
+            for (Elevator elevator : elevators) {
+                String location = elevator.getLocation();
+                if (location != null && !location.trim().isEmpty()) {
+                    elevatorLocations.add(location.trim());
+                }
+            }
+
+            elevatorLocations.sort(String::compareTo);
+
+        } catch(Exception e) {
+            log.error("엘리베이터 정보 조회 실패 - facilityId: {}, error: {}", 
+                facility.getId(), e.getMessage(), e);
+        }
+
+        return elevatorLocations;
+    }
+
+
+}

src/main/java/com/wayble/server/direction/service/TransportationService.java

@@ -4,10 +4,10 @@
 import com.wayble.server.direction.dto.TransportationGraphDto;
 import com.wayble.server.direction.dto.request.TransportationRequestDto;
 import com.wayble.server.direction.dto.response.TransportationResponseDto;
-import com.wayble.server.direction.entity.DirectionType;
 import com.wayble.server.direction.entity.transportation.Edge;
 import com.wayble.server.direction.entity.transportation.Node;
 import com.wayble.server.direction.entity.transportation.Route;
+import com.wayble.server.direction.entity.type.DirectionType;
 import com.wayble.server.direction.repository.EdgeRepository;
 import com.wayble.server.direction.repository.NodeRepository;
 import lombok.RequiredArgsConstructor;