GetPerson service - added another method

Author: chiaramapellimt

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

@@ -2,17 +2,48 @@ package uk.gov.justice.digital.hmpps.hmppsintegrationapi.services
 
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.stereotype.Service
+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.Person
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
 
 @Service
 class GetPersonService(
   @Autowired val probationOffenderSearchGateway: ProbationOffenderSearchGateway,
+  @Autowired val prisonerOffenderSearchGateway: PrisonerOffenderSearchGateway,
 ) {
   fun execute(hmppsId: String): Response<Person?> {
     val personFromProbationOffenderSearch = probationOffenderSearchGateway.getPerson(id = hmppsId)
 
     return Response(data = personFromProbationOffenderSearch.data, errors = personFromProbationOffenderSearch.errors)
   }
+
+  fun getCombinedDataForPerson(hmppsId: String): Response<Map<String, Person?>> {
+    val probationResponse = probationOffenderSearchGateway.getPerson(id = hmppsId)
+
+    val prisonResponse =
+      probationResponse.data?.identifiers?.nomisNumber?.let {
+        prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = it)
+      }
+
+    return if (prisonResponse != null) {
+      Response(
+        data =
+          mapOf(
+            "prisonerOffenderSearch" to prisonResponse.data?.toPerson(),
+            "probationOffenderSearch" to probationResponse.data,
+          ),
+        errors = prisonResponse.errors + probationResponse.errors,
+      )
+    } else {
+      Response(
+        data =
+          mapOf(
+            "prisonerOffenderSearch" to null,
+            "probationOffenderSearch" to probationResponse.data,
+          ),
+        errors = probationResponse.errors,
+      )
+    }
+  }
 }

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

@@ -14,6 +14,7 @@ import uk.gov.justice.digital.hmpps.hmppsintegrationapi.gateways.ProbationOffend
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Identifiers
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Person
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.prisoneroffendersearch.POSPrisoner
 
 @ContextConfiguration(
   initializers = [ConfigDataApplicationContextInitializer::class],
@@ -36,6 +37,9 @@ internal class GetPersonServiceTest(
       whenever(probationOffenderSearchGateway.getPerson(id = hmppsId)).thenReturn(
         Response(data = Person(firstName = "Qui-gon", lastName = "Jin", identifiers = Identifiers(nomisNumber = "A1234AA"))),
       )
+      whenever(prisonerOffenderSearchGateway.getPrisonOffender(nomsNumber = "A1234AA")).thenReturn(
+        Response(data = POSPrisoner(firstName = "Sam", lastName = "Mills")),
+      )
     }
 
     it("gets a person from Probation Offender Search") {
@@ -66,4 +70,22 @@ internal class GetPersonServiceTest(
 
       result.data.shouldBe(expectedResult)
     }
+
+    it("returns a person with both probation and prison data when prison data exists") {
+      val personFromProbationOffenderSearch = Person("Paula", "First", identifiers = Identifiers(nomisNumber = "A1234AA"))
+      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()
+    }
   })