Merge branch 'develop' into docs/PRODUCT-146

# Conflicts:
#	src/test/java/eatda/document/BaseDocumentTest.java

Author: leegwichan

build.gradle

@@ -27,8 +27,8 @@ jacoco {
 
 sonarqube {
     properties {
-        property "sonar.projectKey", "baegam_eatda"
-        property "sonar.organization", "baegam"
+        property "sonar.projectKey", "YAPP-Github_26th-Web-Team-1-BE"
+        property "sonar.organization", "yapp-github"
         property "sonar.host.url", "https://sonarcloud.io"
         property 'sonar.sourceEncoding', 'UTF-8'
         property 'sonar.java.coveragePlugin', 'jacoco'
@@ -85,6 +85,7 @@ dependencies {
 
     // aws
     implementation 'io.awspring.cloud:spring-cloud-aws-starter-parameter-store:3.2.1'
+    implementation 'software.amazon.awssdk:s3:2.31.77'
 }
 
 bootJar {

src/main/java/eatda/client/map/KakaoProperties.java

@@ -0,0 +1,22 @@
+package eatda.client.map;
+
+import lombok.Getter;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@Getter
+@ConfigurationProperties(prefix = "kakao")
+public class KakaoProperties {
+
+    private final String apiKey;
+
+    public KakaoProperties(String apiKey) {
+        validateApiKey(apiKey);
+        this.apiKey = apiKey;
+    }
+
+    private void validateApiKey(String apiKey) {
+        if (apiKey == null || apiKey.isBlank()) {
+            throw new IllegalArgumentException("API key must not be null or blank");
+        }
+    }
+}

src/main/java/eatda/client/map/MapClient.java

@@ -0,0 +1,41 @@
+package eatda.client.map;
+
+import eatda.domain.store.Coordinates;
+import java.util.List;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.http.HttpStatusCode;
+import org.springframework.stereotype.Component;
+import org.springframework.web.client.RestClient;
+
+@Component
+@EnableConfigurationProperties(KakaoProperties.class)
+public class MapClient {
+
+    private final RestClient restClient;
+    private final KakaoProperties kakaoProperties;
+
+    public MapClient(RestClient.Builder restClient, KakaoProperties properties) {
+        this.restClient = restClient
+                .defaultStatusHandler(HttpStatusCode::is5xxServerError, new MapServerErrorHandler())
+                .build();
+        this.kakaoProperties = properties;
+    }
+
+    public List<StoreSearchResult> searchShops(String query) {
+        return restClient.get()
+                .uri("https://dapi.kakao.com/v2/local/search/keyword.json", builder -> builder
+                        .queryParam("query", query)
+                        .queryParam("category", "FD6")
+                        .queryParam("rect", "%s,%s,%s,%s".formatted(
+                                Coordinates.getMinLongitude(), Coordinates.getMinLatitude(),
+                                Coordinates.getMaxLongitude(), Coordinates.getMaxLatitude()))
+                        .queryParam("page", 1)
+                        .queryParam("size", 15)
+                        .queryParam("sort", "accuracy")
+                        .build())
+                .header("Authorization", "KakaoAK " + kakaoProperties.getApiKey())
+                .retrieve()
+                .body(StoreSearchResults.class)
+                .results();
+    }
+}

src/main/java/eatda/client/map/MapServerErrorHandler.java

@@ -0,0 +1,16 @@
+package eatda.client.map;
+
+import eatda.exception.BusinessErrorCode;
+import eatda.exception.BusinessException;
+import java.io.IOException;
+import org.springframework.http.HttpRequest;
+import org.springframework.http.client.ClientHttpResponse;
+import org.springframework.web.client.RestClient.ResponseSpec.ErrorHandler;
+
+public class MapServerErrorHandler implements ErrorHandler {
+
+    @Override
+    public void handle(HttpRequest request, ClientHttpResponse response) throws IOException {
+        throw new BusinessException(BusinessErrorCode.MAP_SERVER_ERROR);
+    }
+}

src/main/java/eatda/client/map/StoreSearchResult.java

@@ -0,0 +1,30 @@
+package eatda.client.map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record StoreSearchResult(
+        @JsonProperty("id") String kakaoId,
+        @JsonProperty("category_group_code") String categoryGroupCode,
+        @JsonProperty("category_name") String categoryName,
+        @JsonProperty("phone") String phoneNumber,
+        @JsonProperty("place_name") String name,
+        @JsonProperty("place_url") String placeUrl,
+        @JsonProperty("address_name") String lotNumberAddress,
+        @JsonProperty("road_address_name") String roadAddress,
+        @JsonProperty("y") double latitude,
+        @JsonProperty("x") double longitude
+) {
+
+    public boolean isFoodStore() {
+        return "FD6".equals(categoryGroupCode);
+    }
+
+    public boolean isInSeoul() {
+        if (lotNumberAddress == null || lotNumberAddress.isBlank()) {
+            return false;
+        }
+        return lotNumberAddress.trim().startsWith("서울");
+    }
+}

src/main/java/eatda/client/map/StoreSearchResults.java

@@ -0,0 +1,9 @@
+package eatda.client.map;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import java.util.List;
+
+@JsonIgnoreProperties(ignoreUnknown = true)
+public record StoreSearchResults(@JsonProperty("documents") List<StoreSearchResult> results) {
+}

src/main/java/eatda/controller/member/MemberController.java

@@ -1,7 +1,7 @@
 package eatda.controller.member;
 
 import eatda.controller.web.auth.LoginMember;
-import eatda.service.service.MemberService;
+import eatda.service.member.MemberService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;

src/main/java/eatda/controller/store/StoreController.java

@@ -0,0 +1,22 @@
+package eatda.controller.store;
+
+import eatda.controller.web.auth.LoginMember;
+import eatda.service.store.StoreService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+@RequiredArgsConstructor
+public class StoreController {
+
+    private final StoreService storeService;
+
+    @GetMapping("/api/shop/search")
+    public ResponseEntity<StoreSearchResponses> searchStore(@RequestParam String query, LoginMember member) {
+        StoreSearchResponses response = storeService.searchStores(query);
+        return ResponseEntity.ok(response);
+    }
+}

src/main/java/eatda/controller/store/StoreSearchResponse.java

@@ -0,0 +1,18 @@
+package eatda.controller.store;
+
+import eatda.client.map.StoreSearchResult;
+
+public record StoreSearchResponse(
+        String kakaoId,
+        String name,
+        String address
+) {
+
+    public StoreSearchResponse(StoreSearchResult searchResult) {
+        this(
+                searchResult.kakaoId(),
+                searchResult.name(),
+                searchResult.lotNumberAddress()
+        );
+    }
+}

src/main/java/eatda/controller/store/StoreSearchResponses.java

@@ -0,0 +1,14 @@
+package eatda.controller.store;
+
+import eatda.client.map.StoreSearchResult;
+import java.util.List;
+
+public record StoreSearchResponses(List<StoreSearchResponse> stores) {
+
+    public static StoreSearchResponses from(List<StoreSearchResult> searchResults) {
+        List<StoreSearchResponse> storeResponses = searchResults.stream()
+                .map(StoreSearchResponse::new)
+                .toList();
+        return new StoreSearchResponses(storeResponses);
+    }
+}