MAN-28 - refactor attribute names (#4340)

ministryofjustice · Oct 24, 2024 · 76b245f · 76b245f
1 parent 08a75c6
commit 76b245f
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/...rc/integrationTest/kotlin/uk/gov/justice/digital/hmpps/LicenceConditionIntegrationTest.kt b/...rc/integrationTest/kotlin/uk/gov/justice/digital/hmpps/LicenceConditionIntegrationTest.kt
@@ -91,7 +91,7 @@ class LicenceConditionIntegrationTest {
                 LIC_COND_SUB_CAT.description,
                 LocalDate.now().minusDays(7),
                 LocalDate.now(),
-                note = LicenceConditionNote(
+                licenceConditionNote = LicenceConditionNote(
                     0,
                     "CVL Service",
                     LocalDate.of(2024, 4, 22),

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
@@ -155,7 +155,7 @@ class SentenceIntegrationTest {
                             LC_WITHOUT_NOTES.id,
                             LIC_COND_MAIN_CAT.description,
                             imposedReleasedDate = LocalDate.now().minusDays(14),
-                            notes = listOf()
+                            licenceConditionNotes = listOf()
                         ),
                         LicenceCondition(
                             LC_WITH_NOTES_WITHOUT_ADDED_BY.id,
@@ -167,7 +167,7 @@ class SentenceIntegrationTest {
                                 LicenceConditionNote(
                                     0,
                                     note = "He shall not contact or associate with Peter Jones without the prior approval of the supervising officer;",
-                                    hasNotesBeenTruncated = false
+                                    hasNoteBeenTruncated = false
                                 )
                             )
                         )

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,16 +9,16 @@ data class LicenceCondition(
     val subTypeDescription: String? = null,
     val imposedReleasedDate: LocalDate,
     val actualStartDate: LocalDate? = null,
-    val notes: List<LicenceConditionNote>? = null,
-    val note: LicenceConditionNote? = null
+    val licenceConditionNotes: List<LicenceConditionNote>? = null,
+    val licenceConditionNote: LicenceConditionNote? = null
 )
 
 data class LicenceConditionNote(
     val id: Int,
     val createdBy: String? = null,
     val createdByDate: LocalDate? = null,
     val note: String,
-    val hasNotesBeenTruncated: Boolean? = null
+    val hasNoteBeenTruncated: Boolean? = null
 )
 
 data class LicenceConditionNoteDetail(

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
@@ -47,7 +47,7 @@ fun EntityLicenceCondition.toLicenceConditionSingleNote(noteId: Int, truncateNot
         subCategory?.description,
         imposedReleasedDate,
         actualStartDate,
-        note = toLicenceConditionNote(truncateNote).elementAtOrNull(noteId)
+        licenceConditionNote = toLicenceConditionNote(truncateNote).elementAtOrNull(noteId)
     )
 
 fun EntityLicenceCondition.toLicenceConditionNote(truncateNote: Boolean): List<LicenceConditionNote> {