Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PI-2676 Don't create a release if there is already an un-recalled release #4482

Merged
merged 1 commit into from
Dec 9, 2024
Merged

PI-2676 Don't create a release if there is already an un-recalled release #4482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions ...atus-to-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/PrisonerMovement.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,15 @@ sealed interface PrisonerMovement {
}

fun PrisonerMovement.releaseDateValid(custody: Custody): Boolean {
return !occurredAt.isBefore(custody.disposal.date) &&
!(custody.mostRecentRelease()?.recall?.date?.let { occurredAt.isBefore(it) } ?: false)
val release = custody.mostRecentRelease()
val recallDate = release?.recall?.date
return occurredAt >= custody.disposal.date && (release == null || (recallDate != null && occurredAt >= recallDate))
}

fun PrisonerMovement.receivedDateValid(custody: Custody): Boolean =
!occurredAt.isAfter(ZonedDateTime.now()) && (custody.mostRecentRelease()?.date?.let { !occurredAt.isBefore(it) }
?: true)
fun PrisonerMovement.receivedDateValid(custody: Custody): Boolean {
val releaseDate = custody.mostRecentRelease()?.date
return occurredAt <= ZonedDateTime.now() && (releaseDate == null || occurredAt >= releaseDate)
}

fun PrisonerMovement.statusDateValid(custody: Custody): Boolean =
occurredAt <= ZonedDateTime.now() && occurredAt.toLocalDate() >= custody.statusChangeDate
Expand Down
20 changes: 16 additions & 4 deletions ...us/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateLocationAction.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,25 @@ class UpdateLocationAction(
}

private fun checkPreconditions(prisonerMovement: PrisonerMovement, custody: Custody): ActionResult? {
if ((prisonerMovement is PrisonerMovement.Received && custody.institution?.nomisCdeCode == prisonerMovement.toPrisonId) ||
(prisonerMovement is PrisonerMovement.Received && !prisonerMovement.receivedDateValid(custody)) ||
(prisonerMovement is PrisonerMovement.Released && !prisonerMovement.releaseDateValid(custody)) ||
!prisonerMovement.locationDateValid(custody)
if (prisonerMovement is PrisonerMovement.Received && custody.institution?.nomisCdeCode == prisonerMovement.toPrisonId) {
return ActionResult.Ignored("PrisonerLocationCorrect", prisonerMovement.telemetryProperties())
}

if (prisonerMovement is PrisonerMovement.Received && !prisonerMovement.receivedDateValid(custody)) {
return ActionResult.Ignored("PrisonerLocationCorrect", prisonerMovement.telemetryProperties())
}

if (prisonerMovement is PrisonerMovement.Released &&
!(prisonerMovement.isHospitalRelease() || prisonerMovement.isIrcRelease() || prisonerMovement.isAbsconded()) &&
!prisonerMovement.releaseDateValid(custody)
) {
return ActionResult.Ignored("PrisonerLocationCorrect", prisonerMovement.telemetryProperties())
}

if (!prisonerMovement.locationDateValid(custody)) {
return ActionResult.Ignored("PrisonerLocationCorrect", prisonerMovement.telemetryProperties())
}

return null
}
}
2 changes: 1 addition & 1 deletion ...ects/prison-custody-status-to-delius/src/main/resources/application-prisoner-movement.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ prisoner.movement.configs:
# Unlawfully at large
- UAL
- UAL_ECL
# IRC
# Immigration removal centre
- DD
- DE
- DL
Expand Down
7 changes: 1 addition & 6 deletions ...rc/test/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateLocationActionTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import org.hamcrest.Matchers.equalTo
import org.hamcrest.Matchers.instanceOf
import org.junit.jupiter.api.Assertions.assertInstanceOf
import org.junit.jupiter.api.Test
import org.junit.jupiter.api.assertThrows
import org.junit.jupiter.api.extension.ExtendWith
import org.junit.jupiter.params.ParameterizedTest
import org.junit.jupiter.params.provider.Arguments
Expand All @@ -20,7 +19,6 @@ import org.mockito.kotlin.whenever
import uk.gov.justice.digital.hmpps.data.generator.*
import uk.gov.justice.digital.hmpps.data.generator.EventGenerator.custodialEvent
import uk.gov.justice.digital.hmpps.data.generator.EventGenerator.previouslyReleasedEvent
import uk.gov.justice.digital.hmpps.exception.IgnorableMessageException
import uk.gov.justice.digital.hmpps.integrations.delius.contact.ContactService
import uk.gov.justice.digital.hmpps.integrations.delius.custody.entity.Custody
import uk.gov.justice.digital.hmpps.integrations.delius.custody.entity.CustodyHistoryRepository
Expand Down Expand Up @@ -65,10 +63,7 @@ internal class UpdateLocationActionTest {
@ParameterizedTest
@MethodSource("noChangeMovements")
fun `no changes made when location is correct`(custody: Custody, prisonerMovement: PrisonerMovement) {
if (prisonerMovement.type == RELEASED && prisonerMovement.reason.isBlank()) {
whenever(institutionRepository.findByNomisCdeCode(InstitutionGenerator.DEFAULT.nomisCdeCode!!))
.thenReturn(InstitutionGenerator.DEFAULT)
} else if (prisonerMovement.isAbsconded()) {
if (prisonerMovement.isAbsconded()) {
whenever(institutionRepository.findByNomisCdeCode(InstitutionGenerator.DEFAULT.nomisCdeCode!!))
.thenReturn(InstitutionGenerator.DEFAULT)
whenever(institutionRepository.findByCode(InstitutionCode.UNLAWFULLY_AT_LARGE.code))
Expand Down
Loading