MAN-28 - order licence conditions to match delius

ministryofjustice · Oct 21, 2024 · 4a09da0 · 4a09da0
1 parent 4ac4ff5
commit 4a09da0
Showing 1 changed file with 11 additions and 0 deletions.
diff --git a/...tlin/uk/gov/justice/digital/hmpps/integrations/delius/sentence/entity/LicenceCondition.kt b/...tlin/uk/gov/justice/digital/hmpps/integrations/delius/sentence/entity/LicenceCondition.kt
@@ -4,6 +4,7 @@ import jakarta.persistence.*
 import org.hibernate.annotations.Immutable
 import org.hibernate.annotations.SQLRestriction
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceData
 import java.time.LocalDate
 
@@ -45,7 +46,17 @@ class LicenceCondition(
 
 interface LicenceConditionRepository : JpaRepository<LicenceCondition, Long> {
 
+    @Query(
+        """
+            SELECT lc FROM LicenceCondition lc 
+            JOIN FETCH lc.mainCategory mc
+            LEFT JOIN FETCH lc.subCategory
+            WHERE lc.disposalId = :disposalId
+            ORDER BY mc.description ASC
+        """
+    )
     fun findAllByDisposalId(disposalId: Long): List<LicenceCondition>
+
 }
 
 fun LicenceConditionRepository.getByLicenceConditionId(id: Long) = findById(id)