PI-1985 - update custody status change date (#3426)

ministryofjustice · Mar 5, 2024 · e48d010 · e48d010
1 parent f5a0106
commit e48d010
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 10 deletions.
diff --git a/...us-to-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/EventGenerator.kt b/...us-to-delius/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/EventGenerator.kt
@@ -13,6 +13,7 @@ import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.wellknown.
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.wellknown.ReleaseTypeCode
 import uk.gov.justice.digital.hmpps.integrations.delius.release.entity.Release
 import uk.gov.justice.digital.hmpps.set
+import java.time.LocalDate
 import java.time.ZonedDateTime
 
 object EventGenerator {
@@ -53,7 +54,7 @@ object EventGenerator {
             status = ReferenceDataGenerator.CUSTODIAL_STATUS[custodialStatusCode]!!,
             institution = institution,
             disposal = disposal,
-            statusChangeDate = ZonedDateTime.now().minusDays(1),
+            statusChangeDate = LocalDate.now().minusDays(1),
             locationChangeDate = ZonedDateTime.now().minusDays(1)
         )
         disposal.custody = custody

diff --git a/...to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTest.kt b/...to-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PcstdIntegrationTest.kt
@@ -73,7 +73,7 @@ class PcstdIntegrationTest : PcstdIntegrationTestBase() {
         val custody = getCustody(nomsNumber)
         assertTrue(custody.isInCustody())
         assertThat(custody.status.code, equalTo(CustodialStatusCode.IN_CUSTODY.code))
-        assertThat(custody.statusChangeDate, isCloseTo(notification.message.occurredAt))
+        assertThat(custody.statusChangeDate, equalTo(notification.message.occurredAt.toLocalDate()))
         assertThat(custody.institution?.code, equalTo(InstitutionGenerator.DEFAULT.code))
         assertThat(custody.locationChangeDate!!, isCloseTo(notification.message.occurredAt))
 
@@ -237,7 +237,7 @@ class PcstdIntegrationTest : PcstdIntegrationTestBase() {
 
         val custody = getCustody(nomsNumber)
         assertThat(custody.status.code, equalTo(CustodialStatusCode.IN_CUSTODY.code))
-        assertThat(custody.statusChangeDate, isCloseTo(notification.message.occurredAt))
+        assertThat(custody.statusChangeDate, equalTo(notification.message.occurredAt.toLocalDate()))
         assertThat(custody.institution?.code, equalTo(InstitutionGenerator.DEFAULT.code))
         assertThat(custody.locationChangeDate!!, isCloseTo(notification.message.occurredAt))
 
@@ -284,7 +284,7 @@ class PcstdIntegrationTest : PcstdIntegrationTestBase() {
         assertThat(custody.institution?.code, equalTo(InstitutionCode.OTHER_SECURE_UNIT.code))
         assertThat(custody.locationChangeDate!!, isCloseTo(notification.message.occurredAt))
         assertThat(custody.status.code, equalTo(CustodialStatusCode.RECALLED.code))
-        assertThat(custody.statusChangeDate, isCloseTo(notification.message.occurredAt))
+        assertThat(custody.statusChangeDate, equalTo(notification.message.occurredAt.toLocalDate()))
 
         verifyRecall(custody, notification.message.occurredAt, RecallReason.Code.TRANSFER_TO_SECURE_HOSPITAL)
 
@@ -538,7 +538,7 @@ class PcstdIntegrationTest : PcstdIntegrationTestBase() {
         assertTrue(custody.isInCustody())
         assertThat(custody.institution?.code, equalTo(ual.code))
         assertThat(custody.status.code, equalTo(CustodialStatusCode.RECALLED.code))
-        assertThat(custody.statusChangeDate, isCloseTo(notification.message.occurredAt))
+        assertThat(custody.statusChangeDate, equalTo(notification.message.occurredAt.toLocalDate()))
 
         verifyRecall(custody, notification.message.occurredAt, RecallReason.Code.NOTIFIED_BY_CUSTODIAL_ESTABLISHMENT)
 

diff --git a/...rc/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/custody/entity/Custody.kt b/...rc/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/custody/entity/Custody.kt
@@ -16,6 +16,7 @@ import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.wellknown.
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.wellknown.CAN_RELEASE_STATUSES
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.wellknown.CustodialStatusCode
 import uk.gov.justice.digital.hmpps.integrations.delius.release.entity.Release
+import java.time.LocalDate
 import java.time.ZonedDateTime
 
 @Entity
@@ -46,7 +47,7 @@ class Custody(
     val disposal: Disposal,
 
     @Column(nullable = false)
-    var statusChangeDate: ZonedDateTime,
+    var statusChangeDate: LocalDate,
 
     @Column
     var locationChangeDate: ZonedDateTime?,
@@ -108,7 +109,7 @@ class Custody(
         null
     } else {
         this.status = status
-        this.statusChangeDate = dateTime
+        this.statusChangeDate = dateTime.toLocalDate()
         CustodyHistory(
             date = dateTime,
             type = historyType(),

diff --git a/...us/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateLocationAction.kt b/...us/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/actions/UpdateLocationAction.kt
@@ -54,13 +54,13 @@ class UpdateLocationAction(
             else -> null
         }
 
-        return institution?.let { institution ->
-            custody.updateLocationAt(institution, prisonerMovement.occurredAt) {
+        return institution?.let { inst ->
+            custody.updateLocationAt(inst, prisonerMovement.occurredAt) {
                 referenceDataRepository.getCustodyEventType(CustodyEventTypeCode.LOCATION_CHANGE.code)
             }?.let { history ->
                 custodyRepository.save(custody)
                 custodyHistoryRepository.save(history)
-                (pomInstitutionOverride ?: institution).probationArea?.let {
+                (pomInstitutionOverride ?: inst).probationArea?.let {
                     prisonManagerService.allocateToProbationArea(
                         custody.disposal,
                         it,