PI-2174 Recalculate RAR count for inactive requirements (#3737)

Previously, when session feedback was received for an appointment linked to a terminated requirement, then the RAR count would not be re-calculated. However, session feedback can still be recorded after the termination, and we should still update the RAR count in this case.
ministryofjustice · May 13, 2024 · 3fc89b6 · 3fc89b6
1 parent 8512188
commit 3fc89b6
Show file tree

Hide file tree

Showing 11 changed files with 1,323 additions and 353 deletions.
diff --git a/...kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referral/RequirementRepository.kt b/...kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referral/RequirementRepository.kt
@@ -13,6 +13,7 @@ interface RequirementRepository : JpaRepository<Requirement, Long> {
             where r.personId = :personId
             and r.disposalId = :disposalId
             and r.mainCategory.code = :type
+            and r.active = true
         """
     )
     fun findForPersonAndEvent(

diff --git a/...in/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referral/entity/Requirement.kt b/...in/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/referral/entity/Requirement.kt
@@ -1,18 +1,13 @@
 package uk.gov.justice.digital.hmpps.integrations.delius.referral.entity
 
-import jakarta.persistence.Column
-import jakarta.persistence.Entity
-import jakarta.persistence.Id
-import jakarta.persistence.JoinColumn
-import jakarta.persistence.ManyToOne
-import jakarta.persistence.Table
+import jakarta.persistence.*
 import org.hibernate.annotations.Immutable
 import org.hibernate.annotations.SQLRestriction
 
 @Immutable
 @Entity
 @Table(name = "rqmnt")
-@SQLRestriction("soft_deleted = 0 and active_flag = 1")
+@SQLRestriction("soft_deleted = 0")
 class Requirement(
 
     @Column(name = "offender_id")

diff --git a/...r-and-monitor-and-delius/tech-docs/diag/randm-and-delius-workflow-appointment-feedback.d2 b/...r-and-monitor-and-delius/tech-docs/diag/randm-and-delius-workflow-appointment-feedback.d2
@@ -21,6 +21,8 @@ delius: Delius {
     }
 
     d_update_contact: Update\nAppointment Contact
+
+    d_update_nsi: Recalculate\nRAR Count
 }
 
 refer_and_monitor -> delius

diff --git a/...or-and-delius/tech-docs/source/img/randm-and-delius-appointment-context-map.svg b/...or-and-delius/tech-docs/source/img/randm-and-delius-appointment-context-map.svg
diff --git a/...r-and-delius/tech-docs/source/img/randm-and-delius-dependencies-context-map.svg b/...r-and-delius/tech-docs/source/img/randm-and-delius-dependencies-context-map.svg
diff --git a/...nitor-and-delius/tech-docs/source/img/randm-and-delius-referral-context-map.svg b/...nitor-and-delius/tech-docs/source/img/randm-and-delius-referral-context-map.svg
diff --git a/...nitor-and-delius/tech-docs/source/img/randm-and-delius-workflow-action-plan.svg b/...nitor-and-delius/tech-docs/source/img/randm-and-delius-workflow-action-plan.svg
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,6 +21,8 @@ delius: Delius { @@
         }
         d_update_contact: Update\nAppointment Contact
+        d_update_nsi: Recalculate\nRAR Count
     }
     refer_and_monitor -> delius
@@ Expand Down @@