PI-2391: Added sort of court appearances and recal/withdrawn

ministryofjustice · Aug 2, 2024 · 69eda3a · 69eda3a
1 parent 0610127
commit 69eda3a
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/...main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/ConvictionService.kt b/...main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/ConvictionService.kt
@@ -72,12 +72,17 @@ class ConvictionService(
     }
 
     fun Event.toLatestOrSentencingCourtAppearanceOf(): CourtAppearanceBasic? {
-        return courtAppearances.filter { it.isSentenceing() }
-            .sortedByDescending(CourtAppearance::appearanceDate)
-            .maxByOrNull { it.appearanceDate }
-            ?.let { return it.toCourtAppearanceBasic() }
-            ?: courtAppearances.sortedByDescending(CourtAppearance::appearanceDate).maxByOrNull { it.appearanceDate }
-                ?.let { return it.toCourtAppearanceBasic() }
+        return courtAppearances
+            .stream()
+            .filter { it.isSentenceing() }
+            .max(Comparator.comparing(CourtAppearance::appearanceDate))
+            .map { it.toCourtAppearanceBasic() }.orElseGet {
+                courtAppearances
+                    .stream()
+                    .max(Comparator.comparing(CourtAppearance::appearanceDate))
+                    .map { it.toCourtAppearanceBasic() }
+                    .orElse(null)
+            }
     }
 
     fun CourtAppearance.toCourtAppearanceBasic(): CourtAppearanceBasic =