PI-2378 check prison offender search when probation gets no result fo…

…r noms number (#539)
ministryofjustice · Dec 13, 2024 · 78151ac · 78151ac
1 parent cad8f10
commit 78151ac
Show file tree

Hide file tree

Showing 5 changed files with 173 additions and 141 deletions.
diff --git a/...k/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/prison/PrisonController.kt b/...k/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/prison/PrisonController.kt
@@ -39,7 +39,7 @@ class PrisonController(
   ): DataResponse<Person?> {
     val response = getPersonService.getPrisoner(hmppsId)
 
-    if (response.hasErrorCausedBy(ENTITY_NOT_FOUND, causedBy = UpstreamApi.PROBATION_OFFENDER_SEARCH)) {
+    if (response.hasErrorCausedBy(ENTITY_NOT_FOUND, causedBy = UpstreamApi.PRISONER_OFFENDER_SEARCH)) {
       throw EntityNotFoundException("Could not find person with hmppsId: $hmppsId")
     }
 

diff --git a/...main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonService.kt b/...main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonService.kt
@@ -17,9 +17,13 @@ class GetPersonService(
   @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
 ) {
   fun execute(hmppsId: String): Response<Person?> {
-    val personFromProbationOffenderSearch = probationOffenderSearchGateway.getPerson(id = hmppsId)
-
-    return Response(data = personFromProbationOffenderSearch.data, errors = personFromProbationOffenderSearch.errors)
+    val probationResponse = probationOffenderSearchGateway.getPerson(id = hmppsId)
+    if (identifyHmppsId(hmppsId) == IdentifierType.NOMS && probationResponse.data == null) {
+      val prisonResponse = prisonerOffenderSearchGateway.getPrisonOffender(hmppsId)
+      return Response(data = prisonResponse.data?.toPerson(), prisonResponse.errors)
+    } else {
+      return Response(data = probationResponse.data, errors = probationResponse.errors)
+    }
   }
 
   enum class IdentifierType {

diff --git a/...v/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/prison/PrisonControllerTest.kt b/...v/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/prison/PrisonControllerTest.kt
@@ -134,7 +134,7 @@ internal class PrisonControllerTest(
             listOf(
               UpstreamApiError(
                 type = ENTITY_NOT_FOUND,
-                causedBy = UpstreamApi.PROBATION_OFFENDER_SEARCH,
+                causedBy = UpstreamApi.PRISONER_OFFENDER_SEARCH,
                 description = "Prisoner not found",
               ),
             ),

diff --git a/...igital/hmpps/hmppsintegrationapi/gateways/nomis/GetLatestSentenceKeyDatesForPersonTest.kt b/...igital/hmpps/hmppsintegrationapi/gateways/nomis/GetLatestSentenceKeyDatesForPersonTest.kt
@@ -30,7 +30,7 @@ class GetLatestSentenceKeyDatesForPersonTest(
 ) : DescribeSpec(
     {
       val nomisApiMockServer = NomisApiMockServer()
-      val offenderNo = "abc123"
+      val offenderNo = "A1234AB"
       val sentencePath = "/api/offenders/$offenderNo/sentences"
       beforeEach {
         nomisApiMockServer.start()

diff --git a/.../kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonServiceTest.kt b/.../kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonServiceTest.kt
@@ -5,6 +5,7 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.services
 import io.kotest.core.spec.style.DescribeSpec
 import io.kotest.matchers.shouldBe
 import io.kotest.matchers.types.shouldBeTypeOf
+import org.assertj.core.api.Assertions.assertThat
 import org.mockito.Mockito
 import org.mockito.internal.verification.VerificationModeFactory
 import org.mockito.kotlin.verify
@@ -14,8 +15,15 @@ import org.springframework.test.context.ContextConfiguration
 import org.springframework.test.context.bean.override.mockito.MockitoBean
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.PrisonerOffenderSearchGateway
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.ProbationOffenderSearchGateway
-import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.*
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Identifiers
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.OffenderSearchResponse
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Person
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.PersonOnProbation
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
+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.prisoneroffendersearch.POSPrisoner
+import java.time.LocalDate
 
 @ContextConfiguration(
   initializers = [ConfigDataApplicationContextInitializer::class],
@@ -25,141 +33,161 @@ internal class GetPersonServiceTest(
   @MockitoBean val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
   @MockitoBean val probationOffenderSearchGateway: ProbationOffenderSearchGateway,
   private val getPersonService: GetPersonService,
-) : DescribeSpec({
-    val hmppsId = "2003/13116M"
-
-    beforeEach {
-      Mockito.reset(prisonerOffenderSearchGateway)
-      Mockito.reset(probationOffenderSearchGateway)
-
-      whenever(prisonerOffenderSearchGateway.getPersons("Qui-gon", "Jin", "1966-10-25")).thenReturn(
-        Response(data = listOf(Person(firstName = "Qui-gon", lastName = "Jin", identifiers = Identifiers(nomisNumber = "A1234AA")))),
-      )
-      whenever(probationOffenderSearchGateway.getPerson(id = hmppsId)).thenReturn(
-        Response(data = PersonOnProbation(Person(firstName = "Qui-gon", lastName = "Jin", identifiers = Identifiers(nomisNumber = "A1234AA")), underActiveSupervision = true)),
-      )
-      whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = "A1234AA")).thenReturn(
-        Response(data = POSPrisoner(firstName = "Sam", lastName = "Mills")),
-      )
-    }
-
-    it("gets a person from Probation Offender Search") {
-      getPersonService.execute(hmppsId)
-
-      verify(probationOffenderSearchGateway, VerificationModeFactory.times(1)).getPerson(hmppsId)
-    }
-
-    it("returns a person") {
-      val personFromProbationOffenderSearch = PersonOnProbation(Person("Molly", "Mob"), underActiveSupervision = true)
-
-      whenever(probationOffenderSearchGateway.getPerson(hmppsId)).thenReturn(
-        Response(personFromProbationOffenderSearch),
-      )
-
-      val result = getPersonService.execute(hmppsId)
-
-      result.data.shouldBe(personFromProbationOffenderSearch)
-    }
-
-    it("returns null when a person isn't found in probation offender search") {
-      whenever(probationOffenderSearchGateway.getPerson(id = hmppsId)).thenReturn(Response(data = null))
-
-      val result = getPersonService.execute(hmppsId)
-      val expectedResult = null
-
-      result.data.shouldBe(expectedResult)
-    }
-
-    it("returns a person with both probation and prison data when prison data exists") {
-      val personFromProbationOffenderSearch = PersonOnProbation(Person("Paula", "First", identifiers = Identifiers(nomisNumber = "A1234AA")), underActiveSupervision = true)
-      val personFromPrisonOffenderSearch = POSPrisoner("Sam", "Mills")
-
-      whenever(probationOffenderSearchGateway.getPerson(hmppsId)).thenReturn(
-        Response(data = personFromProbationOffenderSearch),
-      )
-      whenever(prisonerOffenderSearchGateway.getPrisonOffender("A1234AA")).thenReturn(
-        Response(data = personFromPrisonOffenderSearch),
-      )
-
-      val result = getPersonService.getCombinedDataForPerson(hmppsId)
-      val expectedResult = result.data
-
-      result.data.shouldBe(expectedResult)
-      result.errors shouldBe emptyList()
-    }
-
-    it("returns errors when unable to retrieve prison data and data when probation data is available") {
-      val personFromProbationOffenderSearch = PersonOnProbation(Person("Paula", "First", identifiers = Identifiers(nomisNumber = "A1234AA")), underActiveSupervision = true)
-
-      whenever(probationOffenderSearchGateway.getPerson(hmppsId)).thenReturn(Response(data = personFromProbationOffenderSearch))
-      whenever(prisonerOffenderSearchGateway.getPrisonOffender("A1234AA")).thenReturn(Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.PRISONER_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND, "MockError"))))
-
-      val result = getPersonService.getCombinedDataForPerson(hmppsId)
-      result.data shouldBe OffenderSearchResponse(prisonerOffenderSearch = null, probationOffenderSearch = personFromProbationOffenderSearch)
-      result.errors
-        .first()
-        .causedBy
-        .shouldBe(UpstreamApi.PRISONER_OFFENDER_SEARCH)
-      result.errors
-        .first()
-        .type
-        .shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
-      result.errors
-        .first()
-        .description
-        .shouldBe("MockError")
-    }
-
-    it("returns a prisoner when valid hmppsId is provided") {
-      val validHmppsId = "G2996UX"
-      val person = Person(firstName = "Sam", lastName = "Mills")
-      whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = "G2996UX")).thenReturn(
-        Response(data = POSPrisoner(firstName = "Sam", lastName = "Mills")),
-      )
-
-      val result = getPersonService.getPrisoner(validHmppsId)
-
-      result.data.shouldBeTypeOf<Person>()
-      result.data!!.firstName.shouldBe(person.firstName)
-      result.data!!.lastName.shouldBe(person.lastName)
-      result.errors.shouldBe(emptyList())
-    }
-
-    it("returns null when prisoner is not found") {
-      val zeroHitHmppsId = "G2996UX"
-      val prisonResponse: Response<POSPrisoner?> = Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.PRISONER_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND, "Not found")))
-
-      whenever(prisonerOffenderSearchGateway.getPrisonOffender("G2996UX")).thenReturn(Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.PRISONER_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND, "Not found"))))
-      val result = getPersonService.getPrisoner(zeroHitHmppsId)
-
-      result.data.shouldBe(null)
-      result.errors.shouldBe(prisonResponse.errors)
-    }
-
-    it("returns error when invalid hmppsId is provided") {
-      val invalidHmppsId = "invalid_id"
-      val expectedError = UpstreamApiError(UpstreamApi.NOMIS, UpstreamApiError.Type.BAD_REQUEST, "Invalid HMPPS ID: $invalidHmppsId")
-      val result = getPersonService.getPrisoner(invalidHmppsId)
-
-      result.data.shouldBe(null)
-      result.errors.shouldBe(listOf(expectedError))
-    }
-
-    it("returns error when nomis number is not found") {
-      val hmppsIdInCrnFormat = "AB123123"
-      val expectedError =
-        listOf(
-          UpstreamApiError(UpstreamApi.NOMIS, UpstreamApiError.Type.ENTITY_NOT_FOUND, "NOMIS number not found"),
-          UpstreamApiError(causedBy = UpstreamApi.PROBATION_OFFENDER_SEARCH, type = UpstreamApiError.Type.ENTITY_NOT_FOUND, description = "NOMIS number not found"),
+) : DescribeSpec(
+    {
+      val hmppsId = "2003/13116M"
+
+      val nomsNumber = "N1234PS"
+      val prisoner = POSPrisoner(firstName = "Jim", lastName = "Brown", dateOfBirth = LocalDate.of(1992, 12, 3), prisonerNumber = nomsNumber)
+
+      beforeEach {
+        Mockito.reset(prisonerOffenderSearchGateway)
+        Mockito.reset(probationOffenderSearchGateway)
+
+        whenever(prisonerOffenderSearchGateway.getPersons("Qui-gon", "Jin", "1966-10-25")).thenReturn(
+          Response(data = listOf(Person(firstName = "Qui-gon", lastName = "Jin", identifiers = Identifiers(nomisNumber = "A1234AA")))),
+        )
+        whenever(probationOffenderSearchGateway.getPerson(id = hmppsId)).thenReturn(
+          Response(data = PersonOnProbation(Person(firstName = "Qui-gon", lastName = "Jin", identifiers = Identifiers(nomisNumber = "A1234AA")), underActiveSupervision = true)),
+        )
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = "A1234AA")).thenReturn(
+          Response(data = POSPrisoner(firstName = "Sam", lastName = "Mills")),
+        )
+        whenever(probationOffenderSearchGateway.getPerson(id = nomsNumber))
+          .thenReturn(Response(data = null, errors = listOf(UpstreamApiError(causedBy = UpstreamApi.PROBATION_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND))))
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = nomsNumber)).thenReturn(Response(data = prisoner))
+      }
+
+      it("gets a person from Probation Offender Search") {
+        getPersonService.execute(hmppsId)
+
+        verify(probationOffenderSearchGateway, VerificationModeFactory.times(1)).getPerson(hmppsId)
+      }
+
+      it("gets a person from Prison Offender Search when hmpps id is noms number and not found in probation search") {
+        val response = getPersonService.execute(nomsNumber)
+        verify(probationOffenderSearchGateway).getPerson(nomsNumber)
+        verify(prisonerOffenderSearchGateway).getPrisonOffender(nomsNumber)
+        with(requireNotNull(response.data)) {
+          assertThat(firstName).isEqualTo(prisoner.firstName)
+          assertThat(lastName).isEqualTo(prisoner.lastName)
+          assertThat(dateOfBirth).isEqualTo(prisoner.dateOfBirth)
+          assertThat(nomsNumber).isEqualTo(prisoner.prisonerNumber)
+        }
+      }
+
+      it("returns a person") {
+        val personFromProbationOffenderSearch = PersonOnProbation(Person("Molly", "Mob"), underActiveSupervision = true)
+
+        whenever(probationOffenderSearchGateway.getPerson(hmppsId)).thenReturn(
+          Response(personFromProbationOffenderSearch),
+        )
+
+        val result = getPersonService.execute(hmppsId)
+
+        result.data.shouldBe(personFromProbationOffenderSearch)
+      }
+
+      it("returns null when a person isn't found in probation offender search") {
+        whenever(probationOffenderSearchGateway.getPerson(id = hmppsId)).thenReturn(Response(data = null))
+
+        val result = getPersonService.execute(hmppsId)
+        val expectedResult = null
+
+        result.data.shouldBe(expectedResult)
+      }
+
+      it("returns a person with both probation and prison data when prison data exists") {
+        val personFromProbationOffenderSearch = PersonOnProbation(Person("Paula", "First", identifiers = Identifiers(nomisNumber = "A1234AA")), underActiveSupervision = true)
+        val personFromPrisonOffenderSearch = POSPrisoner("Sam", "Mills")
+
+        whenever(probationOffenderSearchGateway.getPerson(hmppsId)).thenReturn(
+          Response(data = personFromProbationOffenderSearch),
+        )
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender("A1234AA")).thenReturn(
+          Response(data = personFromPrisonOffenderSearch),
+        )
+
+        val result = getPersonService.getCombinedDataForPerson(hmppsId)
+        val expectedResult = result.data
+
+        result.data.shouldBe(expectedResult)
+        result.errors shouldBe emptyList()
+      }
+
+      it("returns errors when unable to retrieve prison data and data when probation data is available") {
+        val personFromProbationOffenderSearch = PersonOnProbation(Person("Paula", "First", identifiers = Identifiers(nomisNumber = "A1234AA")), underActiveSupervision = true)
+
+        whenever(probationOffenderSearchGateway.getPerson(hmppsId)).thenReturn(Response(data = personFromProbationOffenderSearch))
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender("A1234AA")).thenReturn(Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.PRISONER_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND, "MockError"))))
+
+        val result = getPersonService.getCombinedDataForPerson(hmppsId)
+        result.data shouldBe OffenderSearchResponse(prisonerOffenderSearch = null, probationOffenderSearch = personFromProbationOffenderSearch)
+        result.errors
+          .first()
+          .causedBy
+          .shouldBe(UpstreamApi.PRISONER_OFFENDER_SEARCH)
+        result.errors
+          .first()
+          .type
+          .shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
+        result.errors
+          .first()
+          .description
+          .shouldBe("MockError")
+      }
+
+      it("returns a prisoner when valid hmppsId is provided") {
+        val validHmppsId = "G2996UX"
+        val person = Person(firstName = "Sam", lastName = "Mills")
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = "G2996UX")).thenReturn(
+          Response(data = POSPrisoner(firstName = "Sam", lastName = "Mills")),
         )
 
