PI-1714 (#2871)

* PI-1714 * PI-1714 refactor * PI-1714 fix non unique
ministryofjustice · Dec 5, 2023 · 4ea8ecd · 4ea8ecd
1 parent ba352be
commit 4ea8ecd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/...kotlin/uk/gov/justice/digital/hmpps/integrations/delius/custody/date/CustodyRepository.kt b/...kotlin/uk/gov/justice/digital/hmpps/integrations/delius/custody/date/CustodyRepository.kt
@@ -12,13 +12,13 @@ interface CustodyRepository : JpaRepository<Custody, Long> {
 
     @Query(
         """
-        select c.id from Custody c
+        select distinct c.id from Custody c
         join c.disposal d
         join d.event e
         where e.person.id = :personId
         and c.softDeleted = false and c.status.code <> 'P' and c.bookingRef = :bookingRef
         and d.active = true and d.softDeleted = false
-        and e.active = true and e.softDeleted = false 
+        and e.active = true and e.softDeleted = false
     """
     )
     fun findCustodyId(personId: Long, bookingRef: String): List<Long>

diff --git a/...src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/custody/date/Sentence.kt b/...src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/custody/date/Sentence.kt
@@ -33,6 +33,7 @@ class Event(
     val disposal: Disposal? = null,
 
     @OneToOne(mappedBy = "event")
+    @SQLRestriction("active_flag = 1 and soft_deleted = 0")
     val manager: OrderManager? = null,
 
     @Column(updatable = false, columnDefinition = "NUMBER")