현재 3글자단어는 1,2글자만 가능한 상태

inje-megabrain · Jun 4, 2024 · 52264af · 52264af
1 parent 178ad00
commit 52264af
Show file tree

Hide file tree

Showing 11 changed files with 29 additions and 16 deletions.
diff --git a/.gradle/7.2/executionHistory/executionHistory.bin b/.gradle/7.2/executionHistory/executionHistory.bin
diff --git a/.gradle/7.2/executionHistory/executionHistory.lock b/.gradle/7.2/executionHistory/executionHistory.lock
diff --git a/.gradle/7.2/fileHashes/fileHashes.bin b/.gradle/7.2/fileHashes/fileHashes.bin
diff --git a/.gradle/7.2/fileHashes/fileHashes.lock b/.gradle/7.2/fileHashes/fileHashes.lock
diff --git a/.gradle/7.2/fileHashes/resourceHashesCache.bin b/.gradle/7.2/fileHashes/resourceHashesCache.bin
diff --git a/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/.gradle/buildOutputCleanup/buildOutputCleanup.lock
diff --git a/src/main/generated/com/example/just/Mapper/MemberMapperImpl.java b/src/main/generated/com/example/just/Mapper/MemberMapperImpl.java
@@ -10,7 +10,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-06-03T09:49:05+0900",
+    date = "2024-06-04T15:55:41+0900",
     comments = "version: 1.5.3.Final, compiler: IncrementalProcessingEnvironment from gradle-language-java-7.2.jar, environment: Java 11.0.11 (AdoptOpenJDK)"
 )
 @Component

diff --git a/src/main/generated/com/example/just/Mapper/PostMapperImpl.java b/src/main/generated/com/example/just/Mapper/PostMapperImpl.java
@@ -10,7 +10,7 @@
 
 @Generated(
     value = "org.mapstruct.ap.MappingProcessor",
-    date = "2024-06-03T09:49:06+0900",
+    date = "2024-06-04T15:55:41+0900",
     comments = "version: 1.5.3.Final, compiler: IncrementalProcessingEnvironment from gradle-language-java-7.2.jar, environment: Java 11.0.11 (AdoptOpenJDK)"
 )
 @Component

diff --git a/src/main/java/com/example/just/Repository/PostContentESRespository.java b/src/main/java/com/example/just/Repository/PostContentESRespository.java
@@ -13,7 +13,7 @@
 public interface PostContentESRespository extends ElasticsearchRepository<PostDocument,Long>,
         CrudRepository<PostDocument,Long> {
 //    List<PostDocument> findByPostContent_ContentContains(String text);
-    //    List<PostDocument> findByPostContent_ContentContains(String text);
+//        List<PostDocument> findByPostContent_ContentContains(String text);
 
     //해당 text문자열을 하나라도 포함하는 게시글 전제조회(ELK)
     List<PostDocument> findByPostContentContaining(String text);

diff --git a/src/main/java/com/example/just/Service/SearchService.java b/src/main/java/com/example/just/Service/SearchService.java
@@ -15,13 +15,19 @@
 import java.util.Comparator;
 import java.util.List;
 import java.util.stream.Collectors;
+import javax.management.Query;
 import javax.servlet.http.HttpServletRequest;
+import org.elasticsearch.index.query.QueryBuilders;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Sort;
 import org.springframework.data.domain.Sort.Direction;
+import org.springframework.data.elasticsearch.core.ElasticsearchRestTemplate;
+import org.springframework.data.elasticsearch.core.SearchHits;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQuery;
+import org.springframework.data.elasticsearch.core.query.NativeSearchQueryBuilder;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
@@ -47,6 +53,12 @@ public class SearchService { //검색(ELK) 관련 서비스
     @Autowired
     MemberRepository memberRepository;
 
+    private final ElasticsearchRestTemplate elasticsearchRestTemplate;
+
+    public SearchService(ElasticsearchRestTemplate elasticsearchRestTemplate) {
+        this.elasticsearchRestTemplate = elasticsearchRestTemplate;
+    }
+
 
     //게시글 내용 검색
     public ResponseEntity searchPostContent(HttpServletRequest request,String keyword,int page){
@@ -69,7 +81,16 @@ public ResponseEntity searchPostContent(HttpServletRequest request,String keywor
                 .collect(Collectors.toList());
 
         //검색한 키워드를 내용에 포함하는 게시글 리스트 조회
-        List<PostDocument> searchList = postContentESRespository.findByPostContentContaining(keyword);
+//        List<PostDocument> searchList = postContentESRespository.findByPostContentContaining(keyword);
+        NativeSearchQuery query = new NativeSearchQueryBuilder()
+                .withQuery(QueryBuilders.wildcardQuery("postContent", "*"+keyword+"*"))
+//                .withQuery(QueryBuilders.matchQuery("postContent", keyword))
+                .build();
+
+        SearchHits<PostDocument> searchHits = elasticsearchRestTemplate.search(query, PostDocument.class);
+
+        List<PostDocument> searchList = new ArrayList<>();
+        searchHits.forEach(searchHit -> searchList.add(searchHit.getContent()));
         //검색한 키워드를 포함하는 게시글이 없을 경우
         if(searchList.isEmpty()){
             return new ResponseEntity(new ResponseMessage("해당 내용을 포함하는 게시글이 존재하지 않습니다."),

diff --git a/src/main/resources/elastic/post-setting.json b/src/main/resources/elastic/post-setting.json
@@ -1,23 +1,15 @@
 {
   "analysis": {
     "tokenizer": {
-      "nori_none": {
+      "nori_tokenizer": {
         "type": "nori_tokenizer",
-        "decompound_mode": "none"
-      },
-      "nori_discard": {
-        "type": "nori_tokenizer",
-        "decompound_mode": "discard"
-      },
-      "nori_mixed": {
-        "type": "nori_tokenizer",
-        "decompound_mo  de": "mixed"
+        "decompound_mode": "mixed"
       }
     },
     "analyzer": {
       "korean": {
-        "type": "nori",
-        "stopwords": "_korean_"
+        "type": "custom",
+        "tokenizer": "nori_tokenizer"
       }
     }
   }