feat: 경유하는 버스 이름 조회에 종류 필드 추가

Author: donghyuun

src/main/java/com/example/busnotice/domain/bus/BusController.java

@@ -1,6 +1,7 @@
 package com.example.busnotice.domain.bus;
 
 import com.example.busnotice.domain.bus.res.BusArrInfosDto.Item;
+import com.example.busnotice.domain.bus.res.BusNameAndTypeResponse;
 import com.example.busnotice.domain.busStop.CityCodeRepository;
 import com.example.busnotice.global.code.StatusCode;
 import com.example.busnotice.global.format.ApiResponse;
@@ -50,14 +51,14 @@ public Item getNodeSpecificArriveInfo(
         return item;
     }
 
-    @Operation(summary = "특정 노드를 경유하는 모든 버스들 이름 조회")
+    @Operation(summary = "특정 노드를 경유하는 모든 버스들 이름과 종류 조회")
     @GetMapping("/nodes/bus-names/all")
-    public List<String> getBusNamesOfNode(
+    public List<BusNameAndTypeResponse> getBusNamesOfNode(
         @RequestParam("cityName") String cityName,
         @RequestParam("nodeId") String nodeId
     ) throws UnsupportedEncodingException {
-        List<String> busNames = busService.특정_노드_ID를_경유하는_모든_버스들_이름_조회(cityName, nodeId);
-        return busNames;
+        List<BusNameAndTypeResponse> busNameAndTypeList = busService.특정_노드_ID를_경유하는_모든_버스들_이름_조회(cityName, nodeId);
+        return busNameAndTypeList;
     }
 
     @Operation(summary = "특정 노드를 경유하는 버스들이 맞는지 확인")
@@ -67,8 +68,9 @@ public ApiResponse<String> getBusNamesOfNode(
         @RequestParam("nodeId") String nodeId,
         @RequestParam("routeNo") List<String> busList
     ) throws UnsupportedEncodingException {
-        List<String> allBusNames = busService.특정_노드_ID를_경유하는_모든_버스들_이름_조회(cityName, nodeId);
-        boolean isValid = allBusNames.containsAll(busList.stream().map(String::trim).toList());
+        List<BusNameAndTypeResponse> busNameAndTypeResponses = busService.특정_노드_ID를_경유하는_모든_버스들_이름_조회(cityName, nodeId);
+        List<String> busNames = busNameAndTypeResponses.stream().map(bnt -> bnt.name()).toList();
+        boolean isValid = busNames.containsAll(busList.stream().map(String::trim).toList());
         return isValid
             ? ApiResponse.createSuccess("올바른 버스 목록입니다.")
             : ApiResponse.createFail(StatusCode.BAD_REQUEST, "해당 정류장에 속한 버스 노선이 아닙니다.");

src/main/java/com/example/busnotice/domain/bus/BusService.java

@@ -3,6 +3,7 @@
 import com.example.busnotice.domain.bus.res.BusArrInfosDto;
 import com.example.busnotice.domain.bus.res.BusArrInfosDto.Item;
 import com.example.busnotice.domain.bus.res.BusInfosDto;
+import com.example.busnotice.domain.bus.res.BusNameAndTypeResponse;
 import com.example.busnotice.domain.bus.res.SeoulBusArrInfosDto;
 import com.example.busnotice.domain.bus.res.SeoulBusInfosDto;
 import com.example.busnotice.domain.bus.res.SeoulBusInfosDto.BusRoute;
@@ -122,8 +123,8 @@ public class BusService {
         return sortedItems.stream().limit(2).collect(Collectors.toList());
     }
 
-    @Cacheable(value = "busNames_through_stn", key = "#p0 + '_' + #p1")
-    public List<String> 특정_노드_ID를_경유하는_모든_버스들_이름_조회(String cityName, String nodeId)
+//    @Cacheable(value = "busNames_through_stn", key = "#p0 + '_' + #p1")
+    public List<BusNameAndTypeResponse> 특정_노드_ID를_경유하는_모든_버스들_이름_조회(String cityName, String nodeId)
         throws UnsupportedEncodingException {
         log.info("{}_{} 를 경유하는 모든 버스들 이름 캐싱 실패, 메서드 실행", cityName, nodeId);
         String cityCode = busStopService.도시코드_DB_조회(cityName);
@@ -146,10 +147,26 @@ public class BusService {
                 throw new BusStopException(StatusCode.NOT_FOUND,
                     "해당 버스정류장을 경유하는 버스 노선이 존재하지 않습니다. 버스정류장 노드 ID 를 다시 확인해주세요.");
             }
-            List<String> busNames = result.getMsgBody().getItemList().stream()
-                .map(i -> i.getBusRouteNm()).toList();
-            System.out.println("bus names: " + busNames);
-            return busNames;
+            List<BusNameAndTypeResponse> list = result.getMsgBody().getItemList().stream()
+                .map(i -> {
+                        String routeType = "";
+                        switch (i.getBusRouteType()) {
+                            case 1: routeType = "공항"; break;
+                            case 2: routeType = "마을"; break;
+                            case 3: routeType = "간선"; break;
+                            case 4: routeType = "지선"; break;
+                            case 5: routeType = "순환"; break;
+                            case 6: routeType = "광역"; break;
+                            case 7: routeType = "인천"; break;
+                            case 8: routeType = "경기"; break;
+                            case 9: routeType = "폐지"; break;
+                            case 0: routeType = "공용"; break;
+                            default: routeType = "알수없음"; // 예외 처리
+                                 }
+                        return new BusNameAndTypeResponse(i.getBusRouteNm(), routeType);
+                    }
+                ).toList();
+            return list;
         }
 
         String url = "http://apis.data.go.kr/1613000/BusSttnInfoInqireService/getSttnThrghRouteList";
@@ -173,10 +190,10 @@ public class BusService {
         }
 
         // routeno 리스트 추출
-        List<String> busNames = result.getResponse().getBody().getItems().getItem().stream()
-            .map(BusInfosDto.Item::getRouteNo).toList();
-        System.out.println("bus names: " + busNames);
-        return busNames;
+        List<BusNameAndTypeResponse> list = result.getResponse().getBody().getItems().getItem().stream()
+            .map(i -> new BusNameAndTypeResponse(i.getRouteNo(),i.getRouteTp().substring(0, 2))
+            ).toList();
+        return list;
     }
 
 }

src/main/java/com/example/busnotice/domain/bus/res/BusNameAndTypeResponse.java

@@ -0,0 +1,10 @@
+package com.example.busnotice.domain.bus.res;
+
+import java.io.Serializable;
+
+public record BusNameAndTypeResponse(
+    String name,
+    String type
+) implements Serializable {
+
+}