PI-1944 (#3314)

ministryofjustice · Feb 21, 2024 · a67eb4c · a67eb4c
1 parent 11e3223
commit a67eb4c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git a/...ov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Referral.kt b/...ov/justice/digital/hmpps/integrations/delius/approvedpremises/referral/entity/Referral.kt
@@ -29,7 +29,7 @@ class Referral(
 
     @Column(name = "event_id")
     val eventId: Long,
-    val approvedPremisesId: Long,
+    val approvedPremisesId: Long?,
 
     val referralDate: LocalDate,
     var expectedArrivalDate: LocalDate?,

diff --git a/...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt b/...emises-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ReferralService.kt
@@ -164,15 +164,23 @@ class ReferralService(
         return ExistingReferrals(person.crn, referrals)
     }
 
-    fun getReferral(person: Person, externalReference: String) =
-        referralRepository.findByPersonIdAndCreatedByUserIdAndReferralNotesContains(
+    fun getReferral(person: Person, externalReference: String): Referral {
+        val referral: Referral = referralRepository.findByPersonIdAndCreatedByUserIdAndReferralNotesContains(
             person.id,
             ServiceContext.servicePrincipal()!!.userId,
             externalReference
         ) ?: throw IgnorableMessageException(
             "Referral Not Found",
             mapOf("crn" to person.crn, "externalReference" to externalReference)
         )
+        if (referral.approvedPremisesId == null) {
+            throw IgnorableMessageException(
+                "Approved Premises unlinked from Referral",
+                mapOf("crn" to person.crn, "externalReference" to externalReference)
+            )
+        }
+        return referral
+    }
 
     private fun BookingMade.referral(
         person: Person,