Hia 765 cell location not found if person has no probation record (#531)

* HIA-765 - update logic to check if nomis number is provided

* HIA-765 - update test

* HIA-765 - update test

* HIA-765 - minor refactor

* HIA-765 - fix lint errors

Author: achimber-moj

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetCellLocationForPersonService.kt

@@ -12,11 +12,23 @@ class GetCellLocationForPersonService(
   @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
 ) {
   fun execute(hmppsId: String): Response<CellLocation?> {
-    val personResponse = getPersonService.execute(hmppsId = hmppsId)
-
     val prisonResponse =
-      personResponse.data?.identifiers?.nomisNumber?.let {
-        prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = it)
+      when (isNomsNumber(hmppsId)) {
+        true -> prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = hmppsId)
+        else -> {
+          val personResponse = getPersonService.execute(hmppsId = hmppsId)
+
+          if (personResponse.data == null) {
+            return Response(
+              data = CellLocation(),
+              errors = personResponse.errors,
+            )
+          }
+
+          personResponse.data.identifiers.nomisNumber?.let {
+            prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = it)
+          }
+        }
       }
 
     val cellLocation =
@@ -28,7 +40,7 @@ class GetCellLocationForPersonService(
 
     return Response(
       data = cellLocation,
-      errors = personResponse.errors + (prisonResponse?.errors ?: emptyList()),
+      errors = prisonResponse?.errors ?: emptyList(),
     )
   }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetPersonService.kt

@@ -106,3 +106,7 @@ class GetPersonService(
 
   fun getPersonFromNomis(nomisNumber: String) = prisonerOffenderSearchGateway.getPrisonOffender(nomisNumber)
 }
+
+fun isNomsNumber(id: String?): Boolean {
+  return id?.matches(Regex("^[A-Z]\\d{4}[A-Z]{2}+$")) == true
+}

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/integration/person/PersonIntegrationTest.kt

@@ -1,6 +1,8 @@
 package uk.gov.justice.digital.hmpps.hmppsintegrationapi.integration.person
 
 import org.junit.jupiter.api.Test
+import org.junit.jupiter.params.ParameterizedTest
+import org.junit.jupiter.params.provider.ValueSource
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.content
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.integration.IntegrationTestBase
@@ -44,9 +46,10 @@ class PersonIntegrationTest : IntegrationTestBase() {
       )
   }
 
-  @Test
-  fun `returns person cell location if in prison`() {
-    callApi("$basePath/$pnc/cell-location")
+  @ParameterizedTest
+  @ValueSource(strings = ["2004%2F13116M", "G2996UX"])
+  fun `returns person cell location if in prison`(hmppsId: String) {
+    callApi("$basePath/$hmppsId/cell-location")
       .andExpect(status().isOk)
       .andExpect(
         content().json(

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/services/GetCellLocationForPersonServiceTest.kt

@@ -8,8 +8,8 @@ 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.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.models.hmpps.CellLocation
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Identifiers
@@ -24,8 +24,8 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.prisoneroffenders
   classes = [GetCellLocationForPersonService::class],
 )
 internal class GetCellLocationForPersonServiceTest(
-  @MockBean val getPersonService: GetPersonService,
-  @MockBean val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
+  @MockitoBean val getPersonService: GetPersonService,
+  @MockitoBean val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
   private val getCellLocationForPersonService: GetCellLocationForPersonService,
 ) : DescribeSpec(
     {
@@ -76,5 +76,26 @@ internal class GetCellLocationForPersonServiceTest(
         response.errors.first().causedBy.shouldBe(UpstreamApi.PROBATION_OFFENDER_SEARCH)
         response.errors.first().type.shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
       }
+
+      it("returns the upstream error when nomis id is not found") {
+        whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomisNumber)).thenReturn(
+          Response(
+            data = null,
+            errors =
+              listOf(
+                UpstreamApiError(
+                  causedBy = UpstreamApi.PRISONER_OFFENDER_SEARCH,
+                  type = UpstreamApiError.Type.ENTITY_NOT_FOUND,
+                ),
+              ),
+          ),
+        )
+
+        val response = getCellLocationForPersonService.execute(nomisNumber)
+
+        response.errors.shouldHaveSize(1)
+        response.errors.first().causedBy.shouldBe(UpstreamApi.PRISONER_OFFENDER_SEARCH)
+        response.errors.first().type.shouldBe(UpstreamApiError.Type.ENTITY_NOT_FOUND)
+      }
     },
   )