PI-2575 nullable field fixes (#4412)

ministryofjustice · Nov 8, 2024 · 907bae0 · 907bae0
1 parent 7dada9c
commit 907bae0
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/...nd-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/CommonPlatformHearing.kt b/...nd-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/CommonPlatformHearing.kt
@@ -47,13 +47,13 @@ data class Defendant(
 
 data class Offence(
     val id: String,
-    val offenceDefinitionId: String,
+    val offenceDefinitionId: String? = null,
     val offenceCode: String,
     val offenceTitle: String,
     val wording: String,
     val offenceLegislation: String,
     val listingNumber: Int,
-    val judicialResults: List<JudicialResult>,
+    val judicialResults: List<JudicialResult>? = emptyList(),
     val plea: Plea? = null,
     val verdict: Verdict? = null
 )

diff --git a/...mon-platform-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt b/...mon-platform-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt
@@ -32,9 +32,9 @@ class Handler(
             .flatMap { it.defendants }
             .filter { defendant ->
                 defendant.offences.any { offence ->
-                    offence.judicialResults.any { judicialResult ->
+                    offence.judicialResults?.any { judicialResult ->
                         judicialResult.isConvictedResult == true && judicialResult.label == "Remanded in custody"
-                    }
+                    } ?: false
                 }
             }
         if (defendants.isEmpty()) {