nosu
/
taskana
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

TSK-1770: Made Paging not max page, when requesting page>maxPage

This commit is contained in:
Tristan 2022-01-04 11:04:26 +01:00 committed by Tristan2357
parent 0eb85565bc
commit 38ecaec5ab
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/QueryPagingParameter.java
View File

@ -56,7 +56,7 @@ public class QueryPagingParameter<T, Q extends BaseQuery<T, ?>>
if (page != null) {
long totalElements = query.count();
long maxPages = (long) Math.ceil(totalElements / pageSize.doubleValue());
pageMetadata = new PageMetadata(pageSize, totalElements, maxPages, Math.min(page, maxPages));
pageMetadata = new PageMetadata(pageSize, totalElements, maxPages, page);
}
}
}

4
rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java
View File

@ -76,9 +76,9 @@ class WorkbasketAccessItemControllerIntTest {
}
@Test
void testGetSecondPageSortedByWorkbasketKey() {
void should_GetSortedAccessItems_When_OrderingByWorkbasketKey() {
String parameters =
"?sort-by=WORKBASKET_KEY&order=ASCENDING&page=2&page-size=9&access-id=user-1-1";
"?sort-by=WORKBASKET_KEY&order=ASCENDING&page=1&page-size=9&access-id=user-1-1";
String url = restHelper.toUrl(RestEndpoints.URL_WORKBASKET_ACCESS_ITEMS) + parameters;
HttpEntity<Object> auth = new HttpEntity<>(RestHelper.generateHeadersForUser("teamlead-1"));