Controller change

Author: chiaramapellimt

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

@@ -36,4 +36,20 @@ class AlertsController(
     auditService.createEvent("GET_PERSON_ALERTS", mapOf("hmppsId" to hmppsId))
     return response.data.paginateWith(page, perPage)
   }
+
+  @GetMapping("{encodedHmppsId}/alerts/pnd")
+  fun getPersonAlertsPND(
+    @PathVariable encodedHmppsId: String,
+    @RequestParam(required = false, defaultValue = "1", name = "page") page: Int,
+    @RequestParam(required = false, defaultValue = "10", name = "perPage") perPage: Int,
+  ): PaginatedResponse<Alert> {
+    val hmppsId = encodedHmppsId.decodeUrlCharacters()
+    val response = getAlertsForPersonService.execute(hmppsId)
+
+    if (response.hasError(UpstreamApiError.Type.ENTITY_NOT_FOUND)) {
+      throw EntityNotFoundException("Could not find person with id: $hmppsId")
+    }
+    auditService.createEvent("GET_PERSON_ALERTS_PND", mapOf("hmppsId" to hmppsId))
+    return response.data.paginateWith(page, perPage)
+  }
 }

src/main/resources/application-test.yml

@@ -47,6 +47,7 @@ authorisation:
       - "/v1/persons/.*/addresses"
       - "/v1/persons/.*/offences"
       - "/v1/persons/.*/alerts"
+      - "/v1/persons/.*/alerts/pnd"
       - "/v1/persons/.*/sentences"
       - "/v1/persons/.*/sentences/latest-key-dates-and-adjustments"
       - "/v1/persons/.*/risks/scores"

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

@@ -39,6 +39,7 @@ internal class AlertsControllerTest(
       val hmppsId = "9999/11111A"
       val encodedHmppsId = URLEncoder.encode(hmppsId, StandardCharsets.UTF_8)
       val path = "/v1/persons/$encodedHmppsId/alerts"
+      val pndPath = "/v1/persons/$encodedHmppsId/alerts/pnd"
       val mockMvc = IntegrationAPIMockMvc(springMockMvc)
 
       describe("GET $path") {
@@ -188,5 +189,94 @@ internal class AlertsControllerTest(
           )
         }
       }
+      describe("GET $pndPath") {
+        beforeTest {
+          Mockito.reset(getAlertsForPersonService)
+          Mockito.reset(auditService)
+          whenever(getAlertsForPersonService.execute(hmppsId)).thenReturn(
+            Response(
+              data =
+                listOf(
+                  Alert(
+                    offenderNo = "A1111BB",
+                    type = "B",
+                    typeDescription = "Security again",
+                    code = "BBB",
+                    codeDescription = "For Release",
+                    comment = "IS83",
+                    dateCreated = LocalDate.parse("2022-09-01"),
+                    dateExpired = LocalDate.parse("2023-09-01"),
+                    expired = false,
+                    active = false,
+                  ),
+                ),
+            ),
+          )
+        }
+
+        it("returns a 200 OK status code for PND") {
+          val result = mockMvc.performAuthorised(pndPath)
+          result.response.status.shouldBe(HttpStatus.OK.value())
+        }
+
+        it("returns paginated results for PND") {
+          whenever(getAlertsForPersonService.execute(hmppsId)).thenReturn(
+            Response(
+              data =
+                List(20) {
+                  Alert(
+                    offenderNo = "B0000ZZ",
+                    type = "Z",
+                    typeDescription = "Threat",
+                    code = "BBB",
+                    codeDescription = "Not For Release",
+                    comment = "IS91",
+                    dateCreated = LocalDate.parse("2022-09-01"),
+                    dateExpired = LocalDate.parse("2023-10-01"),
+                    expired = false,
+                    active = false,
+                  )
+                },
+            ),
+          )
+
+          val result = mockMvc.performAuthorised("$pndPath?page=1&perPage=10")
+
+          result.response.contentAsString.shouldContainJsonKeyValue("$.pagination.page", 1)
+          result.response.contentAsString.shouldContainJsonKeyValue("$.pagination.totalPages", 2)
+        }
+
+        it("returns an empty list embedded in a JSON object when no alerts are found for PND") {
+          val hmppsIdForPersonWithNoAlerts = "1111/22334A"
+          val encodedHmppsIdForPersonWithNoAlerts =
+            URLEncoder.encode(hmppsIdForPersonWithNoAlerts, StandardCharsets.UTF_8)
+          val alertPath = "/v1/persons/$encodedHmppsIdForPersonWithNoAlerts/alerts/pnd"
+
+          whenever(getAlertsForPersonService.execute(hmppsIdForPersonWithNoAlerts)).thenReturn(
+            Response(
+              data = emptyList(),
+            ),
+          )
+
+          val result = mockMvc.performAuthorised(alertPath)
+
+          result.response.contentAsString.shouldContain("\"data\":[]".removeWhitespaceAndNewlines())
+        }
+
+        it("logs audit for PND") {
+          mockMvc.performAuthorised(pndPath)
+
+          verify(
+            auditService,
+            VerificationModeFactory.times(1),
+          ).createEvent("GET_PERSON_ALERTS_PND", mapOf("hmppsId" to hmppsId))
+        }
+
+        it("gets the alerts for PND for a person with the matching ID") {
+          mockMvc.performAuthorised(pndPath)
+
+          verify(getAlertsForPersonService, VerificationModeFactory.times(1)).execute(hmppsId)
+        }
+      }
     },
   )