MAN-282 add risk tag on all tabs

ministryofjustice · Jan 22, 2025 · d540a3c · d540a3c
1 parent c9838d0
commit d540a3c
Show file tree

Hide file tree

Showing 2 changed files with 65 additions and 5 deletions.
diff --git a/server/routes/personalDetails.ts b/server/routes/personalDetails.ts
@@ -59,6 +59,7 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient }
     const { crn } = req.params
     const { id } = req.params
     const token = await hmppsAuthClient.getSystemClientToken(res.locals.user.username)
+    const arnsClient = new ArnsApiClient(token)
     const masClient = new MasApiClient(token)
     const tierClient = new TierApiClient(token)
 
@@ -71,15 +72,29 @@ export default function personalDetailRoutes(router: Router, { hmppsAuthClient }
       service: 'hmpps-manage-people-on-probation-ui',
     })
 
-    const [personalContact, tierCalculation] = await Promise.all([
+    const [personalContact, tierCalculation, risks, predictors] = await Promise.all([
       masClient.getPersonalContact(crn, id),
       tierClient.getCalculationDetails(crn),
+      arnsClient.getRisks(crn),
+      arnsClient.getPredictorsAll(crn),
     ])
 
+    const risksWidget = toRoshWidget(risks)
+
+    let timeline: TimelineItem[] = []
+    let predictorScores
+    if (Array.isArray(predictors)) {
+      timeline = toTimeline(predictors)
+    }
+    if (timeline.length > 0) {
+      ;[predictorScores] = timeline
+    }
     res.render('pages/personal-details/contact', {
       personalContact,
       tierCalculation,
       crn,
+      risksWidget,
+      predictorScores,
     })
   })
 

diff --git a/server/routes/sentence.ts b/server/routes/sentence.ts
@@ -7,7 +7,6 @@ import MasApiClient from '../data/masApiClient'
 import TierApiClient from '../data/tierApiClient'
 import ArnsApiClient from '../data/arnsApiClient'
 import { toRoshWidget, toTimeline } from '../utils/utils'
-import logger from '../../logger'
 import { TimelineItem } from '../data/model/risk'
 
 interface QueryParams {
@@ -81,18 +80,33 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv
       service: 'hmpps-manage-people-on-probation-ui',
     })
 
+    const arnsClient = new ArnsApiClient(token)
     const masClient = new MasApiClient(token)
     const tierClient = new TierApiClient(token)
 
-    const [sentenceDetails, tierCalculation] = await Promise.all([
+    const [sentenceDetails, tierCalculation, risks, predictors] = await Promise.all([
       masClient.getProbationHistory(crn),
       tierClient.getCalculationDetails(crn),
+      arnsClient.getRisks(crn),
+      arnsClient.getPredictorsAll(crn),
     ])
 
+    const risksWidget = toRoshWidget(risks)
+
+    let timeline: TimelineItem[] = []
+    let predictorScores
+    if (Array.isArray(predictors)) {
+      timeline = toTimeline(predictors)
+    }
+    if (timeline.length > 0) {
+      ;[predictorScores] = timeline
+    }
     res.render('pages/probation-history', {
       sentenceDetails,
       crn,
       tierCalculation,
+      risksWidget,
+      predictorScores,
     })
   })
 
@@ -178,18 +192,33 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv
       service: 'hmpps-manage-people-on-probation-ui',
     })
 
+    const arnsClient = new ArnsApiClient(token)
     const masClient = new MasApiClient(token)
     const tierClient = new TierApiClient(token)
 
-    const [licenceNoteDetails, tierCalculation] = await Promise.all([
+    const [licenceNoteDetails, tierCalculation, risks, predictors] = await Promise.all([
       masClient.getSentenceLicenceConditionNote(crn, licenceConditionId, noteId),
       tierClient.getCalculationDetails(crn),
+      arnsClient.getRisks(crn),
+      arnsClient.getPredictorsAll(crn),
     ])
 
+    let timeline: TimelineItem[] = []
+    let predictorScores
+    if (Array.isArray(predictors)) {
+      timeline = toTimeline(predictors)
+    }
+    if (timeline.length > 0) {
+      ;[predictorScores] = timeline
+    }
+
+    const risksWidget = toRoshWidget(risks)
     res.render('pages/licence-condition-note', {
       licenceNoteDetails,
       tierCalculation,
       crn,
+      risksWidget,
+      predictorScores,
     })
   })
 
@@ -206,17 +235,33 @@ export default function sentenceRoutes(router: Router, { hmppsAuthClient }: Serv
       service: 'hmpps-manage-a-supervision-ui',
     })
 
+    const arnsClient = new ArnsApiClient(token)
     const masClient = new MasApiClient(token)
     const tierClient = new TierApiClient(token)
 
-    const [requirementNoteDetails, tierCalculation] = await Promise.all([
+    const [requirementNoteDetails, tierCalculation, risks, predictors] = await Promise.all([
       masClient.getSentenceRequirementNote(crn, requirementId, noteId),
       tierClient.getCalculationDetails(crn),
+      arnsClient.getRisks(crn),
+      arnsClient.getPredictorsAll(crn),
     ])
+
+    let timeline: TimelineItem[] = []
+    let predictorScores
+    if (Array.isArray(predictors)) {
+      timeline = toTimeline(predictors)
+    }
+    if (timeline.length > 0) {
+      ;[predictorScores] = timeline
+    }
+
+    const risksWidget = toRoshWidget(risks)
     res.render('pages/requirement-note', {
       requirementNoteDetails,
       tierCalculation,
       crn,
+      risksWidget,
+      predictorScores,
     })
   })
 }