CDPS-975: Tweak to the JPQL to get the correct offender record (#2312)

ministryofjustice · Dec 13, 2024 · 0ea4837 · 0ea4837
1 parent ee0babc
commit 0ea4837
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/main/java/uk/gov/justice/hmpps/prison/repository/jpa/repository/OffenderRepository.kt b/src/main/java/uk/gov/justice/hmpps/prison/repository/jpa/repository/OffenderRepository.kt
@@ -30,6 +30,6 @@ interface OffenderRepository : JpaRepository<Offender, Long> {
 
   @Lock(LockModeType.PESSIMISTIC_WRITE)
   @QueryHints(value = [QueryHint(name = "jakarta.persistence.lock.timeout", value = "1000")])
-  @Query("select o from Offender o inner join o.bookings b where o.nomsId = :nomsId and b.bookingSequence = 1")
+  @Query("select o from OffenderBooking b inner join Offender o on b.offender = o where o.nomsId = :nomsId and b.bookingSequence = 1")
   fun findLinkedToLatestBookingForUpdate(@NotNull nomsId: String): Optional<Offender>
 }
diff --git a/...test/java/uk/gov/justice/hmpps/prison/repository/jpa/repository/OffenderRepositoryTest.kt b/...test/java/uk/gov/justice/hmpps/prison/repository/jpa/repository/OffenderRepositoryTest.kt
@@ -66,7 +66,7 @@ class OffenderRepositoryTest {
       // this prisoner has two offender records - ensure we get the right one
       val offender = repository.findLinkedToLatestBookingForUpdate("A1234AL").orElseThrow()
 
-      assertThat(offender.id).isEqualTo(-1012L)
+      assertThat(offender.id).isEqualTo(-1012L) // Needs to be the one connected to the booking with booking seq of 1
       assertThat(offender.allBookings).hasSizeGreaterThan(0)
     }