return additional conductedby/role

Author: stevomcallister

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

@@ -34,13 +34,11 @@ data class ReviewSchedule(
 )
 
 data class ActionPlanReviewsResponse(
-
   val latestReviewSchedule: ScheduledActionPlanReviewResponse? = null,
-  val completedReviews: List<CompletedActionPlanReviewResponse>
+  val completedReviews: List<CompletedActionPlanReviewResponse>,
 )
 
 data class ScheduledActionPlanReviewResponse(
-
   val reviewDateFrom: LocalDate,
   val reviewDateTo: LocalDate,
   val status: String,
@@ -54,7 +52,7 @@ data class ScheduledActionPlanReviewResponse(
   val updatedAt: java.time.OffsetDateTime,
   val updatedAtPrison: String,
   val exemptionReason: String? = null,
-  val version: Int? = null
+  val version: Int? = null,
 )
 
 data class CompletedActionPlanReviewResponse(
@@ -67,5 +65,5 @@ data class CompletedActionPlanReviewResponse(
   val createdAtPrison: String,
   val reviewScheduleReference: UUID? = null,
   val conductedBy: String? = null,
-  val conductedByRole: String? = null
+  val conductedByRole: String? = null,
 )

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

@@ -14,8 +14,9 @@ class GetReviewScheduleForPersonService(
   fun execute(hmppsId: String): Response<ReviewSchedules> {
     // 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)
+    val nomisNumber =
+      nomisNumberResponse.data?.nomisNumber
+        ?: return Response(ReviewSchedules(emptyList()), nomisNumberResponse.errors)
 
     // Step 2: Fetch completed reviews
     val plpReviewsResponse = plpGateway.getReviews(nomisNumber)
@@ -32,20 +33,21 @@ class GetReviewScheduleForPersonService(
     }
 
     // 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
-    }
+    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() // No errors since both calls succeeded
+      emptyList(),
     )
   }
 }