PI-1964 (#3404)

* PI-1964 * Formatting changes * PI-1964 --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
ministryofjustice · Feb 29, 2024 · fbbd676 · fbbd676
1 parent 0d2a319
commit fbbd676
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 9 deletions.
diff --git a/...us/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ConvictionEventGenerator.kt b/...us/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/ConvictionEventGenerator.kt
@@ -27,7 +27,7 @@ object ConvictionEventGenerator {
     )
     val DEFAULT_EVENT = ConvictionEventEntity(
         IdGenerator.getAndIncrement(),
-        LocalDate.now(),
+        LocalDate.now().minusDays(1),
         PERSON
     )
     val INACTIVE_EVENT = ConvictionEventEntity(

diff --git a/...c-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/ConvictionEventEntity.kt b/...c-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/ConvictionEventEntity.kt
@@ -12,6 +12,7 @@ import org.hibernate.annotations.Immutable
 import org.hibernate.annotations.SQLRestriction
 import org.springframework.data.jpa.repository.EntityGraph
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
 import java.time.LocalDate
 
 @Immutable
@@ -165,14 +166,20 @@ class Offence(
 )
 
 interface ConvictionEventRepository : JpaRepository<ConvictionEventEntity, Long> {
-    @EntityGraph(
-        attributePaths = [
-            "mainOffence.offence",
-            "additionalOffences.offence",
-            "disposal.type"
-        ]
+    @Query(
+        """
+        select c from ConvictionEventEntity c
+        join fetch c.disposal d 
+        join fetch d.type dt
+        join fetch c.mainOffence mo
+        join fetch mo.offence
+        left join fetch c.additionalOffences ao
+        left join fetch ao.offence
+        where c.convictionEventPerson.id = :personId and c.active = true
+        order by c.convictionDate desc
+    """
     )
-    fun getAllByConvictionEventPersonIdAndActiveIsTrueOrderByConvictionDateDesc(personId: Long): List<ConvictionEventEntity>
+    fun getActiveSentencedConvictions(personId: Long): List<ConvictionEventEntity>
 
     @EntityGraph(
         attributePaths = [
@@ -212,4 +219,4 @@ interface ConvictionEventRepository : JpaRepository<ConvictionEventEntity, Long>
 }
 
 fun ConvictionEventRepository.getLatestConviction(personId: Long) =
-    getAllByConvictionEventPersonIdAndActiveIsTrueOrderByConvictionDateDesc(personId).firstOrNull()
+    getActiveSentencedConvictions(personId).firstOrNull()