Merge branch 'main' into MAN-291-fix-missing-content-for-last-ended-on

ministryofjustice · Jan 21, 2025 · c95dde3 · c95dde3
2 parents 6effce9 + f9d6fe6
commit c95dde3
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/...in/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/Requirement.kt b/...in/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/overview/entity/Requirement.kt
@@ -168,6 +168,8 @@ interface RequirementRepository : JpaRepository<Requirement, Long> {
             AND e.event_number = :eventNumber
             AND e.soft_deleted = 0 
             AND e.active_flag = 1
+            AND r.active_flag = 1
+            AND r.soft_deleted = 0
             ORDER BY rrtmc.description
         """, nativeQuery = true
     )
@@ -205,7 +207,8 @@ interface RequirementRepository : JpaRepository<Requirement, Long> {
             WHERE r.rqmnt_id = :id
             AND e.soft_deleted = 0 
             AND e.active_flag = 1
-            ORDER BY rrtmc.description
+            AND r.active_flag = 1
+            AND r.soft_deleted = 0            
         """, nativeQuery = true
     )
     fun getRequirement(id: Long): RequirementDetails?