From 38ecaec5ab3665e50a2c9ae6f4c24d85a219916d Mon Sep 17 00:00:00 2001
From: Tristan <19949441+Tristan2357@users.noreply.github.com>
Date: Tue, 4 Jan 2022 11:04:26 +0100
Subject: [PATCH] TSK-1770: Made Paging not max page, when requesting
 page>maxPage

---
 .../java/pro/taskana/common/rest/QueryPagingParameter.java    | 2 +-
 .../rest/WorkbasketAccessItemControllerIntTest.java           | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/QueryPagingParameter.java b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/QueryPagingParameter.java
index 914f9e80c..7129fcf56 100644
--- a/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/QueryPagingParameter.java
+++ b/rest/taskana-rest-spring/src/main/java/pro/taskana/common/rest/QueryPagingParameter.java
@@ -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);
     }
   }
 }
diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java
index ea690d9e6..e8d0c43a4 100644
--- a/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java
+++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/workbasket/rest/WorkbasketAccessItemControllerIntTest.java
@@ -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"));