PI-2279 remove check between movement and booking, as this could be i… (

#3907) PI-2279 remove check between movement and booking, as this could be incorrect for merge cases. movement api will be correct. Signed-off-by: Amardeep Chimber <[email protected]>
ministryofjustice · Jun 17, 2024 · a0916b3 · a0916b3
1 parent db4af8a
commit a0916b3
Showing 1 changed file with 5 additions and 7 deletions.
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
@@ -143,16 +143,14 @@ fun PrisonerMovement?.telemetryProperties(): Map<String, String> = if (this == n
 
 fun Booking.prisonerMovement(movement: Movement): PrisonerMovement {
     val dateTime = ZonedDateTime.of(movement.movementDate, movement.movementTime, EuropeLondon)
-    check(movement.movementType == movementType && movement.movementReason == movementReason) {
-        "Booking and Last Movement out of sync"
-    }
+
     if (reason == null) {
         throw IgnorableMessageException(
             "UnableToCalculateMovementType",
             mapOf(
                 "nomsNumber" to personReference,
-                "movementType" to movementType,
-                "movementReason" to movementReason,
+                "movementType" to movement.movementType,
+                "movementReason" to movement.movementReason,
                 "inOutStatus" to inOutStatus!!.name,
                 "prisonId" to (agencyId ?: "")
             )
@@ -164,7 +162,7 @@ fun Booking.prisonerMovement(movement: Movement): PrisonerMovement {
             movement.fromAgency,
             movement.toAgency!!,
             PrisonerMovement.Type.valueOf(reason),
-            movementReason,
+            movement.movementReason,
             dateTime
         )
 
@@ -173,7 +171,7 @@ fun Booking.prisonerMovement(movement: Movement): PrisonerMovement {
             movement.fromAgency!!,
             movement.toAgency,
             PrisonerMovement.Type.valueOf(reason),
-            movementReason,
+            movement.movementReason,
             dateTime
         )