feature elastic search

Author: shjk0531

build.gradle.kts

@@ -58,6 +58,7 @@ dependencies {
 
     // Elasticsearch
     implementation("org.springframework.boot:spring-boot-starter-data-elasticsearch")
+    implementation("co.elastic.clients:elasticsearch-java:8.17.2")
 
     // Docker
     //developmentOnly("org.springframework.boot:spring-boot-docker-compose")

src/main/java/com/ll/commars/domain/restaurant/restaurantDoc/controller/ApiV1RestaurantDocController.java

@@ -7,6 +7,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.*;
 
+import java.io.IOException;
 import java.util.List;
 import static org.springframework.http.MediaType.APPLICATION_JSON_VALUE;
 
@@ -34,8 +35,8 @@ public class ApiV1RestaurantDocController {
 
    @GetMapping("/search")
    @Operation(summary = "식당 검색")
-   public List<RestaurantDoc> search(@RequestParam("keyword") String keyword) {
-       return restaurantDocService.searchByKeyword(keyword);
+   public List<RestaurantDoc> search(@RequestParam("keyword") String keyword, @RequestParam("lat") String lat, @RequestParam("lng") String lng) throws IOException {
+       return restaurantDocService.searchByKeyword(keyword, Double.parseDouble(lat), Double.parseDouble(lng), "50km");
    }
 
    @GetMapping("/sort/rate")

src/main/java/com/ll/commars/domain/restaurant/restaurantDoc/document/RestaurantDoc.java

@@ -1,9 +1,12 @@
 package com.ll.commars.domain.restaurant.restaurantDoc.document;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.*;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.elasticsearch.annotations.*;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 @Document(indexName = "es_restaurants", createIndex = true)
 @Setting(settingPath = "elasticsearch/settings.json")
 @Mapping(mappingPath = "elasticsearch/mappings.json")
@@ -22,6 +25,7 @@ public class RestaurantDoc {
    @Field(type = FieldType.Text)
    private String details;
 
+   @JsonProperty("average_rate")
    @Field(name = "average_rate", type = FieldType.Double)
    private Double averageRate;
 

src/main/java/com/ll/commars/domain/restaurant/restaurantDoc/service/RestaurantDocService.java

@@ -1,16 +1,25 @@
 package com.ll.commars.domain.restaurant.restaurantDoc.service;
 
+import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch._types.GeoLocation;
+import co.elastic.clients.elasticsearch._types.LatLonGeoLocation;
+import co.elastic.clients.elasticsearch._types.query_dsl.*;
+import co.elastic.clients.elasticsearch.core.SearchRequest;
+import co.elastic.clients.elasticsearch.core.SearchResponse;
 import com.ll.commars.domain.restaurant.restaurantDoc.document.RestaurantDoc;
 import com.ll.commars.domain.restaurant.restaurantDoc.repository.RestaurantDocRepository;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.io.IOException;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
 public class RestaurantDocService {
    private final RestaurantDocRepository restaurantDocRepository;
+   private final ElasticsearchClient elasticsearchClient;
 
    public RestaurantDoc write(String name, String details, Double averageRate, Double lat, Double lng) {
        RestaurantDoc restaurantDoc = RestaurantDoc.builder()
@@ -27,11 +36,60 @@ public void truncate() {
        restaurantDocRepository.deleteAll();
    }
 
-   public List<RestaurantDoc> searchByKeyword(String keyword) {
-       return restaurantDocRepository.searchByKeyword(keyword);
-   }
+    public List<RestaurantDoc> searchByKeyword(String keyword, double userLat, double userLng, String distance) throws IOException {
+        Query matchNameQuery = MatchQuery.of(m -> m
+                .field("name")
+                .query(keyword)
+                .fuzziness("AUTO")
+        )._toQuery();
+
+        Query matchDetailsQuery = MatchQuery.of(m -> m
+                .field("details")
+                .query(keyword)
+                .fuzziness("AUTO")
+        )._toQuery();
+
+        // ✅ 사용자 위치 기준 반경 검색 (Geo Distance)
+        Query geoDistanceQuery = GeoDistanceQuery.of(g -> g
+                .field("location")  // ES의 GeoPoint 필드
+                .distance(distance) // 검색 반경 (예: "50km")
+                .location(GeoLocation.of(l -> l.latlon(LatLonGeoLocation.of(ll -> ll.lat(userLat).lon(userLng))))) // ✅ 수정된 부분
+        )._toQuery();
+
+        // 키워드 + 거리 필터 조합
+        Query boolQuery = BoolQuery.of(b -> b
+                .should(matchNameQuery)
+                .should(matchDetailsQuery)
+                .filter(geoDistanceQuery) // ✅ 거리 필터 추가
+        )._toQuery();
+
+        // Function Score Query (평점 높은 곳 우선)
+        FunctionScoreQuery functionScoreQuery = FunctionScoreQuery.of(f -> f
+                .query(boolQuery)
+                .functions(FunctionScore.of(fs -> fs
+                        .fieldValueFactor(FieldValueFactorScoreFunction.of(fv -> fv
+                                .field("average_rate")
+                                .factor(1.5)
+                                .modifier(FieldValueFactorModifier.Sqrt)
+                        ))
+                ))
+        );
+
+        // 검색 요청
+        SearchRequest searchRequest = SearchRequest.of(s -> s
+                .index("es_restaurants")
+                .query(functionScoreQuery._toQuery())
+        );
+
+        // 검색 실행
+        SearchResponse<RestaurantDoc> response = elasticsearchClient.search(searchRequest, RestaurantDoc.class);
+
+        return response.hits().hits().stream()
+                .map(hit -> hit.source())
+                .collect(Collectors.toList());
+    }
 
-   public List<RestaurantDoc> showSortByRate() {
+    public List<RestaurantDoc> showSortByRate() {
        return restaurantDocRepository.findAllByOrderByAverageRateDesc();
    }
 

src/main/resources/elasticsearch/mappings.json

@@ -2,18 +2,21 @@
   "properties": {
     "name": {
       "type": "text",
-      "analyzer": "korean"
+      "analyzer": "ngram_analyzer",
+      "search_analyzer": "korean_analyzer"
     },
     "body": {
       "type": "text",
-      "analyzer": "korean"
+      "analyzer": "ngram_analyzer",
+      "search_analyzer": "korean_analyzer"
     },
     "rate": {
       "type": "integer"
     },
     "details": {
       "type": "text",
-      "analyzer": "korean"
+      "analyzer": "ngram_analyzer",
+      "search_analyzer": "korean_analyzer"
     },
     "average_rate": {
       "type": "double"
@@ -22,4 +25,4 @@
       "type": "geo_point"
     }
   }
-}
+}

src/main/resources/elasticsearch/settings.json

@@ -13,12 +13,23 @@
             "nori_posfilter",
             "nori_readingform"
           ]
+        },
+        "ngram_analyzer": {
+          "type": "custom",
+          "tokenizer": "ngram_tokenizer",
+          "filter": ["lowercase"]
         }
       },
       "tokenizer": {
         "nori_tokenizer": {
           "type": "nori_tokenizer",
           "decompound_mode": "mixed"
+        },
+        "ngram_tokenizer": {
+          "type": "ngram",
+          "min_gram": 2,
+          "max_gram": 3,
+          "token_chars": ["letter", "digit"]
         }
       },
       "filter": {
@@ -29,6 +40,10 @@
             "SSC", "SSO", "SC", "SE", "XPN", "XSA",
             "XSN", "XSV", "UNA", "NA", "VSV"
           ]
+        },
+        "korean_stop": {
+          "type": "stop",
+          "stopwords": ["이", "그", "저", "그리고", "하지만"]
         }
       }
     }