Controller code and smoke test

Author: chiaramapellimt

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

@@ -61,16 +61,17 @@ class PersonController(
   @GetMapping("{encodedHmppsId}")
   fun getPerson(
     @PathVariable encodedHmppsId: String,
-  ): Map<String, Person?> {
+  ): Map<String, Map<String, Person?>> {
     val hmppsId = encodedHmppsId.decodeUrlCharacters()
-    val response = getPersonService.execute(hmppsId)
+    val response = getPersonService.getCombinedDataForPerson(hmppsId)
 
     if (response.hasErrorCausedBy(ENTITY_NOT_FOUND, causedBy = UpstreamApi.PROBATION_OFFENDER_SEARCH)) {
       throw EntityNotFoundException("Could not find person with id: $hmppsId")
     }
 
     auditService.createEvent("GET_PERSON_DETAILS", mapOf("hmppsId" to hmppsId))
-    return mapOf("data" to response.data)
+    val data = response.data.mapValues { it.value }
+    return mapOf("data" to data)
   }
 
   @GetMapping("{encodedHmppsId}/images")

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/controllers/v1/person/PersonControllerTest.kt

@@ -227,7 +227,9 @@ internal class PersonControllerTest(
         beforeTest {
           Mockito.reset(getPersonService)
           Mockito.reset(auditService)
-          whenever(getPersonService.execute(hmppsId)).thenReturn(Response(data = person))
+
+          val personMap = mapOf("probationOffenderSearch" to person, "prisonerOffenderSearch" to null)
+          whenever(getPersonService.getCombinedDataForPerson(hmppsId)).thenReturn(Response(data = personMap))
         }
 
         it("returns a 200 OK status code") {
@@ -248,9 +250,13 @@ internal class PersonControllerTest(
           val idThatDoesNotExist = "9999/11111Z"
 
           it("returns a 404 status code when a person cannot be found in both upstream APIs") {
-            whenever(getPersonService.execute(idThatDoesNotExist)).thenReturn(
+            whenever(getPersonService.getCombinedDataForPerson(idThatDoesNotExist)).thenReturn(
               Response(
-                data = null,
+                data =
+                  mapOf(
+                    "prisonerOffenderSearch" to null,
+                    "probationOffenderSearch" to null,
+                  ),
                 errors =
                   listOf(
                     UpstreamApiError(
@@ -268,9 +274,13 @@ internal class PersonControllerTest(
           }
 
           it("does not return a 404 status code when a person was found in one upstream API") {
-            whenever(getPersonService.execute(idThatDoesNotExist)).thenReturn(
+            whenever(getPersonService.getCombinedDataForPerson(idThatDoesNotExist)).thenReturn(
               Response(
-                data = Person("someFirstName", "someLastName"),
+                data =
+                  mapOf(
+                    "prisonerOffenderSearch" to null,
+                    "probationOffenderSearch" to Person("someFirstName", "someLastName"),
+                  ),
                 errors =
                   listOf(
                     UpstreamApiError(
@@ -291,7 +301,7 @@ internal class PersonControllerTest(
         it("gets a person with the matching ID") {
           mockMvc.performAuthorised("$basePath/$encodedHmppsId")
 
-          verify(getPersonService, times(1)).execute(hmppsId)
+          verify(getPersonService, times(1)).getCombinedDataForPerson(hmppsId)
         }
 
         it("returns a person with the matching ID") {
@@ -300,24 +310,28 @@ internal class PersonControllerTest(
           result.response.contentAsString.shouldBe(
             """
         {
-        "data": {
-          "firstName": "Silly",
-          "lastName": "Sobbers",
-          "middleName": null,
-          "dateOfBirth": null,
-          "gender": null,
-          "ethnicity": null,
-          "aliases": [],
-          "identifiers": {
-              "nomisNumber": null,
-              "croNumber": null,
-              "deliusCrn": null
+          "data": {
+            "probationOffenderSearch": {
+              "firstName": "Silly",
+              "lastName": "Sobbers",
+              "middleName": null,
+              "dateOfBirth": null,
+              "gender": null,
+              "ethnicity": null,
+              "aliases": [],
+              "identifiers": {
+                "nomisNumber": null,
+                "croNumber": null,
+                "deliusCrn": null
+              },
+            "pncId": null,
+            "hmppsId": null,
+            "contactDetails": null
           },
-          "pncId": null,
-          "hmppsId": null,
-          "contactDetails": null
-        }
+          "prisonerOffenderSearch": null
+          }
         }
+
         """.removeWhitespaceAndNewlines(),
           )
         }

src/test/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/smoke/person/PersonSmokeTest.kt

@@ -45,60 +45,88 @@ class PersonSmokeTest : DescribeSpec(
       response.body().shouldBe(
         """
   {
-    "data": {
-      "firstName": "string",
-      "lastName": "string",
-      "middleName": "string",
-      "dateOfBirth": "2019-08-24",
-      "gender": "string",
-      "ethnicity": "string",
-      "aliases": [
-        {
-          "firstName": "string",
-          "lastName": "string",
-          "middleName": "string",
-          "dateOfBirth": "2019-08-24",
-          "gender": "string",
-          "ethnicity": null
-        }
-      ],
-      "identifiers": {
-          "nomisNumber": "G5555TT",
-          "croNumber": "123456/24A",
-          "deliusCrn": "A123456"
+   "data":{
+      "prisonerOffenderSearch":{
+         "firstName":"Robert",
+         "lastName":"Larsen",
+         "middleName":"John James",
+         "dateOfBirth":"1975-04-02",
+         "gender":"Female",
+         "ethnicity":"White: Eng./Welsh/Scot./N.Irish/British",
+         "aliases":[
+            {
+               "firstName":"Robert",
+               "lastName":"Lorsen",
+               "middleName":"Trevor",
+               "dateOfBirth":"1975-04-02",
+               "gender":"Male",
+               "ethnicity":"White : Irish"
+            }
+         ],
+         "identifiers":{
+            "nomisNumber":"A1234AA",
+            "croNumber":"29906/12J",
+            "deliusCrn":null
+         },
+         "pncId":"12/394773H",
+         "hmppsId":null,
+         "contactDetails":null
       },
-      "pncId": "2012/0052494Q",
-      "hmppsId": "A123456",
-      "contactDetails": {
-        "addresses": [
-          {
-            "addressNumber": "string",
-            "district": "string",
-            "buildingName": "string",
-            "county": "string",
-            "from": "2019-08-24",
-            "postcode": "string",
-            "streetName": "string",
-            "type": {
-              "code": "string",
-              "description": "string"
-            },
-            "to": "2019-08-24",
-            "town": "string",
-            "noFixedAbode": true,
-            "notes": "string"
-          }
-        ],
-        "phoneNumbers": [
-          {
-            "number": "string",
-            "type": "TELEPHONE"
-          }
-        ],
-        "emails":null
+      "probationOffenderSearch":{
+         "firstName":"string",
+         "lastName":"string",
+         "middleName":"string",
+         "dateOfBirth":"2019-08-24",
+         "gender":"string",
+         "ethnicity":"string",
+         "aliases":[
+            {
+               "firstName":"string",
+               "lastName":"string",
+               "middleName":"string",
+               "dateOfBirth":"2019-08-24",
+               "gender":"string",
+               "ethnicity":null
+            }
+         ],
+         "identifiers":{
+            "nomisNumber":"G5555TT",
+            "croNumber":"123456/24A",
+            "deliusCrn":"A123456"
+         },
+         "pncId":"2012/0052494Q",
+         "hmppsId":"A123456",
+         "contactDetails":{
+            "addresses":[
+               {
+                  "addressNumber":"string",
+                  "district":"string",
+                  "buildingName":"string",
+                  "county":"string",
+                  "from":"2019-08-24",
+                  "postcode":"string",
+                  "streetName":"string",
+                  "type":{
+                     "code":"string",
+                     "description":"string"
+                  },
+                  "to":"2019-08-24",
+                  "town":"string",
+                  "noFixedAbode":true,
+                  "notes":"string"
+               }
+            ],
+            "phoneNumbers":[
+               {
+                  "number":"string",
+                  "type":"TELEPHONE"
+               }
+            ],
+            "emails":null
+         }
       }
-    }
-  }
+   }
+}
     """.removeWhitespaceAndNewlines(),
       )
     }