valitydev/deanonimus
14
0
Fork 0
mirror of https://github.com/valitydev/deanonimus.git synced 2024-11-06 02:05:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Del nested query (#38)

Browse Source
This commit is contained in:
malkoas 2023-11-28 11:36:33 +03:00 committed by GitHub
parent 0c72fda474
commit 226d80b352
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 35 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
src/main/java/dev/vality/deanonimus/db/SearchDaoImpl.java
View File

@ -5,13 +5,14 @@ import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.opensearch.client.opensearch.OpenSearchClient;
import org.opensearch.client.opensearch._types.query_dsl.*;
import org.opensearch.client.opensearch._types.query_dsl.BoolQuery;
import org.opensearch.client.opensearch._types.query_dsl.MultiMatchQuery;
import org.opensearch.client.opensearch._types.query_dsl.Query;
import org.opensearch.client.opensearch._types.query_dsl.TextQueryType;
import org.opensearch.client.opensearch.core.SearchResponse;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;
import static dev.vality.deanonimus.constant.OpenSearchConstants.*;
@Slf4j
@Component
@RequiredArgsConstructor
@ -44,33 +45,27 @@ public class SearchDaoImpl implements SearchDao {
}
private Query searchContractorFields(String text) {
return new NestedQuery.Builder()
.path(CONTRACTOR_INDEX)
.query(new Query(new MultiMatchQuery.Builder()
.fields("contractors.id",
"contractors.registeredUserEmail",
"contractors.russianLegalEntityRegisteredName",
"contractors.russianLegalEntityInn",
"contractors.russianLegalEntityRussianBankAccount",
"contractors.internationalLegalEntityLegalName",
"contractors.internationalLegalEntityTradingName")
.query(text)
.type(TextQueryType.Phrase)
.build()))
.build().query();
return new Query(new MultiMatchQuery.Builder()
.fields("contractors.id",
"contractors.registeredUserEmail",
"contractors.russianLegalEntityRegisteredName",
"contractors.russianLegalEntityInn",
"contractors.russianLegalEntityRussianBankAccount",
"contractors.internationalLegalEntityLegalName",
"contractors.internationalLegalEntityTradingName")
.query(text)
.type(TextQueryType.Phrase)
.build());
}
private Query searchContractFields(String text) {
return new NestedQuery.Builder()
.path(CONTRACT_INDEX)
.query(new Query(new MultiMatchQuery.Builder()
.fields("contracts.id",
"contracts.legalAgreementId",
"contracts.reportActSignerFullName")
.query(text)
.type(TextQueryType.Phrase)
.build()))
.build().query();
return new Query(new MultiMatchQuery.Builder()
.fields("contracts.id",
"contracts.legalAgreementId",
"contracts.reportActSignerFullName")
.query(text)
.type(TextQueryType.Phrase)
.build());
}
private Query searchPartyFields(String text) {
@ -83,28 +78,22 @@ public class SearchDaoImpl implements SearchDao {
}
private Query searchShopFields(String text) {
return new NestedQuery.Builder()
.path(SHOP_INDEX)
.query(new Query(new MultiMatchQuery.Builder()
.fields("shops.id",
"shops.locationUrl",
"shops.detailsName")
.query(text)
.type(TextQueryType.Phrase)
.build()))
.build().query();
return new Query(new MultiMatchQuery.Builder()
.fields("shops.id",
"shops.locationUrl",
"shops.detailsName")
.query(text)
.type(TextQueryType.Phrase)
.build());
}
private Query searchWalletFields(String text) {
return new NestedQuery.Builder()
.path(WALLET_INDEX)
.query(new Query(new MultiMatchQuery.Builder()
.fields("wallets.id",
"wallets.name")
.query(text)
.type(TextQueryType.Phrase)
.build()))
.build().query();
return new Query(new MultiMatchQuery.Builder()
.fields("wallets.id",
"wallets.name")
.query(text)
.type(TextQueryType.Phrase)
.build());
}
}