Gateway changes and modifications across other related tests

Author: chiaramapellimt

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/NDeliusGateway.kt

@@ -12,6 +12,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Offence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Sentence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.DynamicRisk
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.ndelius.NDeliusSupervisions
 
 @Component
@@ -69,6 +70,29 @@ class NDeliusGateway(
     }
   }
 
+  fun getDynamicRisksForPerson(id: String): Response<List<DynamicRisk>> {
+    val result =
+      webClient.request<NDeliusSupervisions>(
+        HttpMethod.GET,
+        "/case/$id/supervisions",
+        authenticationHeader(),
+        UpstreamApi.NDELIUS,
+      )
+
+    return when (result) {
+      is WebClientWrapperResponse.Success -> {
+        Response(data = result.data.dynamicRisks.map { it.toDynamicRisk() })
+      }
+
+      is WebClientWrapperResponse.Error -> {
+        Response(
+          data = emptyList(),
+          errors = result.errors,
+        )
+      }
+    }
+  }
+
   fun getMappaDetailForPerson(id: String): Response<MappaDetail?> {
     val result =
       webClient.request<NDeliusSupervisions>(

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/DynamicRisk.kt

@@ -0,0 +1,9 @@
+package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
+
+data class DynamicRisk(
+  val code: String? = null,
+  val description: String? = null,
+  val startDate: String? = null,
+  val reviewDate: String? = null,
+  val notes: String? = null,
+)

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/ndelius/NDeliusDynamicRisk.kt

@@ -0,0 +1,20 @@
+package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.ndelius
+
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.DynamicRisk
+
+data class NDeliusDynamicRisk(
+  val code: String? = null,
+  val description: String? = null,
+  val startDate: String? = null,
+  val reviewDate: String? = null,
+  val notes: String? = null,
+) {
+  fun toDynamicRisk(): DynamicRisk =
+    DynamicRisk(
+      code = this.code,
+      description = this.description,
+      startDate = this.startDate,
+      reviewDate = this.reviewDate,
+      notes = this.notes,
+    )
+}

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/ndelius/NDeliusSupervisions.kt

@@ -4,4 +4,5 @@ data class NDeliusSupervisions(
   val communityManager: NDeliusCommunityManager,
   val mappaDetail: NDeliusMappaDetail? = null,
   val supervisions: List<NDeliusSupervision>,
+  val dynamicRisks: List<NDeliusDynamicRisk>,
 )

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ndelius/GetCommunityOffenderManagerForPersonTest.kt

@@ -86,7 +86,8 @@ class GetCommunityOffenderManagerForPersonTest(
             {
               "communityManager": {},
               "mappaDetail": {},
-              "supervisions": []
+              "supervisions": [],
+              "dynamicRisks": []
             }
           """,
         )

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ndelius/GetMappaDetailForPersonTest.kt

@@ -81,7 +81,8 @@ class GetMappaDetailForPersonTest(
             {
               "communityManager": {},
               "mappaDetail": {},
-              "supervisions": []
+              "supervisions": [],
+              "dynamicRisks": []
             }
           """,
           )

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ndelius/GetOffencesForPersonTest.kt

@@ -146,7 +146,9 @@ class GetOffencesForPersonTest(
           {
           "communityManager": {},
           "mappaDetail": null,
-          "supervisions": [] }
+          "supervisions": [],
+          "dynamicRisks": []
+          }
           """,
           )
 

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ndelius/GetSentencesForPersonTest.kt

@@ -106,7 +106,9 @@ class GetSentencesForPersonTest(
           {
           "communityManager": {},
            "mappaDetail": {},
-            "supervisions": [] }
+           "supervisions": [],
+           "dynamicRisks": []
+           }
           """,
           )
 

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/ndelius/fixtures/GetSupervisionsResponse.json

@@ -150,5 +150,14 @@
         }
       ]
     }
+  ],
+  "dynamicRisks": [
+    {
+      "code": "ABC",
+      "description": "Child protection issues",
+      "startDate": "2018-07-27",
+      "reviewDate": "2026-03-20",
+      "notes": "These notes are about the person."
+    }
   ]
 }

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/ndelius/SupervisionsTest.kt

@@ -4,6 +4,7 @@ import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.helpers.generateTestSentence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Offence
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.DynamicRisk
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Sentence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SentenceLength
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SystemSource
@@ -40,6 +41,7 @@ class SupervisionsTest : DescribeSpec(
                     courtAppearances = listOf(NDeliusCourtAppearance(date = "2010-07-07T00:00:00+01:00", court = "London Magistrates Court")),
                   ),
                 ),
+              dynamicRisks = listOf(NDeliusDynamicRisk())
             )
 
           val integrationApiOffences = supervisions.supervisions.flatMap { it.toOffences() }
@@ -99,6 +101,7 @@ class SupervisionsTest : DescribeSpec(
                     courtAppearances = listOf(NDeliusCourtAppearance(date = "2009-07-07T00:00:00+01:00", court = "London Magistrates Court")),
                   ),
                 ),
+              dynamicRisks = listOf(NDeliusDynamicRisk())
             )
 
           val integrationApiOffences = supervisions.supervisions.flatMap { it.toOffences() }
@@ -144,6 +147,7 @@ class SupervisionsTest : DescribeSpec(
                     courtAppearances = listOf(NDeliusCourtAppearance(date = "2009-07-07T00:00:00+01:00", court = "London Magistrates Court")),
                   ),
                 ),
+              dynamicRisks = listOf(NDeliusDynamicRisk())
             )
 
           val integrationApiOffences = supervisions.supervisions.flatMap { it.toOffences() }
@@ -194,6 +198,7 @@ class SupervisionsTest : DescribeSpec(
                     courtAppearances = listOf(NDeliusCourtAppearance(date = "2010-07-07T00:00:00+01:00", court = "London Magistrates Court")),
                   ),
                 ),
+              dynamicRisks = listOf(NDeliusDynamicRisk())
             )
 
           val integrationApiOffences = supervisions.supervisions.flatMap { it.toOffences() }
@@ -253,6 +258,7 @@ class SupervisionsTest : DescribeSpec(
                   ),
               ),
             ),
+            dynamicRisks = listOf(NDeliusDynamicRisk())
           )
 
         val integrationApiSentences = supervisions.supervisions.map { it.toSentence() }
@@ -296,6 +302,7 @@ class SupervisionsTest : DescribeSpec(
             listOf(
               NDeliusSupervision(custodial = true),
             ),
+            dynamicRisks = listOf(NDeliusDynamicRisk())
           )
 
         supervisions.supervisions.first().toSentence().shouldBe(
@@ -316,5 +323,32 @@ class SupervisionsTest : DescribeSpec(
         )
       }
     }
+    describe("#toDynamicRisk"){
+      it("returns dynamic risk when present") {
+        val supervisions =
+          NDeliusSupervisions(
+            communityManager = NDeliusCommunityManager(),
+            mappaDetail = NDeliusMappaDetail(),
+            listOf(NDeliusSupervision(custodial = true)),
+            dynamicRisks = listOf(NDeliusDynamicRisk(
+              code = "ABC",
+              description = "Child Concerns",
+              startDate = "2020-01-02",
+              reviewDate = "2025-04-04",
+              notes = "To review in April."
+            ))
+          )
+
+        supervisions.dynamicRisks.first().toDynamicRisk().shouldBe(
+          DynamicRisk(
+            code = "ABC",
+            description = "Child Concerns",
+            startDate = "2020-01-02",
+            reviewDate = "2025-04-04",
+            notes = "To review in April."
+          )
+        )
+      }
+    }
   },
 )