PI-1939 - add disposal data to response

ministryofjustice · Mar 26, 2024 · 4e1f22e · 4e1f22e
1 parent e2d09e8
commit 4e1f22e
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 7 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
@@ -9,6 +9,7 @@ import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers
 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.sentence.*
 import uk.gov.justice.digital.hmpps.data.generator.PersonGenerator
 import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.contentAsJson
@@ -61,7 +62,8 @@ class SentenceIntegrationTest {
                         "Birmingham Court",
                         LocalDate.now(),
                         listOf(AdditionalSentence(3, null, null, "Disqualified from Driving"))
-                    )
+                    ),
+                    Order("Default Sentence Type", null, LocalDate.now().minusDays(14))
                 ),
                 Sentence(
                     OffenceDetails(

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
@@ -1,6 +1,9 @@
 package uk.gov.justice.digital.hmpps.api.model.sentence
 
+import uk.gov.justice.digital.hmpps.api.model.overview.Order
+
 data class Sentence(
     val offenceDetails: OffenceDetails,
     val conviction: Conviction? = null,
+    val order: Order? = null,
 )
diff --git a/...in/uk/gov/justice/digital/hmpps/integrations/delius/sentence/entity/SentenceRepository.kt b/...in/uk/gov/justice/digital/hmpps/integrations/delius/sentence/entity/SentenceRepository.kt
@@ -7,6 +7,8 @@ import uk.gov.justice.digital.hmpps.integrations.delius.overview.entity.Event
 interface EventSentenceRepository : JpaRepository<Event, Long> {
     @Query(
         "SELECT e FROM Event e " +
+            "LEFT JOIN FETCH e.disposal d " +
+            "LEFT JOIN FETCH d.type t  " +
             "LEFT JOIN FETCH e.court c " +
             "LEFT JOIN FETCH e.mainOffence m " +
             "LEFT JOIN FETCH e.additionalOffences ao " +

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
@@ -2,11 +2,10 @@ package uk.gov.justice.digital.hmpps.service
 
 import org.springframework.stereotype.Service
 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.sentence.*
-import uk.gov.justice.digital.hmpps.integrations.delius.overview.entity.Event
-import uk.gov.justice.digital.hmpps.integrations.delius.overview.entity.PersonRepository
-import uk.gov.justice.digital.hmpps.integrations.delius.overview.entity.PersonSummaryEntity
-import uk.gov.justice.digital.hmpps.integrations.delius.overview.entity.getSummary
+import uk.gov.justice.digital.hmpps.api.model.sentence.Offence
+import uk.gov.justice.digital.hmpps.integrations.delius.overview.entity.*
 import uk.gov.justice.digital.hmpps.integrations.delius.sentence.entity.AdditionalSentenceRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.sentence.entity.CourtAppearance
 import uk.gov.justice.digital.hmpps.integrations.delius.sentence.entity.CourtAppearanceRepository
@@ -47,12 +46,15 @@ class SentenceService(
             responsibleCourt = court?.name,
             convictionDate = convictionDate,
             additionalSentences.map { it.toAdditionalSentence() }
-        )
+        ),
+        order = disposal?.toOrder()
     )
 
     fun ExtraSentence.toAdditionalSentence(): AdditionalSentence =
         AdditionalSentence(length, amount, notes, type.description)
 
     fun PersonSummaryEntity.toName() =
         Name(forename, secondName, surname)
+
+    fun Disposal.toOrder() = Order(description = type.description, startDate = date, endDate = expectedEndDate())
 }
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
@@ -9,6 +9,7 @@ import org.mockito.Mock
 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.sentence.*
 import uk.gov.justice.digital.hmpps.data.generator.AdditionalSentenceGenerator
 import uk.gov.justice.digital.hmpps.data.generator.CourtAppearanceGenerator
@@ -124,7 +125,8 @@ class SentenceServiceTest {
                             AdditionalSentence(3, null, null, "Disqualified from Driving"),
                             AdditionalSentence(null, 500, "fine notes", "Fine")
                         )
-                    )
+                    ),
+                    Order("Default Sentence Type", null, LocalDate.now().minusDays(14))
                 )
             )
         )