PI-2482 Handle null offences in assessment summary response (#4203)

ministryofjustice · Aug 28, 2024 · 1a4b585 · 1a4b585
1 parent df98c65
commit 1a4b585
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/oasys/OrdsClient.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/oasys/OrdsClient.kt
@@ -42,7 +42,7 @@ data class AssessmentSummary(
     val weightedScores: WeightedScores = WeightedScores(),
     val furtherInformation: FurtherInformation = FurtherInformation(),
     val ogpOvp: OgpOvp = OgpOvp(),
-    val offences: List<Offence> = arrayListOf(),
+    val offences: List<Offence>? = arrayListOf(),
     val basicSentencePlan: List<BasicSentencePlanArea>? = null,
     val sentencePlan: SentencePlan? = null
 ) {

diff --git a/...mary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AssessmentService.kt b/...mary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AssessmentService.kt
@@ -61,7 +61,8 @@ class AssessmentService(
             contact = contact,
             court = furtherInformation.courtCode
                 ?.let { courtRepository.getByCode(it) },
-            offence = offences.firstOrNull { it.offenceCode != null && it.offenceSubcode != null }
+            offence = offences
+                ?.firstOrNull { it.offenceCode != null && it.offenceSubcode != null }
                 ?.let { offenceRepository.findByCode(it.offenceCode + it.offenceSubcode) },
             totalScore = furtherInformation.totWeightedScore,
             description = furtherInformation.pOAssessmentDesc,