diff --git a/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTest.kt b/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTest.kt index af2440f8d1..c6a8e08185 100644 --- a/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTest.kt +++ b/projects/prison-custody-status-to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTest.kt @@ -531,7 +531,7 @@ class PcstdIntegrationTest : PcstdIntegrationTestBase() { val custody = getCustody(nomsNumber) assertTrue(custody.isInCustody()) assertThat(custody.institution?.code, equalTo(ual.code)) - assertThat(custody.status.code, equalTo(CustodialStatusCode.IN_CUSTODY.code)) + assertThat(custody.status.code, equalTo(CustodialStatusCode.RECALLED.code)) assertThat(custody.statusChangeDate, isCloseTo(notification.message.occurredAt)) verifyRecall(custody, notification.message.occurredAt, RecallReason.Code.NOTIFIED_BY_CUSTODIAL_ESTABLISHMENT) diff --git a/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateStatusAction.kt b/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateStatusAction.kt index f92c1cb47a..0a3fd01b4b 100644 --- a/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateStatusAction.kt +++ b/projects/prison-custody-status-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateStatusAction.kt @@ -56,8 +56,7 @@ class UpdateStatusAction( private fun outboundStatusChange(context: PrisonerMovementContext): ActionResult { val (prisonerMovement, custody) = context val statusCode = when { - prisonerMovement.isAbsconded() -> CustodialStatusCode.IN_CUSTODY - prisonerMovement.isHospitalRelease() || prisonerMovement.isIrcRelease() -> custody.nextStatus() + prisonerMovement.isHospitalRelease() || prisonerMovement.isIrcRelease() || prisonerMovement.isAbsconded() -> custody.nextStatus() else -> if (custody.canBeReleased()) { CustodialStatusCode.RELEASED_ON_LICENCE } else { @@ -71,7 +70,7 @@ class UpdateStatusAction( when { prisonerMovement.isHospitalRelease() -> "Transfer to/from Hospital" prisonerMovement.isIrcRelease() -> "Transfer to Immigration Removal Centre" - prisonerMovement.isAbsconded() -> if (custody.canBeRecalled()) "Recall added unlawfully at large " else "Absconded unlawfully at large " + prisonerMovement.isAbsconded() -> "Recall added unlawfully at large " else -> "Released on Licence" } )