PI-2521: No grade for prison manager and null for no teams (#4229)

ministryofjustice · Sep 13, 2024 · f638c17 · f638c17
1 parent d56f86b
commit f638c17
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/...rationTest/kotlin/uk/gov/justice/digital/hmpps/NsisByCrnAndConvictionIdIntegrationTest.kt b/...rationTest/kotlin/uk/gov/justice/digital/hmpps/NsisByCrnAndConvictionIdIntegrationTest.kt
@@ -146,7 +146,7 @@ internal class NsisByCrnAndConvictionIdIntegrationTest {
         code,
         id,
         Human(getForenames(), surname),
-        teams.map { it.toTeam() },
+        teams.map { it.toTeam() }.takeIf { it.isNotEmpty() },
         probationArea.toProbationArea(false),
         grade?.keyValueOf()
     )

diff --git a/...ourt-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/NsiDetails.kt b/...ourt-case-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/NsiDetails.kt
@@ -55,7 +55,7 @@ data class StaffDetails(
     @Schema(description = "staff name details")
     val staff: Human,
     @Schema(description = "all teams related to this staff member")
-    val teams: List<Team>,
+    val teams: List<Team>? = null,
     @Schema(description = "provider this staff member is associated with")
     val probationArea: ProbationArea,
     @Schema(description = "Staff Grade", example = "PO,CRC - PO")

diff --git a/...in/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/InterventionService.kt b/...in/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/InterventionService.kt
@@ -76,7 +76,7 @@ fun Staff.toStaffDetails(): StaffDetails = StaffDetails(
     code,
     id,
     Human(getForenames(), surname),
-    teams.map { it.toTeam() },
+    teams.map { it.toTeam() }.takeIf { it.isNotEmpty() },
     probationArea.toProbationArea(false),
     grade?.keyValueOf()
 )

diff --git a/...kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/OffenderManagerService.kt b/...kotlin/uk/gov/justice/digital/hmpps/integrations/delius/service/OffenderManagerService.kt
@@ -84,8 +84,7 @@ fun PrisonManager.toOffenderManager(includeProbationAreaTeams: Boolean) = Commun
     isPrisonOffenderManager = true,
     probationArea = probationArea.toProbationArea(includeProbationAreaTeams),
     isResponsibleOfficer = responsibleOfficer() != null,
-    fromDate = date.toLocalDate(),
-    grade = staff.grade?.keyValueOf()
+    fromDate = date.toLocalDate()
 )
 
 fun uk.gov.justice.digital.hmpps.integrations.delius.provider.entity.Team.toTeam() = Team(