PI-2350 Ignore missing court and offence codes (#4020)

ministryofjustice · Jul 11, 2024 · e433d45 · e433d45
1 parent 9beeeee
commit e433d45
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 8 deletions.
diff --git a/...us/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Court.kt b/...us/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Court.kt
@@ -7,7 +7,6 @@ import jakarta.persistence.Id
 import org.hibernate.annotations.Immutable
 import org.hibernate.type.YesNoConverter
 import org.springframework.data.jpa.repository.JpaRepository
-import uk.gov.justice.digital.hmpps.exception.NotFoundException
 
 @Immutable
 @Entity
@@ -29,4 +28,4 @@ interface CourtRepository : JpaRepository<Court, Long> {
 }
 
 fun CourtRepository.getByCode(code: String) =
-    findByCodeAndSelectableTrue(code) ?: findByCode(code) ?: throw NotFoundException("Court", "code", code)
+    findByCodeAndSelectableTrue(code) ?: findByCode(code)
diff --git a/.../src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Offence.kt b/.../src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/court/entity/Offence.kt
@@ -6,7 +6,6 @@ import jakarta.persistence.Id
 import jakarta.persistence.Table
 import org.hibernate.annotations.Immutable
 import org.springframework.data.jpa.repository.JpaRepository
-import uk.gov.justice.digital.hmpps.exception.NotFoundException
 
 @Immutable
 @Table(name = "r_offence")
@@ -24,6 +23,3 @@ class Offence(
 interface OffenceRepository : JpaRepository<Offence, Long> {
     fun findByCode(code: String): Offence?
 }
-
-fun OffenceRepository.getByCode(code: String) =
-    findByCode(code) ?: throw NotFoundException("Offence", "code", code)
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
@@ -55,9 +55,10 @@ class AssessmentService(
             person = person,
             eventNumber = event.number,
             contact = contact,
-            court = furtherInformation.courtCode?.let { courtRepository.getByCode(it) },
+            court = furtherInformation.courtCode
+                ?.let { courtRepository.getByCode(it) },
             offence = offences.firstOrNull { it.offenceCode != null && it.offenceSubcode != null }
-                ?.let { offenceRepository.getByCode(it.offenceCode + it.offenceSubcode) },
+                ?.let { offenceRepository.findByCode(it.offenceCode + it.offenceSubcode) },
             totalScore = furtherInformation.totWeightedScore,
             description = furtherInformation.pOAssessment?.let {
                 PurposeOfAssessmentMapping[it] ?: throw IllegalArgumentException("Unexpected 'pOAssessment' code '$it'")