Added completed by information

Author: stevomcallister

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

@@ -11,6 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RequestParam
 import org.springframework.web.bind.annotation.RestController
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.exception.EntityNotFoundException
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.DataResponse
@@ -60,14 +61,23 @@ class PLPController(
     ],
   )
   fun getReviewSchedule(
-    @Parameter(description = "A HmppsId ", example = "A123123") @PathVariable hmppsId: String,
+    @Parameter(description = "A HmppsId", example = "A123123") @PathVariable hmppsId: String,
+    @Parameter(description = "Filter by review schedule statuses", example = "[\"COMPLETED\", \"PENDING\"]")
+    @RequestParam(required = false) statuses: List<String>?,
   ): DataResponse<ReviewSchedules> {
     val response = getReviewScheduleForPersonService.execute(hmppsId)
 
     if (response.hasError(UpstreamApiError.Type.ENTITY_NOT_FOUND)) {
       throw EntityNotFoundException("Could not find person with id: $hmppsId")
     }
+
     auditService.createEvent("GET_REVIEW_SCHEDULE", mapOf("hmppsId" to hmppsId))
-    return DataResponse(response.data)
+
+    // Filter the review schedules by statuses if the query parameter is provided
+    val filteredData =
+      response.data.reviewSchedules
+        .filter { statuses == null || it.status in statuses }
+
+    return DataResponse(ReviewSchedules(filteredData))
   }
 }

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/models/hmpps/ReviewSchedule.kt

@@ -29,8 +29,9 @@ data class ReviewSchedule(
   val updatedAt: Instant,
   val updatedAtPrison: String,
   val version: Int,
-  var completedBy: String?,
-  var completedByRole: String?,
+  var reviewCompletedBy: String?,
+  var reviewCompletedByRole: String?,
+  var reviewCompletedAt: Instant,
 )
 
 data class ActionPlanReviewsResponse(
@@ -45,11 +46,11 @@ data class ScheduledActionPlanReviewResponse(
   val calculationRule: String,
   val createdBy: String,
   val createdByDisplayName: String,
-  val createdAt: java.time.OffsetDateTime,
+  val createdAt: Instant,
   val createdAtPrison: String,
   val updatedBy: String,
   val updatedByDisplayName: String,
-  val updatedAt: java.time.OffsetDateTime,
+  val updatedAt: Instant,
   val updatedAtPrison: String,
   val exemptionReason: String? = null,
   val version: Int? = null,
@@ -66,4 +67,7 @@ data class CompletedActionPlanReviewResponse(
   val reviewScheduleReference: UUID? = null,
   val conductedBy: String? = null,
   val conductedByRole: String? = null,
+  val updatedBy: String,
+  val updatedByDisplayName: String,
+  val updatedAt: Instant,
 )

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

@@ -34,18 +34,18 @@ class GetReviewScheduleForPersonService(
 
     // Step 4: Update review schedules with completed reviews
     val updatedReviewSchedules =
-      reviewSchedulesResponse.data.reviewSchedules
-        .filter { it.status == "COMPLETED" }
-        .map { reviewSchedule ->
-          val completed = mappedReviews[reviewSchedule.reference]
-          completed?.let {
-            reviewSchedule.copy(
-              completedBy = it.conductedBy,
-              completedByRole = it.conductedByRole,
-            )
-          } ?: reviewSchedule
+      reviewSchedulesResponse.data.reviewSchedules.map { reviewSchedule ->
+        val completed = mappedReviews[reviewSchedule.reference]
+        if (reviewSchedule.status == "COMPLETED" && completed != null) {
+          reviewSchedule.copy(
+            reviewCompletedBy = completed.conductedBy ?: completed.updatedByDisplayName,
+            reviewCompletedByRole = completed.conductedByRole ?: "CIAG",
+            reviewCompletedAt = completed.updatedAt,
+          )
+        } else {
+          reviewSchedule
         }
-
+      }
     // Step 5: Return the updated review schedules
     return Response(
       ReviewSchedules(updatedReviewSchedules),