Allow sorting by closed date (#156)

ministryofjustice · Oct 30, 2023 · ae327fc · ae327fc
1 parent 52394c8
commit ae327fc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 0 deletions.
diff --git a/clients/node/src/constants.ts b/clients/node/src/constants.ts
@@ -27,6 +27,7 @@ export type RestrictionType = typeof restrictionTypeOptions
 export const sortByOptions = [
   'WHEN_CREATED',
   'WHEN_UPDATED',
+  'WHEN_CLOSED',
   'LAST_NAME',
   'FIRST_NAME',
   'PRISONER_NUMBER',

diff --git a/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsnonassociationsapi/dto/ListOptions.kt b/src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsnonassociationsapi/dto/ListOptions.kt
@@ -46,6 +46,7 @@ data class NonAssociationListOptions(
       return when (sortBy) {
         NonAssociationsSort.WHEN_CREATED -> compareBy(PrisonerNonAssociation::whenCreated)
         NonAssociationsSort.WHEN_UPDATED -> compareBy(PrisonerNonAssociation::whenUpdated)
+        NonAssociationsSort.WHEN_CLOSED -> compareBy(PrisonerNonAssociation::closedAt)
         NonAssociationsSort.LAST_NAME -> compareBy { nonna -> nonna.otherPrisonerDetails.lastName }
         NonAssociationsSort.FIRST_NAME -> compareBy { nonna -> nonna.otherPrisonerDetails.firstName }
         NonAssociationsSort.PRISONER_NUMBER -> compareBy { nonna -> nonna.otherPrisonerDetails.prisonerNumber }
@@ -61,6 +62,7 @@ data class NonAssociationListOptions(
 enum class NonAssociationsSort(val defaultSortDirection: Sort.Direction) {
   WHEN_CREATED(Sort.Direction.DESC),
   WHEN_UPDATED(Sort.Direction.DESC),
+  WHEN_CLOSED(Sort.Direction.DESC),
   LAST_NAME(Sort.Direction.ASC),
   FIRST_NAME(Sort.Direction.ASC),
   PRISONER_NUMBER(Sort.Direction.ASC),

diff --git a/.../uk/gov/justice/digital/hmpps/hmppsnonassociationsapi/resource/NonAssociationsResource.kt b/.../uk/gov/justice/digital/hmpps/hmppsnonassociationsapi/resource/NonAssociationsResource.kt
@@ -124,6 +124,7 @@ class NonAssociationsResource(
       allowableValues = [
         "WHEN_CREATED",
         "WHEN_UPDATED",
+        "WHEN_CLOSED",
         "LAST_NAME",
         "FIRST_NAME",
         "PRISONER_NUMBER",

diff --git a/...k/gov/justice/digital/hmpps/hmppsnonassociationsapi/service/NonAssociationsServiceTest.kt b/...k/gov/justice/digital/hmpps/hmppsnonassociationsapi/service/NonAssociationsServiceTest.kt
@@ -164,6 +164,7 @@ class NonAssociationsServiceTest {
         val getter: (PrisonerNonAssociation) -> String = when (sortBy) {
           NonAssociationsSort.WHEN_CREATED -> { n -> n.whenCreated.format(dtFormat) }
           NonAssociationsSort.WHEN_UPDATED -> { n -> n.whenUpdated.format(dtFormat) }
+          NonAssociationsSort.WHEN_CLOSED -> { n -> n.closedAt?.format(dtFormat) ?: "" }
           NonAssociationsSort.LAST_NAME -> { n -> n.otherPrisonerDetails.lastName }
           NonAssociationsSort.FIRST_NAME -> { n -> n.otherPrisonerDetails.firstName }
           NonAssociationsSort.PRISONER_NUMBER -> { n -> n.otherPrisonerDetails.prisonerNumber }