MAN-104 - modify order column for next and last contact (#4317)

ministryofjustice · Oct 15, 2024 · 2ad9b2d · 2ad9b2d
1 parent b655bc2
commit 2ad9b2d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/...-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/controller/CaseloadController.kt b/...-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/controller/CaseloadController.kt
@@ -31,7 +31,7 @@ class CaseloadController(private val userService: UserService) {
         @PathVariable username: String,
         @RequestParam(required = false, defaultValue = "0") page: Int,
         @RequestParam(required = false, defaultValue = "100") size: Int,
-        @RequestParam(required = false, defaultValue = "nextContact.desc") sortBy: String,
+        @RequestParam(required = false, defaultValue = "nextContact.asc") sortBy: String,
         @RequestBody body: UserSearchFilter
     ) = userService.searchUserCaseload(username, body, PageRequest.of(page, size, sort(sortBy)), sortBy)
 

diff --git a/...lius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/user/entity/User.kt b/...lius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/user/entity/User.kt
@@ -454,8 +454,8 @@ interface CaseloadRepository : JpaRepository<Caseload, Long> {
 }
 
 enum class CaseloadOrderType(val sortColumn: String) {
-    NEXT_CONTACT("naType.description"),
-    LAST_CONTACT("paType.description"),
+    NEXT_CONTACT("na.appointmentDatetime"),
+    LAST_CONTACT("pa.appointmentDatetime"),
     SENTENCE("dt.description"),
     SURNAME("p.surname"),
     NAME_OR_CRN("p.surname"),