Marmelator/search-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 33 Wiki Activity

RED-2175, RED-2472: Backported search fixes

Browse Source
This commit is contained in:
Dominique Eifländer 2021-10-18 14:28:02 +02:00
parent c503d1bb93
commit 94e4d1e630
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java
View File

@ -92,9 +92,9 @@ public class SearchService {
sectionsQueries.should(textPhraseQuery);
}
for (String should : query.getShoulds()) {
QueryBuilder textTermQuery = QueryBuilders.termQuery("sections.text", should.toLowerCase(Locale.ROOT))
QueryBuilder textTermQuery = QueryBuilders.matchPhraseQuery("sections.text", should.toLowerCase(Locale.ROOT))
.queryName(should);
QueryBuilder filenameTermQuery = QueryBuilders.termQuery("filename", should.toLowerCase(Locale.ROOT))
QueryBuilder filenameTermQuery = QueryBuilders.matchPhraseQuery("filename", should.toLowerCase(Locale.ROOT))
.queryName("filename." + should);
entireQuery.should(textTermQuery);
entireQuery.should(filenameTermQuery);
@ -109,6 +109,9 @@ public class SearchService {
entireQuery.should(nestedQuery);
}
BoolQueryBuilder filterQuery = QueryBuilders.boolQuery();
if (dossierTemplateIds != null && !dossierTemplateIds.isEmpty()) {
var dossierTemplateIdQueryBuilder = QueryBuilders.boolQuery();
@ -117,7 +120,7 @@ public class SearchService {
dossierTemplateIdQueryBuilder = dossierTemplateIdQueryBuilder.should(QueryBuilders.matchQuery("dossierTemplateId", dossierTemplateId));
}
entireQuery.filter(dossierTemplateIdQueryBuilder);
filterQuery.must(dossierTemplateIdQueryBuilder);
}
if (dossierIds != null && !dossierIds.isEmpty()) {
@ -128,15 +131,15 @@ public class SearchService {
dossierIdQueryBuilder = dossierIdQueryBuilder.should(QueryBuilders.matchQuery("dossierId", dossierId));
}
entireQuery.filter(dossierIdQueryBuilder);
filterQuery.must(dossierIdQueryBuilder);
}
if (fileId != null) {
entireQuery.filter(QueryBuilders.matchQuery("fileId", fileId));
filterQuery.must(QueryBuilders.matchQuery("fileId", fileId));
}
return entireQuery;
return QueryBuilders.boolQuery().filter(filterQuery).must(entireQuery);
}