add exception handling for bad request on getAccountsForPerson in nomis gateway

Author: emmalanigan

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

@@ -4,6 +4,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.http.HttpMethod
 import org.springframework.stereotype.Component
+import org.springframework.web.reactive.function.client.WebClientResponseException
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.WebClientWrapper
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.WebClientWrapper.WebClientWrapperResponse
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Address
@@ -17,6 +18,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Sentence
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SentenceAdjustment
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.SentenceKeyDates
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApi
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.UpstreamApiError
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.nomis.NomisAccounts
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.nomis.NomisAddress
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.nomis.NomisAlert
@@ -310,24 +312,37 @@ class NomisGateway(
     prisonId: String,
     nomisNumber: String?,
   ): Response<NomisAccounts?> {
-    val result =
-      webClient.request<NomisAccounts>(
-        HttpMethod.GET,
-        "/api/v1/prison/$prisonId/offenders/$nomisNumber/accounts",
-        authenticationHeader(),
-        UpstreamApi.NOMIS,
-      )
-    return when (result) {
-      is WebClientWrapperResponse.Success -> {
-        Response(data = result.data)
-      }
-
-      is WebClientWrapperResponse.Error -> {
-        Response(
-          data = null,
-          errors = result.errors,
+    try {
+      val result =
+        webClient.request<NomisAccounts>(
+          HttpMethod.GET,
+          "/api/v1/prison/$prisonId/offenders/$nomisNumber/accounts",
+          authenticationHeader(),
+          UpstreamApi.NOMIS,
         )
+      return when (result) {
+        is WebClientWrapperResponse.Success -> {
+          Response(data = result.data)
+        }
+
+        is WebClientWrapperResponse.Error -> {
+          Response(
+            data = null,
+            errors = result.errors,
+          )
+        }
       }
+    } catch (e: WebClientResponseException.BadRequest) {
+      return Response(
+        data = null,
+        errors =
+          listOf(
+            UpstreamApiError(
+              causedBy = UpstreamApi.NOMIS,
+              type = UpstreamApiError.Type.BAD_REQUEST,
+            ),
+          ),
+      )
     }
   }
 

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/nomis/GetAccountsForPersonTest.kt

@@ -82,5 +82,27 @@ class GetAccountsForPersonTest(
           response.errors.first().causedBy.shouldBe(UpstreamApi.NOMIS)
           response.errors.first().type.shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
         }
+
+//          it("returns null when 400 Bad Request is returned") {
+//              nomisApiMockServer.stubNomisApiResponse(
+//                  accountsPath,
+//                  "",
+//                  HttpStatus.BAD_REQUEST,
+//              )
+//              val response =
+//                  shouldThrow<WebClientResponseException> {
+//                      nomisGateway.getAccountsForPerson(prisonId, nomisNumber)
+//                  }
+//              response.statusCode.shouldBe(HttpStatus.BAD_REQUEST)
+//          }
+        it("returns an error when 400 Bad Request is returned because of invalid ID") {
+          nomisApiMockServer.stubNomisApiResponse(accountsPath, "", HttpStatus.BAD_REQUEST)
+
+          val response = nomisGateway.getAccountsForPerson(prisonId, nomisNumber)
+
+          response.errors.shouldHaveSize(1)
+          response.errors.first().causedBy.shouldBe(UpstreamApi.NOMIS)
+          response.errors.first().type.shouldBe(UpstreamApiError.Type.BAD_REQUEST)
+        }
       },
     )

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/probationoffendersearch/ProbationOffenderSearchGatewayTest.kt

@@ -361,6 +361,9 @@ class ProbationOffenderSearchGatewayTest(
           response.statusCode.shouldBe(HttpStatus.BAD_REQUEST)
         }
 
+        // 1. Change their gateway tests to pass (but will we have still broken the endpoints)
+        // 2. Change our code to catch the exception instead
+
         it("returns null when no offenders are returned") {
           probationOffenderSearchApiMockServer.stubPostOffenderSearch(
             "{\"pncNumber\": \"$hmppsId\"}",