ADJST-836 Indicate if charge court case is finished. (#2276)

ministryofjustice · Sep 25, 2024 · 188de2b · 188de2b
1 parent 95d36f0
commit 188de2b
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 0 deletions.
diff --git a/src/main/java/uk/gov/justice/hmpps/prison/api/model/courtdates/CourtDateCharge.java b/src/main/java/uk/gov/justice/hmpps/prison/api/model/courtdates/CourtDateCharge.java
@@ -57,9 +57,15 @@ public class CourtDateCharge {
     @Schema(description = "The sentence type")
     private String sentenceType;
 
+    @Schema(description = "The result code of the charge")
+    private String resultCode;
+
     @Schema(description = "The result description of the charge")
     private String resultDescription;
 
+    @Schema(description = "The disposition code of the result of the charge")
+    private String resultDispositionCode;
+
     @Schema(description = "Is this charge active in NOMIS.")
     private Boolean active;
 

diff --git a/src/main/java/uk/gov/justice/hmpps/prison/api/model/courtdates/CourtDateChargeAndOutcomes.kt b/src/main/java/uk/gov/justice/hmpps/prison/api/model/courtdates/CourtDateChargeAndOutcomes.kt
@@ -48,9 +48,15 @@ data class CourtDateChargeAndOutcomes(
   @Schema(description = "The sentence type")
   val sentenceType: String? = null,
 
+  @Schema(description = "The result code of the charge")
+  val resultCode: String? = null,
+
   @Schema(description = "The result description of the charge")
   val resultDescription: String? = null,
 
+  @Schema(description = "The disposition code of the result of the charge")
+  val resultDispositionCode: String? = null,
+
   @Schema(description = "The id of the booking this court date was linked to")
   val bookingId: Long,
 

diff --git a/src/main/java/uk/gov/justice/hmpps/prison/service/courtdates/CourtDateService.kt b/src/main/java/uk/gov/justice/hmpps/prison/service/courtdates/CourtDateService.kt
@@ -38,7 +38,9 @@ class CourtDateService(
           charge.offenderSentenceCharges.firstOrNull()?.offenderSentence?.sequence,
           charge.offenderSentenceCharges.firstOrNull()?.offenderSentence?.courtOrder?.courtDate,
           charge.offenderSentenceCharges.firstOrNull()?.offenderSentence?.calculationType?.calculationType,
+          charge.resultCodeOne?.code,
           charge.resultCodeOne?.description,
+          charge.resultCodeOne?.dispositionCode,
           charge.isActive,
         ),
         charge.offenderBooking.bookingId,
@@ -65,7 +67,9 @@ class CourtDateService(
         charge.offenderSentenceCharges.firstOrNull()?.offenderSentence?.sequence,
         charge.offenderSentenceCharges.firstOrNull()?.offenderSentence?.courtOrder?.courtDate,
         charge.offenderSentenceCharges.firstOrNull()?.offenderSentence?.calculationType?.calculationType,
+        charge.resultCodeOne?.code,
         charge.resultCodeOne?.description,
+        charge.resultCodeOne?.dispositionCode,
         charge.offenderBooking.bookingId,
         charge.offenderBooking.bookNumber,
         charge.isActive,

diff --git a/src/test/java/uk/gov/justice/hmpps/prison/service/courtdates/CourtDateServiceTest.kt b/src/test/java/uk/gov/justice/hmpps/prison/service/courtdates/CourtDateServiceTest.kt
@@ -233,7 +233,9 @@ class CourtDateServiceTest {
               .withSentenceSequence(5)
               .withSentenceDate(LocalDate.of(2022, 1, 1))
               .withSentenceType("ADIMP")
+              .withResultCode("1002")
               .withResultDescription("Imprisonment")
+              .withResultDispositionCode("F")
               .withActive(true),
           ),
         ),