[HIA-721]

WIP Fixed gateway properly and all the tests pass

Author: AlexHerbertMadeTech

gradle.properties

@@ -11,11 +11,10 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.RiskManagem
 @RestController
 @EnableConfigurationProperties(AuthorisationConfig::class)
 class RiskManagementController {
-
   @RequestMapping("/v1/persons/{encodedHmppsId}/risk-management-plan")
   fun getRiskManagementPlans(
     @PathVariable encodedHmppsId: String,
-  ) : Response<List<RiskManagementPlan>> {
-    return Response(emptyList(), emptyList() )
+  ): Response<List<RiskManagementPlan>> {
+    return Response(emptyList(), emptyList())
   }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/RiskManagementController.kt

@@ -10,17 +10,15 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
 
 @Component
-class RiskManagementGateway (
+class RiskManagementGateway(
   @Value("\${services.risk-management-plan-search.base-url}") baseUrl: String,
-){
-
+) {
   private val webClient = WebClientWrapper(baseUrl)
 
   @Autowired
   lateinit var hmppsAuthGateway: HmppsAuthGateway
 
-  fun getRiskManagementPlansForCrn(crn: String): Response<CrnRiskManagementPlans> {
-
+  fun getRiskManagementPlansForCrn(crn: String): Response<CrnRiskManagementPlans?> {
     val requestBody =
       mapOf("crn" to crn)
 
@@ -39,7 +37,7 @@ class RiskManagementGateway (
 
       is WebClientWrapper.WebClientWrapperResponse.Error -> {
         Response(
-          data = CrnRiskManagementPlans("", "", emptyList()),
+          data = null,
           errors = result.errors,
         )
       }

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

@@ -6,7 +6,7 @@ import java.util.stream.Collectors
 data class CrnRiskManagementPlans(
   val crn: String,
   val limitedAccessOffender: String,
-  val riskManagementPlan: List<CrnRiskManagementPlan>
+  val riskManagementPlan: List<CrnRiskManagementPlan>,
 ) {
   fun toRiskManagementPlans(): List<RiskManagementPlan> {
     return this.riskManagementPlan.stream()
@@ -57,4 +57,3 @@ data class CrnRiskManagementPlan(
   val laterCompleteAssessmentExists: String,
   val latestCompleteDate: String,
 )
-

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

@@ -1,7 +1,6 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps
 
-data class RiskManagementPlan (
-
+data class RiskManagementPlan(
   val assessmentId: String,
   val dateCompleted: String,
   val initiationDate: String,
@@ -15,5 +14,4 @@ data class RiskManagementPlan (
   val victimSafetyPlanning: String,
   val latestSignLockDate: String,
   val latestCompleteDate: String,
-
 )

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

@@ -0,0 +1,76 @@
+package uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.riskManagement
+
+import io.kotest.core.spec.style.DescribeSpec
+import io.kotest.matchers.shouldBe
+import org.mockito.Mockito
+import org.mockito.internal.verification.VerificationModeFactory
+import org.mockito.kotlin.verify
+import org.mockito.kotlin.whenever
+import org.springframework.boot.test.context.ConfigDataApplicationContextInitializer
+import org.springframework.boot.test.mock.mockito.MockBean
+import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.context.ContextConfiguration
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.HmppsAuthGateway
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.RiskManagementGateway
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.mockservers.HmppsAuthMockServer
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.mockservers.RiskManagementApiMockServer
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApiError
+import java.io.File
+
+@ActiveProfiles("test")
+@ContextConfiguration(
+  initializers = [ConfigDataApplicationContextInitializer::class],
+  classes = [RiskManagementGateway::class],
+)
+class RiskManagementGatewayTest(
+  @MockBean val hmppsAuthGateway: HmppsAuthGateway,
+  private val riskManagementGateway: RiskManagementGateway,
+) : DescribeSpec({
+
+    val riskManagementMockServer = RiskManagementApiMockServer()
+
+    beforeEach {
+      riskManagementMockServer.start()
+      Mockito.reset(hmppsAuthGateway)
+
+      whenever(hmppsAuthGateway.getClientToken("Risk Management Plan Search")).thenReturn(HmppsAuthMockServer.TOKEN)
+    }
+
+    afterTest {
+      riskManagementMockServer.stop()
+    }
+
+    describe("Get risks for given CRN") {
+      val crn = "D1974X"
+
+      beforeEach {
+        riskManagementMockServer.stubGetRiskManagementPlan(
+          crn,
+          File(
+            "src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/riskManagement/fixtures/GetRiskManagementPlanResponse.json",
+          ).readText(),
+        )
+      }
+
+      it("authenticates using HMPPS Auth with credentials") {
+        riskManagementGateway.getRiskManagementPlansForCrn(crn)
+        verify(hmppsAuthGateway, VerificationModeFactory.times(1)).getClientToken("Risk Management Plan Search")
+      }
+
+      it("returns a risk management plan when searching with a valid CRN") {
+        val response = riskManagementGateway.getRiskManagementPlansForCrn(crn)
+        val riskPlan = response.data
+        riskPlan?.crn.shouldBe(crn)
+        riskPlan?.riskManagementPlan?.size.shouldBe(1)
+        response.errors.size.shouldBe(0)
+      }
+
+      it("returns an error response when searching with an invalid CRN") {
+        val response = riskManagementGateway.getRiskManagementPlansForCrn("Not a valid CRN")
+        val riskPlan = response.data
+        riskPlan.shouldBe(null)
+        response.errors.size.shouldBe(1)
+        response.errors[0].type.shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
+      }
+    }
+  })

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/riskManagement/RiskManagementGatewayTest.kt

@@ -1,9 +1,9 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.mockservers
 
 import com.github.tomakehurst.wiremock.WireMockServer
-import com.github.tomakehurst.wiremock.client.WireMock.matching
-import com.github.tomakehurst.wiremock.client.WireMock.get
 import com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import com.github.tomakehurst.wiremock.client.WireMock.get
+import com.github.tomakehurst.wiremock.client.WireMock.matching
 import org.springframework.http.HttpStatus
 
 class RiskManagementApiMockServer : WireMockServer(WIREMOCK_PORT) {
@@ -17,7 +17,7 @@ class RiskManagementApiMockServer : WireMockServer(WIREMOCK_PORT) {
     status: HttpStatus = HttpStatus.OK,
   ) {
     stubFor(
-      get("risks/crn/$crn/risk-management-plan")
+      get("/risks/crn/$crn/risk-management-plan")
         .withHeader("Authorization", matching("Bearer ${HmppsAuthMockServer.TOKEN}"))
         .willReturn(
           aResponse()
@@ -27,5 +27,4 @@ class RiskManagementApiMockServer : WireMockServer(WIREMOCK_PORT) {
         ),
     )
   }
-
 }