PI-2698 Add RoSH summary answers to registration notes

ministryofjustice · Dec 18, 2024 · cf2ab82 · cf2ab82
1 parent 3775e37
commit cf2ab82
Show file tree

Hide file tree

Showing 5 changed files with 53 additions and 3 deletions.
diff --git a/...cts/assessment-summary-and-delius/src/dev/resources/simulations/__files/rosh-summary.json b/...cts/assessment-summary-and-delius/src/dev/resources/simulations/__files/rosh-summary.json
@@ -0,0 +1,8 @@
+{
+  "assessments": [
+    {
+      "whoAtRisk": "Known adults - Joe Bloggs",
+      "natureOfRisk": "Physical harm - Physical assault, shown willingness to use a weapon"
+    }
+  ]
+}
diff --git a/.../assessment-summary-and-delius/src/dev/resources/simulations/mappings/oasys-mappings.json b/.../assessment-summary-and-delius/src/dev/resources/simulations/mappings/oasys-mappings.json
@@ -142,6 +142,19 @@
         "status": 200,
         "bodyFileName": "A000011-multiple-risks.json"
       }
+    },
+    {
+      "request": {
+        "method": "GET",
+        "urlPattern": "/eor/oasys/ass/sectionroshsumm/ALLOW/.+"
+      },
+      "response": {
+        "headers": {
+          "Content-Type": "application/json"
+        },
+        "status": 200,
+        "bodyFileName": "rosh-summary.json"
+      }
     }
   ]
 }
diff --git a/...ary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/...ary-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
@@ -325,7 +325,17 @@ internal class IntegrationTest {
         assertThat(registration.level?.code, equalTo(RiskLevel.H.code))
         assertThat(
             registration.notes,
-            equalTo("The OASys assessment of Review on 07/12/2023 identified the Risk to children to be H")
+            equalTo(
+                """
+                    The OASys assessment of Review on 07/12/2023 identified the Risk to children to be H.
+                    
+                    *R10.1 Who is at risk*
+                    Known adults - Joe Bloggs
+                    
+                    *R10.2 What is the nature of the risk*
+                    Physical harm - Physical assault, shown willingness to use a weapon
+                """.trimIndent()
+            )
         )
 
         assertThat(registration.reviews, hasSize(1))

diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/oasys/OrdsClient.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/oasys/OrdsClient.kt
@@ -2,13 +2,17 @@ package uk.gov.justice.digital.hmpps.integrations.oasys
 
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonFormat
+import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.service.annotation.GetExchange
 import java.net.URI
 import java.time.LocalDate
 
 interface OrdsClient {
     @GetExchange
     fun getAssessmentSummary(uri: URI): AssessmentSummaries
+
+    @GetExchange(url = "/ass/sectionroshsumm/ALLOW/{assessmentPk}")
+    fun getRoshSummary(@PathVariable("assessmentPk") assessmentPk: Long): RoshSummary?
 }
 
 data class AssessmentSummary(
@@ -151,3 +155,12 @@ data class BasicSentencePlanArea(
     val bspAreaLinked: String?,
     val bspAreaLinkedDesc: String?
 )
+
+data class RoshSummary(
+    val assessments: List<RoshSummaryAssessment>
+)
+
+data class RoshSummaryAssessment(
+    val whoAtRisk: String? = null,
+    val natureOfRisk: String? = null,
+)
diff --git a/...nt-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt b/...nt-summary-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt
@@ -14,6 +14,7 @@ import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.Ref
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.ReferenceDataRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.referencedata.entity.registerLevel
 import uk.gov.justice.digital.hmpps.integrations.oasys.AssessmentSummary
+import uk.gov.justice.digital.hmpps.integrations.oasys.OrdsClient
 import uk.gov.justice.digital.hmpps.message.HmppsDomainEvent
 import java.time.LocalDate
 
@@ -23,6 +24,7 @@ class RiskService(
     private val registerTypeRepository: RegisterTypeRepository,
     private val referenceDataRepository: ReferenceDataRepository,
     private val contactService: ContactService,
+    private val ordsClient: OrdsClient,
     private val featureFlags: FeatureFlags
 ) {
     fun recordRisk(person: Person, summary: AssessmentSummary) =
@@ -75,8 +77,12 @@ class RiskService(
             if (matchingRegistrations.isEmpty()) {
                 val type = registerTypeRepository.getByCode(riskType.code)
                 val level = referenceDataRepository.registerLevel(riskLevel.code)
-                val notes =
-                    "The OASys assessment of ${summary.furtherInformation.pOAssessmentDesc} on ${summary.dateCompleted.toDeliusDate()} identified the ${type.description} to be ${level.description}"
+                val roshSummary = ordsClient.getRoshSummary(summary.assessmentPk)?.assessments?.singleOrNull()
+                val notes = """
+                |The OASys assessment of ${summary.furtherInformation.pOAssessmentDesc} on ${summary.dateCompleted.toDeliusDate()} identified the ${type.description} to be ${level.description}.
+                |${roshSummary?.whoAtRisk?.let { "\n|*R10.1 Who is at risk*\n|$it" }}
+                |${roshSummary?.natureOfRisk?.let { "\n|*R10.2 What is the nature of the risk*\n|$it" }}
+                """.trimMargin()
                 events += registrations.addRegistration(person, type, level, notes).regEvent(person.crn)
 
                 // Registrations in the type's duplicate group should also be removed