From 76c1333ab1bd1a9b9cd3a1163dc751a92cf5a8b4 Mon Sep 17 00:00:00 2001 From: Dani Burnley Date: Wed, 29 Jan 2025 14:11:28 +0000 Subject: [PATCH] CDPS-1085: Update name sort order (#11) --- .../hmpps/healthandmedication/service/PrisonerHealthService.kt | 2 +- .../healthandmedication/service/PrisonerHealthServiceTest.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthService.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthService.kt index 157367d..b50a0c3 100644 --- a/src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthService.kt +++ b/src/main/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthService.kt @@ -46,7 +46,7 @@ class PrisonerHealthService( // This would be nice to move into request validation rather than having to validate here val sort = request.sort.split(",") if (sort[0] == "prisonerName") { - prisonerSearchClient.getPrisonersForPrison(prisonId, "firstName,lastName," + sort[1]) + prisonerSearchClient.getPrisonersForPrison(prisonId, "lastName,firstName," + sort[1]) } else if (sort[0] == "location") { prisonerSearchClient.getPrisonersForPrison(prisonId, "cellLocation," + sort[1]) } else { diff --git a/src/test/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthServiceTest.kt b/src/test/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthServiceTest.kt index 31378b8..0887eb0 100644 --- a/src/test/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthServiceTest.kt +++ b/src/test/kotlin/uk/gov/justice/digital/hmpps/healthandmedication/service/PrisonerHealthServiceTest.kt @@ -392,7 +392,7 @@ class PrisonerHealthServiceTest { HealthAndMedicationForPrisonRequest(1, 10, sort = "prisonerName,$direction"), ) - verify(prisonerSearchClient).getPrisonersForPrison(PRISON_ID, "firstName,lastName,$direction") + verify(prisonerSearchClient).getPrisonersForPrison(PRISON_ID, "lastName,firstName,$direction") } @ParameterizedTest