MAN-113: Return risk level (#4508)

ministryofjustice · Dec 20, 2024 · a357d88 · a357d88
1 parent 46af9fc
commit a357d88
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/...delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RiskFlagIntegrationTest.kt b/...delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/RiskFlagIntegrationTest.kt
@@ -13,6 +13,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import uk.gov.justice.digital.hmpps.api.model.risk.PersonRiskFlag
 import uk.gov.justice.digital.hmpps.api.model.risk.PersonRiskFlags
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.DEREGISTRATION_1
+import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.MAPPA_LEVEL
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.OVERVIEW
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.PERSON_2
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator.REGISTRATION_2
@@ -44,6 +45,10 @@ internal class RiskFlagIntegrationTest {
         assertThat(res.riskFlags.size, equalTo(3))
         assertThat(res.riskFlags[1].description, equalTo(REGISTRATION_2.type.description))
         assertThat(res.riskFlags[1].mostRecentReviewDate, equalTo(REGISTRATION_REVIEW_2.date))
+        assertThat(res.riskFlags[1].levelCode, equalTo(null))
+        assertThat(res.riskFlags[1].levelDescription, equalTo(null))
+        assertThat(res.riskFlags[2].levelCode, equalTo(MAPPA_LEVEL.code))
+        assertThat(res.riskFlags[2].levelDescription, equalTo(MAPPA_LEVEL.description))
         assertThat(res.removedRiskFlags.size, equalTo(1))
         assertThat(
             res.removedRiskFlags[0], equalTo(

diff --git a/...vision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/risk/RiskFlag.kt b/...vision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/risk/RiskFlag.kt
@@ -6,6 +6,8 @@ import java.time.LocalDate
 data class RiskFlag(
     val id: Long,
     val description: String,
+    val levelCode: String?,
+    val levelDescription: String?,
     val notes: String?,
     val nextReviewDate: LocalDate?,
     val mostRecentReviewDate: LocalDate?,

diff --git a/...upervision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt b/...upervision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/RiskService.kt
@@ -76,6 +76,8 @@ fun uk.gov.justice.digital.hmpps.integrations.delius.risk.RiskFlag.toMappa() = M
 fun uk.gov.justice.digital.hmpps.integrations.delius.risk.RiskFlag.toRiskFlag() = RiskFlag(
     id = id,
     description = type.description,
+    levelCode = level?.code,
+    levelDescription = level?.description,
     notes = notes,
     createdDate = createdDate,
     createdBy = Name(forename = createdBy.forename, surname = createdBy.surname),