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

changed search API params to page and pagesize

Browse Source
This commit is contained in:
Timo Bejan 2021-07-29 10:52:36 +03:00
parent 1389dcd8a7
commit ead3a461fb
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
search-service-v1/search-service-api-v1/src/main/java/com/iqser/red/service/search/v1/model/SearchRequest.java
View File

@ -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;
}

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

@ -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());
}
}

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

@ -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);