return additional conducted by/role (#548)

* return additional conductedby/role

* return additional conductedby/role

* return additional conductedby/role

Author: stevomcallister

src/main/kotlin/uk/gov/justice/digital/hmpps/hmppsintegrationapi/gateways/PLPGateway.kt

@@ -6,6 +6,7 @@ import org.springframework.http.HttpMethod
 import org.springframework.stereotype.Component
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.WebClientWrapper
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.extensions.WebClientWrapper.WebClientWrapperResponse
+import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ActionPlanReviewsResponse
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.InductionSchedule
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.Response
 import uk.gov.justice.digital.hmpps.hmppsintegrationapi.models.hmpps.ReviewSchedules
@@ -68,6 +69,30 @@ class PLPGateway(
     }
   }
 
+  fun getReviews(prisonerNumber: String): Response<ActionPlanReviewsResponse> {
+    val result =
+      webClient.request<ActionPlanReviewsResponse>(
+        HttpMethod.GET,
+        "/action-plans/$prisonerNumber/reviews",
+        authenticationHeader(),
+        UpstreamApi.PLP,
+      )
+
+    return when (result) {
+      is WebClientWrapperResponse.Success -> {
+        val response = result.data
+        Response(data = response)
+      }
+
+      is WebClientWrapperResponse.Error -> {
+        Response(
+          data = ActionPlanReviewsResponse(completedReviews = listOf()),
+          errors = result.errors,
+        )
+      }
+    }
+  }
+
   private fun authenticationHeader(): Map<String, String> {
     val token = hmppsAuthGateway.getClientToken("PLP")
     return mapOf(

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

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonInclude
 import java.time.Instant
 import java.time.LocalDate
+import java.util.UUID
 
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.USE_DEFAULTS)
@@ -14,7 +15,7 @@ data class ReviewSchedules(
 @JsonIgnoreProperties(ignoreUnknown = true)
 @JsonInclude(JsonInclude.Include.USE_DEFAULTS)
 data class ReviewSchedule(
-  val reference: String,
+  val reference: UUID,
   val reviewDateFrom: LocalDate,
   val reviewDateTo: LocalDate,
   val status: String,
@@ -28,4 +29,41 @@ data class ReviewSchedule(
   val updatedAt: Instant,
   val updatedAtPrison: String,
   val version: Int,
+  var conductedBy: String?,
+  var conductedRole: String?,
+)
+
+data class ActionPlanReviewsResponse(
+  val latestReviewSchedule: ScheduledActionPlanReviewResponse? = null,
+  val completedReviews: List<CompletedActionPlanReviewResponse>,
+)
+
+data class ScheduledActionPlanReviewResponse(
+  val reviewDateFrom: LocalDate,
+  val reviewDateTo: LocalDate,
+  val status: String,
+  val calculationRule: String,
+  val createdBy: String,
+  val createdByDisplayName: String,
+  val createdAt: java.time.OffsetDateTime,
+  val createdAtPrison: String,
+  val updatedBy: String,
+  val updatedByDisplayName: String,
+  val updatedAt: java.time.OffsetDateTime,
+  val updatedAtPrison: String,
+  val exemptionReason: String? = null,
+  val version: Int? = null,
+)
+
+data class CompletedActionPlanReviewResponse(
+  val reference: UUID,
+  val deadlineDate: LocalDate,
+  val completedDate: LocalDate,
+  val createdBy: String,
+  val createdByDisplayName: String,
+  val createdAt: java.time.OffsetDateTime,
+  val createdAtPrison: String,
+  val reviewScheduleReference: UUID? = null,
+  val conductedBy: String? = null,
+  val conductedByRole: String? = null,
 )

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

@@ -12,11 +12,42 @@ class GetReviewScheduleForPersonService(
   @Autowired val getPersonService: GetPersonService,
 ) {
   fun execute(hmppsId: String): Response<ReviewSchedules> {
-    val response = getPersonService.getNomisNumber(hmppsId = hmppsId)
+    // Step 1: Get the NOMIS number for the given HMPPS ID
+    val nomisNumberResponse = getPersonService.getNomisNumber(hmppsId)
+    val nomisNumber =
+      nomisNumberResponse.data?.nomisNumber
+        ?: return Response(ReviewSchedules(emptyList()), nomisNumberResponse.errors)
 
-    response.data?.nomisNumber?.let {
-      return plpGateway.getReviewSchedules(it)
+    // Step 2: Fetch completed reviews
+    val plpReviewsResponse = plpGateway.getReviews(nomisNumber)
+    if (plpReviewsResponse.errors.isNotEmpty()) {
+      return Response(ReviewSchedules(emptyList()), plpReviewsResponse.errors)
     }
-    return Response(ReviewSchedules(listOf()), response.errors)
+    val completedReviews = plpReviewsResponse.data.completedReviews
+    val mappedReviews = completedReviews.associateBy { it.reviewScheduleReference }
+
+    // Step 3: Fetch review schedules
+    val reviewSchedulesResponse = plpGateway.getReviewSchedules(nomisNumber)
+    if (reviewSchedulesResponse.errors.isNotEmpty()) {
+      return Response(ReviewSchedules(emptyList()), reviewSchedulesResponse.errors)
+    }
+
+    // Step 4: Update review schedules with completed reviews
+    val updatedReviewSchedules =
+      reviewSchedulesResponse.data.reviewSchedules.map { reviewSchedule ->
+        val completed = mappedReviews[reviewSchedule.reference]
+        completed?.let {
+          reviewSchedule.copy(
+            conductedBy = it.conductedBy,
+            conductedRole = it.conductedByRole,
+          )
+        } ?: reviewSchedule
+      }
+
+    // Step 5: Return the updated review schedules
+    return Response(
+      ReviewSchedules(updatedReviewSchedules),
+      emptyList(),
+    )
   }
 }