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

Pull request #26: RED-2930: Pagination page starts with 0

Browse Source 
Merge in RED/search-service from RED-2930 to master

* commit '0c457c3b8b3764812bbbdd5b52715878e88a4ae0':
  RED-2930: Pagination page starts with 0
This commit is contained in:
Philipp Schramm 2021-12-20 11:58:20 +01:00
commit cb0fa5b304
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ public class SearchService {
Query query = QueryStringConverter.convert(queryString);
SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(convertQuery(query, dossierTemplateIds, dossierIds, fileId, returnSections))
.from((page - 1) * pageSize)
.from(page * pageSize)
.size(pageSize)
.fetchSource(new String[]{"dossierId", "fileId"}, new String[]{"sections"})
.highlighter(new HighlightBuilder().field("sections.text").field("filename").highlighterType("fvh"))

26
search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexCreatorTest.java
View File

@ -59,7 +59,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template2", "dossierId2", "fileId2", "S-Metolachlor_RAR_01_Volume_1_2018-09-06.pdf", text2);
// Act & Assert 1
SearchResult result = searchService.search("S-Metolachlor", null, Arrays.asList("dossierId1", "dossierId2"), null, 1, 10, false);
SearchResult result = searchService.search("S-Metolachlor", null, Arrays.asList("dossierId1", "dossierId2"), null, 0, 10, false);
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -67,17 +67,17 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentDeleteService.deleteDocument("fileId1");
// Act & Assert 2
result = searchService.search("hans klaus single", null, Arrays.asList("dossierId1", "dossierId2"), null, 1, 10, true);
result = searchService.search("hans klaus single", null, Arrays.asList("dossierId1", "dossierId2"), null, 0, 10, true);
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
// Act & Assert 3
result = searchService.search("hans klaus single", null, Arrays.asList("dossierId3", "dossierId4"), null, 1, 10, true);
result = searchService.search("hans klaus single", null, Arrays.asList("dossierId3", "dossierId4"), null, 0, 10, true);
assertThat(result.getMatchedDocuments().size()).isEqualTo(0);
// Act & Assert 4
result = searchService.search("hans klaus single", Arrays.asList("template1", "template2"), null, null, 1, 10, true);
result = searchService.search("hans klaus single", Arrays.asList("template1", "template2"), null, null, 0, 10, true);
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -117,7 +117,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -139,7 +139,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -162,7 +162,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -184,7 +184,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -207,7 +207,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -230,7 +230,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -253,7 +253,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -276,7 +276,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);
@ -298,7 +298,7 @@ public class IndexCreatorTest extends AbstractElasticsearchIntegrationTest {
documentIndexService.indexDocument("template1", "dossierId1", "fileId1", fileName, text);
// Act
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 1, 10, true);
SearchResult result = searchService.search(searchString, null, Arrays.asList("dossierId1"), null, 0, 10, true);
// Assert
assertThat(result.getMatchedDocuments().size()).isEqualTo(1);