diff --git a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/SearchRequest.java b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/SearchRequest.java index 0ef0324..36e062a 100644 --- a/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/SearchRequest.java +++ b/search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/SearchRequest.java @@ -14,8 +14,8 @@ public class SearchRequest { private String queryString; private String dossierId; private String fileId; - private Integer from; - private Integer size; + private int page; + private int pageSize; private boolean returnSections; } diff --git a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/controller/SearchController.java b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/controller/SearchController.java index 0f90a7b..517c497 100644 --- a/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/controller/SearchController.java +++ b/search-service-v1/search-service-server-v1/src/main/java/com/iqser/red/service/search/v1/server/controller/SearchController.java @@ -20,7 +20,7 @@ public class SearchController implements SearchResource { public SearchResult getDossierStatus(@RequestBody SearchRequest searchRequest) { return searchService.search(searchRequest.getQueryString(), searchRequest.getDossierId(), searchRequest.getFileId(), searchRequest - .getFrom(), searchRequest.getSize(), searchRequest.isReturnSections()); + .getPage(), searchRequest.getPageSize(), searchRequest.isReturnSections()); } } 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 43747c9..122e842 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 @@ -48,14 +48,14 @@ public class SearchService { private final ElasticsearchClient client; - public SearchResult search(String queryString, String dossierId, String fileId, Integer from, Integer size, + public SearchResult search(String queryString, String dossierId, String fileId, int page, int pageSize, boolean returnSections) { Query query = QueryStringConverter.convert(queryString); SearchSourceBuilder searchSourceBuilder = new SearchSourceBuilder().query(convertQuery(query, dossierId, fileId, returnSections)) - .from(from) - .size(size) + .from((page-1)*pageSize) + .size(pageSize) .fetchSource(new String[]{"dossierId", "fileId"}, new String[]{"sections"}) .highlighter(new HighlightBuilder().field("sections.text").field("filename").highlighterType("fvh")) .trackScores(true);