Merge pull request #276 from prgrms-web-devcourse-final-project/feat/#263

[Location] 경유지가 없을때 출력 가능 및 택시요금 추가

Author: Creamcheesepie

src/main/java/com/back/web7_9_codecrete_be/domain/location/controller/KakaoApiController.java

@@ -28,6 +28,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Tag(name = "Location - Kakao", description = "카카오 로컬 API 연동(주변 음식점 조회, 좌표→주소 변환) 관련 엔드포인트")
 @RestController
@@ -45,10 +46,10 @@ public class KakaoApiController {
     )
     @PostMapping("/restaurant")
     public List<KakaoLocalResponse.Document> KakaoRestaurants(
-            @RequestParam double lat,
-            @RequestParam double lon
+            @RequestParam double x,
+            @RequestParam double y
     ) {
-        return kakaoLocalService.searchNearbyRestaurants(lat, lon);
+        return kakaoLocalService.searchNearbyRestaurants(x, y);
     }
 
 
@@ -59,10 +60,10 @@ public List<KakaoLocalResponse.Document> KakaoRestaurants(
     )
     @PostMapping("/cafes")
     public List<KakaoLocalResponse.Document> KakaoCafes(
-            @RequestParam double lat,
-            @RequestParam double lon
+            @RequestParam double x,
+            @RequestParam double y
     ) {
-        return kakaoLocalService.searchNearbyCafes(lat, lon);
+        return kakaoLocalService.searchNearbyCafes(x, y);
     }
 
 
@@ -190,7 +191,31 @@ public KakaoRouteSectionFeResponse navigateOnlyGuides(
             )
             @RequestBody KakaoRouteTransitRequest req
     ) {
-
+        boolean isWayPointsExist = (req.getWaypoints() == null || req.getWaypoints().isEmpty());
+
+        if(!isWayPointsExist){
+            KakaoMobilityResponse.Summary summary = navigateSummary(req.getOrigin().getX(), req.getOrigin().getY(), req.getDestination().getX(), req.getDestination().getY());
+            List<KakaoRouteFeResponse> sections = List.of(
+                    new KakaoRouteFeResponse(
+                            0,
+                            summary.getDistance(),
+                            summary.getDuration(),
+                            Map.of("x", req.getOrigin().getX(), "y", req.getOrigin().getY()),
+                            Map.of("x", req.getDestination().getX(), "y", req.getDestination().getY())
+                    )
+            );
+            int totalTaxi = 0;
+            if (summary.getFare() != null) {
+                totalTaxi = summary.getFare().getTaxi();
+            }
+            return new KakaoRouteSectionFeResponse(
+                    summary.getDistance(),
+                    summary.getDuration(),
+                    totalTaxi,
+                    sections
+
+            );
+        }
         KakaoRouteTransitResponse res = kakaoLocalService.NaviSearchTransit(req);
         KakaoRouteTransitResponse.Route route = res.getRoutes().get(0);
 
@@ -227,10 +252,14 @@ public KakaoRouteSectionFeResponse navigateOnlyGuides(
         int totalDuration = route.getSections().stream()
                 .mapToInt(KakaoRouteTransitResponse.Section::getDuration)
                 .sum();
-
+        int totalTaxi = 0;
+        if (summary.getFare() != null) {
+            totalTaxi = summary.getFare().getTaxi();
+        }
         return new KakaoRouteSectionFeResponse(
                 totalDistance,
                 totalDuration,
+                totalTaxi,
                 sections
         );
     }

src/main/java/com/back/web7_9_codecrete_be/domain/location/controller/TmapApiController.java

@@ -42,7 +42,40 @@ public class TmapApiController {
                     )
             )
     )
-    @GetMapping("/tmap/transit")
+    @GetMapping("/tmap/summary")
+    public TmapSummaryAllResponse getSummary(
+
+            @Parameter(
+                    description = "출발지 경도 (longitude)",
+                    example = "126.9780",
+                    required = true
+            )
+            @RequestParam double startX,
+
+            @Parameter(
+                    description = "출발지 위도 (latitude)",
+                    example = "37.5665",
+                    required = true
+            )
+            @RequestParam double startY,
+
+            @Parameter(
+                    description = "도착지 경도 (longitude)",
+                    example = "127.0276",
+                    required = true
+            )
+            @RequestParam double endX,
+
+            @Parameter(
+                    description = "도착지 위도 (latitude)",
+                    example = "37.4979",
+                    required = true
+            )
+            @RequestParam double endY
+    ) {
+        return tmapService.getSummaryRoute(startX, startY, endX, endY);
+    }
+    @GetMapping("/tmap/route")
     public String getTransit(
 
             @Parameter(
@@ -75,7 +108,6 @@ public String getTransit(
     ) {
         return tmapService.getRoute(startX, startY, endX, endY);
     }
-
     @Operation(
             summary = "Tmap 도보만 경로 요약",
             description = "출발지와 도착지 좌표를 기준으로 Tmap 도보 경로의 총 거리와 소요 시간을 반환합니다."

src/main/java/com/back/web7_9_codecrete_be/domain/location/dto/fe/KakaoRouteSectionFeResponse.java

@@ -17,6 +17,9 @@ public class KakaoRouteSectionFeResponse {
     @Schema(description = "전체 소요 시간 (second)", example = "3200")
     private int totalDuration;
 
+    @Schema(description = "택시비", example = "12000")
+    private  int totalTaxi;         //택시비 추가
+
     @Schema(description = "구간(section) 목록")
     private List<KakaoRouteFeResponse> sections;
 }

src/main/java/com/back/web7_9_codecrete_be/domain/location/dto/response/kakao/KakaoMobilityResponse.java

@@ -35,8 +35,17 @@ public static class Summary {
 
         @Schema(description = "총 소요 시간 (second)", example = "540")
         private int duration;
+
+        @Schema(description = "요금 정보")
+        private Fare fare;
     }
+    @Getter
+    @Schema(description = "요금 정보")
+    public static class Fare {
 
+        @Schema(description = "택시 요금 (원)", example = "12000")
+        private int taxi;
+    }
     @Getter
     @Schema(description = "경로 구간")
     public static class Section {

src/main/java/com/back/web7_9_codecrete_be/domain/location/service/KakaoLocalService.java

@@ -29,8 +29,8 @@ public List<KakaoLocalResponse.Document> searchNearbyRestaurants(double lat, dou
                         .path("/v2/local/search/keyword.json")
                         .queryParam("query", "음식점")
                         .queryParam("category_group_code", "FD6")
-                        .queryParam("y", lat)
                         .queryParam("x", lng)
+                        .queryParam("y", lat)
                         .queryParam("radius", 1000)  // 반경 1km
                         .queryParam("sort", "distance")
                         .build()
@@ -48,8 +48,8 @@ public List<KakaoLocalResponse.Document> searchNearbyCafes(double lat, double ln
                         .path("/v2/local/search/keyword.json")
                         .queryParam("query", "카페")
                         .queryParam("category_group_code", "CE7")
-                        .queryParam("y", lat)
                         .queryParam("x", lng)
+                        .queryParam("y", lat)
                         .queryParam("radius", 1000)  // 반경 1km
                         .queryParam("sort", "distance")
                         .build()