Changed the return JSON structure

Author: chiaramapellimt

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

@@ -61,7 +61,7 @@ class PersonController(
   @GetMapping("{encodedHmppsId}")
   fun getPerson(
     @PathVariable encodedHmppsId: String,
-  ): Map<String, Map<String, Person?>> {
+  ): Map<String, Person?> {
     val hmppsId = encodedHmppsId.decodeUrlCharacters()
     val response = getPersonService.getCombinedDataForPerson(hmppsId)
 
@@ -70,8 +70,7 @@ class PersonController(
     }
 
     auditService.createEvent("GET_PERSON_DETAILS", mapOf("hmppsId" to hmppsId))
-    val data = response.data.mapValues { it.value }
-    return mapOf("data" to data)
+    return response.data
   }
 
   @GetMapping("{encodedHmppsId}/images")

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

@@ -317,48 +317,42 @@ internal class PersonControllerTest(
 
           result.response.contentAsString.shouldBe(
             """
-            {
-             "data":{
-                "probationOffenderSearch":{
-                   "firstName":"Sam",
-                   "lastName":"Smith",
-                   "middleName":null,
-                   "dateOfBirth":null,
-                   "gender":null,
-                   "ethnicity":null,
-                   "aliases":[
-
-                   ],
-                   "identifiers":{
-                      "nomisNumber":"1234ABC",
-                      "croNumber":null,
-                      "deliusCrn":null
-                   },
-                   "pncId":null,
-                   "hmppsId":null,
-                   "contactDetails":null
-                },
-                "prisonerOffenderSearch":{
-                   "firstName":"Kim",
-                   "lastName":"Kardashian",
-                   "middleName":null,
-                   "dateOfBirth":null,
-                   "gender":null,
-                   "ethnicity":null,
-                   "aliases":[
-
-                   ],
-                   "identifiers":{
-                      "nomisNumber":null,
-                      "croNumber":null,
-                      "deliusCrn":null
-                   },
-                   "pncId":null,
-                   "hmppsId":null,
-                   "contactDetails":null
-                }
-             }
+        {
+          "probationOffenderSearch":{
+             "firstName":"Sam",
+             "lastName":"Smith",
+             "middleName":null,
+             "dateOfBirth":null,
+             "gender":null,
+             "ethnicity":null,
+             "aliases":[],
+             "identifiers":{
+                "nomisNumber":"1234ABC",
+                "croNumber":null,
+                "deliusCrn":null
+             },
+             "pncId":null,
+             "hmppsId":null,
+             "contactDetails":null
+          },
+          "prisonerOffenderSearch":{
+             "firstName":"Kim",
+             "lastName":"Kardashian",
+             "middleName":null,
+             "dateOfBirth":null,
+             "gender":null,
+             "ethnicity":null,
+             "aliases":[],
+             "identifiers":{
+                "nomisNumber":null,
+                "croNumber":null,
+                "deliusCrn":null
+             },
+             "pncId":null,
+             "hmppsId":null,
+             "contactDetails":null
           }
+       }
         """.removeWhitespaceAndNewlines(),
           )
         }