Merge pull request #156 from DevKor-github/fix/suggestion

건의 조회 오류 수정

Author: dlwls423

src/main/java/devkor/com/teamcback/domain/routes/repository/NodeRepository.java

@@ -5,6 +5,7 @@
 import devkor.com.teamcback.domain.routes.entity.NodeType;
 import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
 
 public interface NodeRepository extends JpaRepository<Node, Long> {
     List<Node> findByBuildingAndRoutingAndTypeNot(Building building, boolean routing, NodeType type);
@@ -13,4 +14,6 @@ public interface NodeRepository extends JpaRepository<Node, Long> {
     List<Node> findAllByBuildingAndType(Building building, NodeType nodeType);
     List<Node> findAllByBuildingAndFloorAndTypeIn(Building building, double floor, List<NodeType> entrance);
     List<Node> findByBuildingAndRoutingAndTypeIn(Building building, boolean routing, List<NodeType> type);
+    @Query("SELECT e FROM Node e ORDER BY FUNCTION('RAND') LIMIT 20")
+    List<Node> findRandomNodes();
 }

src/main/java/devkor/com/teamcback/domain/suggestion/dto/response/GetSuggestionRes.java

@@ -25,6 +25,6 @@ public GetSuggestionRes(Suggestion suggestion) {
         DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
         this.createdAt = suggestion.getCreatedAt().format(formatter);
         this.isSolved = suggestion.isSolved();
-        this.userId = suggestion.getUser().getUserId();
+        this.userId = suggestion.getUser() == null ? null : suggestion.getUser().getUserId();
     }
 }

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

@@ -37,16 +37,18 @@ public class RouteServiceIntegrationTest extends BaseMvcTest {
     @Order(1)
     @DisplayName("기본 길찾기 테스트: 노드 - 노드")
     void nodeRouteTest() {
-        List<Node> nodeList = nodeRepository.findAll();
-        for(Node start : nodeList) {
-            for (Node end : nodeList) {
+        List<Node> nodeList = nodeRepository.findRandomNodes(); // 무작위 노드 20개
+        for(int i = 0; i < nodeList.size() - 1; i++) {
+            Node start = nodeList.get(i);
+            for (int j = i+1; j < nodeList.size(); j++) {
+                Node end = nodeList.get(j);
                 try {
-                    System.out.println("start_node_id: " + start.getId() + " end_node_id: " + end.getId());
+                    System.out.println("-------------------------" + "start_node_id: " + start.getId() + " end_node_id: " + end.getId());
                     routeService.findRoute(LocationType.NODE, start.getId(), null, null, LocationType.NODE, end.getId(), null, null, null);
                 } catch (AdminException e) {
-                    System.out.println(e.getAdminMessage());
+                    System.out.println("##########################" + e.getAdminMessage());
                 } catch (GlobalException e) {
-                    System.out.println(e.getResultCode());
+                    System.out.println("##########################" + e.getResultCode());
                 }
             }
         }
@@ -57,17 +59,17 @@ void nodeRouteTest() {
     @DisplayName("기본 길찾기 테스트: 빌딩 - 빌딩")
     void buildingRouteTest() {
         List<Building> buildingList = buildingRepository.findAll();
-        for(Building start : buildingList) {
-            for (Building end : buildingList) {
-                if(start.getId() != 0 && end.getId() != 0 && !start.getId().equals(end.getId())) {
-                    try {
-                        System.out.println("start_building_id: " + start.getId() + " end_building_id: " + end.getId());
-                        routeService.findRoute(LocationType.BUILDING, start.getId(), null, null, LocationType.BUILDING, end.getId(), null, null, null);
-                    } catch (AdminException e) {
-                        System.out.println(e.getAdminMessage());
-                    } catch (GlobalException e) {
-                        System.out.println(e.getResultCode());
-                    }
+        for(int i = 1; i < buildingList.size() - 1; i++) {
+            Building start = buildingList.get(i);
+            for (int j = i+1; j < buildingList.size(); j++) {
+                Building end = buildingList.get(j);
+                try {
+                    System.out.println("-------------------------" + "start_building_id: " + start.getId() + " end_building_id: " + end.getId());
+                    routeService.findRoute(LocationType.BUILDING, start.getId(), null, null, LocationType.BUILDING, end.getId(), null, null, null);
+                } catch (AdminException e) {
+                    System.out.println("##########################" + e.getAdminMessage());
+                } catch (GlobalException e) {
+                    System.out.println("##########################" + e.getResultCode());
                 }
             }
         }