feat: commit을 위한 commit

Author: tobbot16

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

@@ -42,7 +42,7 @@ public class KakaoApiController {
     @Operation(
             summary = "주변 음식점 조회",
             description = "좌표(서울 시청 근처)로 카카오 로컬에서 주변 음식점을 조회합니다, 좌표는 입력하면 됩니다." +
-                    "예시 : http://localhost:8080/api/v1/location/kakao/restaurant?lat=37.5665&lon=126.9780"
+                    "예시 : http://localhost:8080/api/v1/location/kakao/restaurant?x=126.9780&y=37.5665&"
     )
     @PostMapping("/restaurant")
     public List<KakaoLocalResponse.Document> KakaoRestaurants(
@@ -56,7 +56,7 @@ public List<KakaoLocalResponse.Document> KakaoRestaurants(
     @Operation(
             summary = "주변 카페 조회",
             description = "좌표(서울 시청 근처)로 카카오 로컬에서 주변 카페를 조회합니다, 좌표는 입력하면 됩니다." +
-                    "예시 : http://localhost:8080/api/v1/location/kakao/cafes?lat=37.5665&lon=126.9780"
+                    "예시 : http://localhost:8080/api/v1/location/kakao/cafes?x=126.9780&y=37.5665"
     )
     @PostMapping("/cafes")
     public List<KakaoLocalResponse.Document> KakaoCafes(

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

@@ -9,7 +9,11 @@
 import com.back.web7_9_codecrete_be.global.error.code.LocationErrorCode;
 import com.back.web7_9_codecrete_be.global.error.exception.BusinessException;
 import lombok.RequiredArgsConstructor;
+import org.springframework.retry.annotation.Backoff;
+import org.springframework.retry.annotation.Retryable;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.HttpServerErrorException;
+import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestClient;
 
 import java.util.List;
@@ -22,15 +26,23 @@ public class KakaoLocalService {
     private final RestClient kakaoMobilityClient;
 
     // 해당 좌표의 1km 근방에 존재하는 음식점를 거리순으로 나타냄
+    @Retryable(     //최초 1번, 재시도 2번 시도
+            retryFor = {HttpServerErrorException.class, ResourceAccessException.class},     //외부 서버의 문제, 네트워크, 타임아웃 문제인 경우에 재시도
+            backoff = @Backoff(delay = 200, multiplier = 2.0)   //0.2초, 0.4초, 0.8초 순으로 재시도
+    )
     public List<KakaoLocalResponse.Document> searchNearbyRestaurants(double lat, double lng) {
-
+        //좌표의 소수점 숫자가 다르면 매번 다른 캐싱을 해야하니, 통일시켜줌
+        lat = Math.round(lat * 10000) / 10000.0;
+        lng = Math.round(lng * 10000) / 10000.0;
+        final double y = lat;
+        final double x = lng;
         return kakaoRestClient.get()
                 .uri(uriBuilder -> uriBuilder
                         .path("/v2/local/search/keyword.json")
                         .queryParam("query", "음식점")
                         .queryParam("category_group_code", "FD6")
-                        .queryParam("x", lng)
-                        .queryParam("y", lat)
+                        .queryParam("x", x)
+                        .queryParam("y", y)
                         .queryParam("radius", 1000)  // 반경 1km
                         .queryParam("sort", "distance")
                         .build()
@@ -41,15 +53,24 @@ public List<KakaoLocalResponse.Document> searchNearbyRestaurants(double lat, dou
     }
 
     // 해당 좌표의 1km 근방에 존재하는 카페를 거리순으로 나타냄
-    public List<KakaoLocalResponse.Document> searchNearbyCafes(double lat, double lng) {
-
+    @Retryable(     //최초 1번, 재시도 2번 시도
+            retryFor = {HttpServerErrorException.class, ResourceAccessException.class},     //외부 서버의 문제, 네트워크, 타임아웃 문제인 경우에 재시도
+            backoff = @Backoff(delay = 200, multiplier = 2.0)   //0.2초, 0.4초, 0.8초 순으로 재시도
+    )
+     public List<KakaoLocalResponse.Document> searchNearbyCafes(double lat, double lng) {
+
+        //좌표의 소수점 숫자가 다르면 매번 다른 캐싱을 해야하니, 통일시켜줌
+        lat = Math.round(lat * 10000) / 10000.0;
+        lng = Math.round(lng * 10000) / 10000.0;
+        final double y = lat;
+        final double x = lng;
         return kakaoRestClient.get()
                 .uri(uriBuilder -> uriBuilder
                         .path("/v2/local/search/keyword.json")
                         .queryParam("query", "카페")
                         .queryParam("category_group_code", "CE7")
-                        .queryParam("x", lng)
-                        .queryParam("y", lat)
+                        .queryParam("x", x)
+                        .queryParam("y", y)
                         .queryParam("radius", 1000)  // 반경 1km
                         .queryParam("sort", "distance")
                         .build()

src/main/java/com/back/web7_9_codecrete_be/global/config/RetryConfig.java

@@ -0,0 +1,9 @@
+package com.back.web7_9_codecrete_be.global.config;
+
+import org.springframework.context.annotation.Configuration;
+import org.springframework.retry.annotation.EnableRetry;
+
+@EnableRetry
+@Configuration
+public class RetryConfig {
+}

src/main/java/com/back/web7_9_codecrete_be/global/config/WebClientConfig.java

@@ -6,6 +6,7 @@
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.MediaType;
 import org.springframework.http.client.ClientHttpRequestInterceptor;
+import org.springframework.http.client.HttpComponentsClientHttpRequestFactory;
 import org.springframework.http.client.reactive.ReactorClientHttpConnector;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestTemplate;
@@ -70,7 +71,12 @@ public RestTemplate restTemplate() {
     @Bean
     public RestClient kakaoRestClient(){
 
+        HttpComponentsClientHttpRequestFactory factory = new HttpComponentsClientHttpRequestFactory();
+        factory.setConnectionRequestTimeout(3_000);
+        factory.setReadTimeout(5_000);
+
         return RestClient.builder()
+                .requestFactory(factory)
                 .baseUrl(kakaoBaseUrl)
                 .defaultHeader("Authorization", kakaomapApiKey)
                 .build();