From 0c457c3b8b3764812bbbdd5b52715878e88a4ae0 Mon Sep 17 00:00:00 2001 From: Philipp Schramm Date: Mon, 20 Dec 2021 11:50:19 +0100 Subject: [PATCH] RED-2930: Pagination page starts with 0 --- .../v1/server/service/SearchService.java | 2 +- .../v1/server/service/IndexCreatorTest.java | 26 +++++++++---------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java index 4005697..6120587 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/service/SearchService.java @@ -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")) diff --git a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexCreatorTest.java b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexCreatorTest.java index 5412a1e..91bdcc2 100644 --- a/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexCreatorTest.java +++ b/search-service-v1/search-service-server-v1/src/test/java/com/iqser/red/service/search/v1/server/service/IndexCreatorTest.java @@ -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);