PI-2055 Handle null contact start time (#3588)

ministryofjustice · Apr 5, 2024 · 0fb759d · 0fb759d
1 parent 3cab738
commit 0fb759d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 10 deletions.
diff --git a/...lius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CreateAppointmentIntTests.kt b/...lius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CreateAppointmentIntTests.kt
@@ -94,7 +94,7 @@ internal class CreateAppointmentIntTests {
 
         assertThat(appointment.type.code, equalTo(create.type.code))
         assertThat(appointment.date, equalTo(start.toLocalDate()))
-        assertThat(appointment.startTime, isCloseTo(start))
+        assertThat(appointment.startTime!!, isCloseTo(start))
         assertThat(appointment.notes, equalTo(notes))
         assertThat(appointment.externalReference, equalTo(create.urn))
 

diff --git a/...nt-passport-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/Appointment.kt b/...nt-passport-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/entity/Appointment.kt
@@ -13,13 +13,8 @@ import org.springframework.data.domain.Pageable
 import org.springframework.data.jpa.domain.support.AuditingEntityListener
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.data.jpa.repository.Query
-import uk.gov.justice.digital.hmpps.datetime.EuropeLondon
 import uk.gov.justice.digital.hmpps.exception.NotFoundException
-import java.time.Duration
-import java.time.LocalDate
-import java.time.LocalDateTime
-import java.time.ZoneId
-import java.time.ZonedDateTime
+import java.time.*
 import java.time.format.DateTimeFormatter
 
 @Entity
@@ -41,7 +36,7 @@ class Appointment(
     val date: LocalDate,
 
     @Column(name = "contact_start_time")
-    val startTime: ZonedDateTime,
+    val startTime: ZonedDateTime?,
 
     @Column(name = "contact_end_time")
     val endTime: ZonedDateTime?,
@@ -102,7 +97,7 @@ class Appointment(
 
     val duration: Duration
         get() =
-            if (endTime != null) {
+            if (startTime != null && endTime != null) {
                 val sTime = startTime.toLocalTime()
                 val eTime = endTime.toLocalTime()
                 if (sTime <= eTime) {

diff --git a/...ort-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentService.kt b/...ort-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentService.kt
@@ -16,6 +16,7 @@ import uk.gov.justice.digital.hmpps.entity.*
 import uk.gov.justice.digital.hmpps.exception.ConflictException
 import uk.gov.justice.digital.hmpps.ldap.findByUsername
 import java.time.LocalDate
+import java.time.LocalTime
 import java.time.ZonedDateTime
 
 @Service
@@ -47,7 +48,7 @@ class AppointmentService(
     private fun uk.gov.justice.digital.hmpps.entity.Appointment.asAppointment(): Appointment =
         Appointment(
             Appointment.Type(type.code, type.description),
-            ZonedDateTime.of(date, startTime.toLocalTime(), EuropeLondon),
+            ZonedDateTime.of(date, startTime?.toLocalTime() ?: LocalTime.MIDNIGHT, EuropeLondon),
             duration,
             staff.asStaff(),
             location?.asLocation(),