PI-2396 - use entered_notional_end_date if populated, else notional_e… (

#4073) PI-2396 - use entered_notional_end_date if populated, else notional_end_date, when returning expectedEndDate field
ministryofjustice · Jul 26, 2024 · f7042c1 · f7042c1
1 parent 8384c20
commit f7042c1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...c-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/ConvictionEventEntity.kt b/...c-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/ConvictionEventEntity.kt
@@ -83,14 +83,19 @@ class Disposal(
     val startDate: LocalDate,
 
     @Column(name = "notional_end_date")
-    val expectedEndDate: LocalDate? = null,
+    val notionalEndDate: LocalDate? = null,
+
+    @Column(name = "entered_notional_end_date")
+    val enteredEndDate: LocalDate? = null,
 
     @Column(name = "active_flag", columnDefinition = "number")
     val active: Boolean = true,
 
     @Column(name = "soft_deleted", columnDefinition = "number")
     val softDeleted: Boolean = false
-)
+) {
+    fun expectedEndDate() = enteredEndDate ?: notionalEndDate
+}
 
 @Immutable
 @Table(name = "r_disposal_type")

diff --git a/.../soc-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ConvictionService.kt b/.../soc-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/ConvictionService.kt
@@ -74,7 +74,7 @@ class ConvictionService(
 }
 
 private fun Disposal.asModel(custody: uk.gov.justice.digital.hmpps.entity.Custody?) =
-    Sentence(id, startDate, expectedEndDate, custody?.custodyModel())
+    Sentence(id, startDate, expectedEndDate(), custody?.custodyModel())
 
 private fun ReferenceData.custodialStatus() = CustodyStatus(code, description)
 private fun uk.gov.justice.digital.hmpps.entity.Custody.custodyModel() =