Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: ngram 누락 파일 추가 #201

Merged
merged 5 commits into from
Jan 10, 2024
Merged

feat: ngram 누락 파일 추가 #201

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a11692c
fix: 공연장 좌석 읽어오지 못하는 오류 수정, 공연장 좌석-공연장 연관관계 설정 메소드 추가
KarmaPol Jan 10, 2024
f6aa9e7
fix: #189 공연장 좌석 없을 경우 null 체크 조건 추가
KarmaPol Jan 10, 2024
19fc50a
feat: #194 엔그램 토크나이저 적용, 모델어트리뷰트 에러 핸들링 추가
KarmaPol Jan 10, 2024
e1dd08c
feat: #194 ngram 설정 누락파일 추가
KarmaPol Jan 10, 2024
675f736
Merge branch 'main' into event/194
park0jae Jan 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 24 additions & 34 deletions ...re-infra-es/src/main/java/com/pgms/coreinfraes/repository/EventSearchQueryRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,21 @@
package com.pgms.coreinfraes.repository;

import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch._types.Script;
import co.elastic.clients.elasticsearch._types.ScriptLanguage;
import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
import co.elastic.clients.elasticsearch._types.aggregations.AggregationBuilders;
import co.elastic.clients.elasticsearch._types.aggregations.StringTermsBucket;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.*;
import co.elastic.clients.json.JsonData;
import com.pgms.coreinfraes.document.AccessLogDocument;
import com.pgms.coreinfraes.document.EventDocument;
import com.pgms.coreinfraes.dto.EventDocumentResponse;
import com.pgms.coreinfraes.dto.EventKeywordSearchDto;
import com.pgms.coreinfraes.dto.TopTenSearchResponse;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.elasticsearch.client.elc.ElasticsearchAggregations;
Expand All @@ -18,34 +27,15 @@
import org.springframework.data.elasticsearch.core.SearchHits;
import org.springframework.data.elasticsearch.core.document.Document;
import org.springframework.data.elasticsearch.core.mapping.IndexCoordinates;
import org.springframework.data.elasticsearch.core.query.FetchSourceFilter;
import org.springframework.data.elasticsearch.core.query.ScriptData;
import org.springframework.data.elasticsearch.core.query.ScriptedField;
import org.springframework.data.elasticsearch.core.query.SourceFilter;
import org.springframework.data.elasticsearch.core.query.UpdateQuery;
import org.springframework.data.elasticsearch.core.query.*;
import org.springframework.stereotype.Repository;

import com.pgms.coreinfraes.document.AccessLogDocument;
import com.pgms.coreinfraes.document.EventDocument;
import com.pgms.coreinfraes.dto.EventDocumentResponse;
import com.pgms.coreinfraes.dto.EventKeywordSearchDto;
import com.pgms.coreinfraes.dto.TopTenSearchResponse;

import co.elastic.clients.elasticsearch._types.FieldValue;
import co.elastic.clients.elasticsearch._types.Script;
import co.elastic.clients.elasticsearch._types.ScriptLanguage;
import co.elastic.clients.elasticsearch._types.aggregations.Aggregation;
import co.elastic.clients.elasticsearch._types.aggregations.AggregationBuilders;
import co.elastic.clients.elasticsearch._types.aggregations.StringTermsBucket;
import co.elastic.clients.elasticsearch._types.query_dsl.FieldValueFactorModifier;
import co.elastic.clients.elasticsearch._types.query_dsl.FieldValueFactorScoreFunction;
import co.elastic.clients.elasticsearch._types.query_dsl.FunctionScore;
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
import co.elastic.clients.elasticsearch._types.query_dsl.TermsQueryField;
import co.elastic.clients.json.JsonData;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.time.temporal.ChronoUnit;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;

@Slf4j
@Repository
Expand Down Expand Up @@ -161,7 +151,7 @@ private NativeQuery getKeywordSearchNativeQuery(EventKeywordSearchDto eventKeywo

Query multiQuery = QueryBuilders.multiMatch()
.query(eventKeywordSearchDto.keyword())
.fields("title^1", "title_chosung^1", "description^1", "genreType^1")
.fields("title.ngram^1", "title_chosung^1", "description^1", "genreType^1")
.minimumShouldMatch(MINIMUM_SHOULD_MATCH_PERCENTAGE)
.build()._toQuery();

Expand Down
13 changes: 11 additions & 2 deletions core/core-infra-es/src/main/resources/es/event-mapping.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,19 @@
},
"title": {
"type": "text",
"analyzer": "korean",
"copy_to": [
"title_chosung"
]
],
"fields" : {
"kor" : {
"type": "text",
"analyzer": "korean"
},
"ngram" : {
"type": "text",
"analyzer": "ngram_analyzer"
}
}
},
"title_chosung": {
"type": "text",
Expand Down
20 changes: 20 additions & 0 deletions core/core-infra-es/src/main/resources/es/event-setting.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,16 @@
{
"index" : {
"max_ngram_diff": 5
},
"analysis": {
"analyzer": {
"korean": {
"type": "nori"
},
"ngram_analyzer" : {
"type": "custom",
"tokenizer" : "my_ngram"
},
"chosung": {
"type": "custom",
"tokenizer": "standard",
Expand All @@ -12,6 +19,19 @@
"hanhinsam_chosung"
]
}
},
"tokenizer": {
"my_ngram": {
"type": "ngram",
"min_gram": "2",
"max_gram": "5",
"token_chars": [
"letter",
"digit",
"whitespace",
"punctuation"
]
}
}
}
}