Skip to content

Commit d5a5cbf

Browse files
changed to completed by
1 parent 8e94341 commit d5a5cbf

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ data class ReviewSchedule(
2929
val updatedAt: Instant,
3030
val updatedAtPrison: String,
3131
val version: Int,
32-
var conductedBy: String?,
33-
var conductedRole: String?,
32+
var completedBy: String?,
33+
var completedByRole: String?,
3434
)
3535

3636
data class ActionPlanReviewsResponse(

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

+11-9
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,17 @@ class GetReviewScheduleForPersonService(
3434

3535
// Step 4: Update review schedules with completed reviews
3636
val updatedReviewSchedules =
37-
reviewSchedulesResponse.data.reviewSchedules.map { reviewSchedule ->
38-
val completed = mappedReviews[reviewSchedule.reference]
39-
completed?.let {
40-
reviewSchedule.copy(
41-
conductedBy = it.conductedBy,
42-
conductedRole = it.conductedByRole,
43-
)
44-
} ?: reviewSchedule
45-
}
37+
reviewSchedulesResponse.data.reviewSchedules
38+
.filter { it.status == "COMPLETED" }
39+
.map { reviewSchedule ->
40+
val completed = mappedReviews[reviewSchedule.reference]
41+
completed?.let {
42+
reviewSchedule.copy(
43+
completedBy = it.conductedBy,
44+
completedByRole = it.conductedByRole,
45+
)
46+
} ?: reviewSchedule
47+
}
4648

4749
// Step 5: Return the updated review schedules
4850
return Response(

0 commit comments

Comments
 (0)