Skip to content

Commit 159ea61

Browse files
Use 1 pased pagination and translate to and from alerts API (#756)
1 parent 9b846a2 commit 159ea61

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PrisonerAlertsGateway.kt

+5-1
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ class PrisonerAlertsGateway(
2626
)
2727
}
2828

29+
/**
30+
* @param page page number (1 based)
31+
* @param size records per page
32+
*/
2933
fun getPrisonerAlerts(
3034
prisonerNumber: String,
3135
page: Int,
@@ -34,7 +38,7 @@ class PrisonerAlertsGateway(
3438
val result =
3539
webClient.request<PAPaginatedAlerts>(
3640
HttpMethod.GET,
37-
"/prisoners/$prisonerNumber/alerts?page=$page&size=$size",
41+
"/prisoners/$prisonerNumber/alerts?page=${page - 1}&size=$size",
3842
authenticationHeader(),
3943
UpstreamApi.PRISONER_ALERTS,
4044
badRequestAsError = true,

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/prisonerAlerts/PAPaginatedAlerts.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ data class PAPaginatedAlerts(
2222
totalCount = this.totalElements,
2323
isLastPage = this.last,
2424
count = this.numberOfElements,
25-
page = this.number,
25+
page = this.number + 1, // Alerts API pagination is 0 based
2626
perPage = this.size,
2727
)
2828
}

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/prisonerAlerts/GetAlertsForPrisonerTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class GetAlertsForPrisonerTest(
3535
val prisonerNumber = "zyx987"
3636
val page = 1
3737
val size = 10
38-
val path = "/prisoners/$prisonerNumber/alerts?page=$page&size=$size"
38+
val path = "/prisoners/$prisonerNumber/alerts?page=${page - 1}&size=$size"
3939

4040
beforeEach {
4141
apiMockServer.start()

0 commit comments

Comments
 (0)