PI-1703 handle inactive booking for release

ministryofjustice · Dec 14, 2023 · fce5cc9 · fce5cc9
1 parent 4b9123e
commit fce5cc9
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/...-to-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/BookingGenerator.kt b/...-to-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/BookingGenerator.kt
@@ -5,9 +5,9 @@ import uk.gov.justice.digital.hmpps.integrations.prison.Booking
 object BookingGenerator {
     private val options = ('A'..'Z') + ('0'..'9')
 
-    val RELEASED = generateRelease(PersonGenerator.RELEASABLE.nomsNumber, "NCS")
+    val RELEASED = generateRelease(PersonGenerator.RELEASABLE.nomsNumber, "NCS", active = false)
     val RECEIVED = generateReceive(PersonGenerator.RECALLABLE.nomsNumber, "R1")
-    val DIED = generateRelease(PersonGenerator.DIED.nomsNumber, "DEC")
+    val DIED = generateRelease(PersonGenerator.DIED.nomsNumber, "DEC", active = false)
     val MATCHED = generateReceive(
         PersonGenerator.MATCHABLE.nomsNumber,
         "INT",
@@ -16,13 +16,12 @@ object BookingGenerator {
     val NEW_CUSTODY = generateReceive(PersonGenerator.NEW_CUSTODY.nomsNumber, "N")
     val RECALLED = generateReceive(PersonGenerator.RECALLED.nomsNumber, "24")
     val HOSPITAL_RELEASE = generateRelease(PersonGenerator.HOSPITAL_RELEASED.nomsNumber, "HO")
-    val HOSPITAL_CUSTODY = generateRelease(PersonGenerator.HOSPITAL_IN_CUSTODY.nomsNumber, "HQ")
+    val HOSPITAL_CUSTODY = generateRelease(PersonGenerator.HOSPITAL_IN_CUSTODY.nomsNumber, "HQ", active = false)
     val ROTL_RETURN = generateReceive(PersonGenerator.ROTL.nomsNumber, "24", "TAP")
     val IRC_RELEASED = generateRelease(PersonGenerator.IRC_RELEASED.nomsNumber, "DE")
     val IRC_CUSTODY = generateRelease(PersonGenerator.IRC_IN_CUSTODY.nomsNumber, "DD")
     val ECSL_ACTIVE = generateRelease(PersonGenerator.RELEASABLE_ECSL_ACTIVE.nomsNumber, "ECSL")
-    val ECSL_INACTIVE = generateRelease(PersonGenerator.RELEASABLE_ECSL_INACTIVE.nomsNumber, "ECSL")
-    val ABSCONDED = generateRelease(PersonGenerator.ABSCONDED.nomsNumber, "UAL")
+    val ABSCONDED = generateRelease(PersonGenerator.ABSCONDED.nomsNumber, "UAL", active = false)
     val ETR_CUSTODY = generateRelease(PersonGenerator.ETR_IN_CUSTODY.nomsNumber, "ETR")
 
     fun generateRelease(

diff --git a/...ustody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt b/...ustody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt
@@ -81,7 +81,7 @@ class Handler(
     }
 
     private fun PrisonApiClient.bookingFromNomsId(nomsId: String) =
-        getBookingByNomsId(nomsId).takeIf { it.active }
+        getBookingByNomsId(nomsId).takeIf { it.active || it.movementType == "REL"}
             ?: throw IgnorableMessageException("BookingInactive", mapOf("nomsNumber" to nomsId))
 }