-      whenever(probationOffenderSearchGateway.getPerson(id = hmppsIdInCrnFormat)).thenReturn(
-        Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.NOMIS, UpstreamApiError.Type.ENTITY_NOT_FOUND, "NOMIS number not found"))),
-      )
+        val result = getPersonService.getPrisoner(validHmppsId)
+
+        result.data.shouldBeTypeOf<Person>()
+        result.data!!.firstName.shouldBe(person.firstName)
+        result.data!!.lastName.shouldBe(person.lastName)
+        result.errors.shouldBe(emptyList())
+      }
+
+      it("returns null when prisoner is not found") {
+        val zeroHitHmppsId = "G2996UX"
+        val prisonResponse: Response<POSPrisoner?> = Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.PRISONER_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND, "Not found")))
+
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender("G2996UX")).thenReturn(Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.PRISONER_OFFENDER_SEARCH, UpstreamApiError.Type.ENTITY_NOT_FOUND, "Not found"))))
+        val result = getPersonService.getPrisoner(zeroHitHmppsId)
+
+        result.data.shouldBe(null)
+        result.errors.shouldBe(prisonResponse.errors)
+      }
+
+      it("returns error when invalid hmppsId is provided") {
+        val invalidHmppsId = "invalid_id"
+        val expectedError = UpstreamApiError(UpstreamApi.NOMIS, UpstreamApiError.Type.BAD_REQUEST, "Invalid HMPPS ID: $invalidHmppsId")
+        val result = getPersonService.getPrisoner(invalidHmppsId)
+
+        result.data.shouldBe(null)
+        result.errors.shouldBe(listOf(expectedError))
+      }
+
+      it("returns error when nomis number is not found") {
+        val hmppsIdInCrnFormat = "AB123123"
+        val expectedError =
+          listOf(
+            UpstreamApiError(UpstreamApi.NOMIS, UpstreamApiError.Type.ENTITY_NOT_FOUND, "NOMIS number not found"),
+            UpstreamApiError(causedBy = UpstreamApi.PROBATION_OFFENDER_SEARCH, type = UpstreamApiError.Type.ENTITY_NOT_FOUND, description = "NOMIS number not found"),
+          )
+
+        whenever(probationOffenderSearchGateway.getPerson(id = hmppsIdInCrnFormat)).thenReturn(
+          Response(data = null, errors = listOf(UpstreamApiError(UpstreamApi.NOMIS, UpstreamApiError.Type.ENTITY_NOT_FOUND, "NOMIS number not found"))),
+        )
 
-      val result = getPersonService.getPrisoner(hmppsIdInCrnFormat)
+        val result = getPersonService.getPrisoner(hmppsIdInCrnFormat)
 
-      result.data.shouldBe(null)
-      result.errors.shouldBe(expectedError)
-    }
-  })
+        result.data.shouldBe(null)
+        result.errors.shouldBe(expectedError)
+      }
+    },
+  )