PI-1939 - refactor requirement section

ministryofjustice · Mar 27, 2024 · 8783a45 · 8783a45
1 parent 6e5ac0f
commit 8783a45
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/...delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/SentenceIntegrationTest.kt b/...delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/SentenceIntegrationTest.kt
@@ -63,7 +63,8 @@ class SentenceIntegrationTest {
                         LocalDate.now(),
                         listOf(AdditionalSentence(3, null, null, "Disqualified from Driving"))
                     ),
-                    Order("Default Sentence Type", 12, null, LocalDate.now().minusDays(14))
+                    Order("Default Sentence Type", 12, null, LocalDate.now().minusDays(14)),
+                    listOf()
                 ),
                 Sentence(
                     OffenceDetails(
@@ -73,7 +74,9 @@ class SentenceIntegrationTest {
                         "overview",
                         emptyList()
                     ),
-                    Conviction(null, null, null, listOf())
+                    Conviction(null, null, null, listOf()),
+                    null,
+                    listOf()
                 )
             )
         )

diff --git a/...and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/Requirement.kt b/...and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/Requirement.kt
@@ -0,0 +1,8 @@
+package uk.gov.justice.digital.hmpps.api.model.sentence
+
+data class Requirement(
+    val description: String,
+    val length: Long,
+    val progress: Long,
+    val notes: String
+)
diff --git a/...on-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/Sentence.kt b/...on-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/Sentence.kt
@@ -7,5 +7,5 @@ data class Sentence(
     val offenceDetails: OffenceDetails,
     val conviction: Conviction? = null,
     val order: Order? = null,
-    val rar: Rar? = null
+    val requirements: List<Requirement>
 )
diff --git a/...vision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/SentenceService.kt b/...vision-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/SentenceService.kt
@@ -49,7 +49,8 @@ class SentenceService(
             convictionDate = convictionDate,
             additionalSentences.map { it.toAdditionalSentence() }
         ),
-        order = disposal?.toOrder()
+        order = disposal?.toOrder(),
+        listOf()
     )
 
     fun ExtraSentence.toAdditionalSentence(): AdditionalSentence =

diff --git a/...on-and-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/SentenceServiceTest.kt b/...on-and-delius/src/test/kotlin/uk/gov/justice/digital/hmpps/service/SentenceServiceTest.kt
@@ -10,6 +10,7 @@ import org.mockito.junit.jupiter.MockitoExtension
 import org.mockito.kotlin.*
 import uk.gov.justice.digital.hmpps.api.model.Name
 import uk.gov.justice.digital.hmpps.api.model.overview.Order
+import uk.gov.justice.digital.hmpps.api.model.overview.Rar
 import uk.gov.justice.digital.hmpps.api.model.sentence.*
 import uk.gov.justice.digital.hmpps.data.generator.AdditionalSentenceGenerator
 import uk.gov.justice.digital.hmpps.data.generator.CourtAppearanceGenerator
@@ -130,7 +131,8 @@ class SentenceServiceTest {
                             AdditionalSentence(null, 500, "fine notes", "Fine")
                         )
                     ),
-                    Order("Default Sentence Type", 12, null, LocalDate.now().minusDays(14))
+                    Order("Default Sentence Type", 12, null, LocalDate.now().minusDays(14)),
+                    listOf()
                 )
             )
         )