Merge pull request #290 from DevKor-github/fix/route

Fix: 경로 오류 수정

Author: danbaram0420

src/main/java/devkor/com/teamcback/domain/place/entity/Place.java

@@ -96,7 +96,7 @@ public class Place extends BaseEntity {
     @JoinColumn(name = "building_id")
     private Building building;
 
-    @OneToOne(fetch = FetchType.LAZY)
+    @OneToOne
     @JoinColumn(name = "node_id")
     private Node node;
 

src/main/java/devkor/com/teamcback/domain/routes/service/RouteService.java

@@ -66,7 +66,7 @@ public List<GetRouteRes> findRoute(LocationType startType, Long startId, Double
         if (conditions == null) {
             conditions = new ArrayList<>();
         }
-        conditions.add(OPERATING);
+//        conditions.add(OPERATING);
         Node startNode = getNodeByType(startType, startId, startLat, startLong);
         Node endNode = getNodeByType(endType, endId, endLat, endLong);
 
@@ -273,7 +273,6 @@ private GetGraphRes getGraph(HashSet<Building> buildingList, Node startNode, Nod
         Map<Long, List<Edge>> graphEdge = new HashMap<>();
 
         // 조건에 따른 노드 검색
-
         for (Building building : buildingList) {
             if (conditions.contains(OPERATING)) {
                 if (!building.isOperating()) continue;
@@ -395,9 +394,10 @@ private DijkstraRes dijkstra(GetGraphRes graphRes, Node startNode, Node endNode)
         //path 생성
         List<Node> path = new ArrayList<>();
         Long finalDistance = distances.get(endNode.getId());
-        for (Long at = endNode.getId(); at != null; at = previousNodes.get(at)) {
+        for (Long at = endNode.getId(); at != null;) {
             Node node = nodeRepository.findById(at).orElseThrow(() -> new GlobalException(NOT_FOUND_ROUTE));
             path.add(node);
+            at = previousNodes.get(at);
         }
         Collections.reverse(path);
 
@@ -500,8 +500,12 @@ private List<List<Node>> cutRoute(List<Node> route) {
             else if (!Objects.equals(thisNode.getFloor(), nextNode.getFloor())) {
                 partialRoute.add(thisNode);
 
+                // 층 생략 여부 확인
+                boolean isFloorSkipped = false;
+
                 // 계단/엘리베이터를 통한 연속적인 층 이동을 감지하여 중간 층을 생략
-                while (!Objects.equals(thisNode.getFloor(), nextNode.getFloor()) && thisNode.getBuilding().equals(nextNode.getBuilding())) {
+                while (!Objects.equals(thisNode.getFloor(), nextNode.getFloor()) && thisNode.getBuilding().equals(nextNode.getBuilding()) && thisNode.getBuilding().getId() != OUTDOOR_ID) {
+                    isFloorSkipped = true;
                     count++;
                     thisNode = route.get(count);
                     nextNode = route.get(count+1);
@@ -510,7 +514,7 @@ else if (!Objects.equals(thisNode.getFloor(), nextNode.getFloor())) {
                 partialRoute.clear();
 
                 // 끝 층의 시작 노드를 새 경로로 추가
-                count--;
+                if(isFloorSkipped) count--;
             } else {
                 partialRoute.add(thisNode);
             }

src/test/java/devkor/com/teamcback/integration/RouteServiceIntegrationTest.java

@@ -22,7 +22,7 @@
 @SpringBootTest(webEnvironment = WebEnvironment.RANDOM_PORT)
 @TestInstance(Lifecycle.PER_METHOD)
 @TestMethodOrder(MethodOrderer.OrderAnnotation.class)
-@ActiveProfiles("test")
+//@ActiveProfiles("test")
 public class RouteServiceIntegrationTest extends BaseMvcTest {
     @Autowired
     RouteService routeService;