MAN-28 - update api so that empty list is returned where no lc note i…

…s returned from db
ministryofjustice · Oct 18, 2024 · d71af94 · d71af94
1 parent 14cf66e
commit d71af94
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 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
@@ -24,6 +24,7 @@ import uk.gov.justice.digital.hmpps.test.MockMvcExtensions.withToken
 import java.time.LocalDate
 import uk.gov.justice.digital.hmpps.data.generator.LicenceConditionGenerator.LIC_COND_MAIN_CAT
 import uk.gov.justice.digital.hmpps.data.generator.LicenceConditionGenerator.LIC_COND_SUB_CAT
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers.print
 
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
@@ -49,6 +50,7 @@ class SentenceIntegrationTest {
     fun `get active sentences`() {
         val response = mockMvc
             .perform(MockMvcRequestBuilders.get("/sentence/${PersonGenerator.OVERVIEW.crn}").withToken())
+            .andDo(print())
             .andExpect(MockMvcResultMatchers.status().isOk)
             .andReturn().response.contentAsJson<SentenceOverview>()
 

diff --git a/...elius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/LicenceCondition.kt b/...elius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/sentence/LicenceCondition.kt
@@ -9,7 +9,7 @@ data class LicenceCondition(
     val subTypeDescription: String? = null,
     val imposedReleasedDate: LocalDate,
     val actualStartDate: LocalDate? = null,
-    val notes: List<LicenceConditionNote>? = null
+    val notes: List<LicenceConditionNote> = listOf()
 )
 
 data class LicenceConditionNote(

diff --git a/...nd-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/LicenceConditionService.kt b/...nd-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/LicenceConditionService.kt
@@ -34,7 +34,7 @@ class LicenceConditionService(
     }
 }
 
-fun EntityLicenceCondition.toLicenceConditionNote(truncateNote: Boolean): List<LicenceConditionNote>? {
+fun EntityLicenceCondition.toLicenceConditionNote(truncateNote: Boolean): List<LicenceConditionNote> {
 
     return  notes?.let {
         val splitParam = "---------------------------------------------------------" + System.lineSeparator()
@@ -65,5 +65,5 @@ fun EntityLicenceCondition.toLicenceConditionNote(truncateNote: Boolean): List<L
                 }
             )
         }
-    }
+    } ?: listOf()
 }