MAN-156 - update note to add created by

ministryofjustice · Nov 19, 2024 · db7efc6 · db7efc6
1 parent 1e4a6ea
commit db7efc6
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/.../integrationTest/kotlin/uk/gov/justice/digital/hmpps/AppointmentOutcomeIntegrationTest.kt b/.../integrationTest/kotlin/uk/gov/justice/digital/hmpps/AppointmentOutcomeIntegrationTest.kt
@@ -38,7 +38,7 @@ class AppointmentOutcomeIntegrationTest {
     @Autowired
     internal lateinit var mockMvc: MockMvc
 
-    val outcome = Outcome(123, "ATTC", "N")
+    val outcome = Outcome(123, "Jack Ryan","ATTC", "N")
 
     @Test
     fun `unauthorized status returned`() {
@@ -70,7 +70,7 @@ class AppointmentOutcomeIntegrationTest {
             .perform(
                 MockMvcRequestBuilders.patch("/appointment")
                     .withToken()
-                    .withJson(Outcome(response.appointments[0].id, "ABC", "Y"))
+                    .withJson(Outcome(response.appointments[0].id, "Jon Jones", "ABC", "Y"))
             )
             .andExpect(MockMvcResultMatchers.status().isNotFound)
             .andExpect(
@@ -94,7 +94,7 @@ class AppointmentOutcomeIntegrationTest {
         assertNull(createdAppointment.outcomeId)
         assertNull(createdAppointment.sensitive)
 
-        val request = Outcome(response.appointments[0].id, "ATTC", "Y", notes = "my notes")
+        val request = Outcome(response.appointments[0].id, "Jason Bourne", "ATTC", "Y", notes = "my notes")
 
         mockMvc
             .perform(
@@ -108,7 +108,7 @@ class AppointmentOutcomeIntegrationTest {
 
         assertEquals("Y", updatedAppointment.attended)
         assertEquals("Y", updatedAppointment.complied)
-        assertEquals(request.notes, updatedAppointment.notes)
+        assertEquals(request.notes, updatedAppointment.notes!!.lines()[1])
         assertEquals(ATTENDED_COMPLIED.id, updatedAppointment.outcomeId)
         assertFalse(updatedAppointment.sensitive!!)
 

diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/appointment/Outcome.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/model/appointment/Outcome.kt
@@ -2,6 +2,7 @@ package uk.gov.justice.digital.hmpps.api.model.appointment
 
 data class Outcome(
     val id: Long,
+    val recordedBy: String,
     val code: String,
     val attended: String,
     val sensitive: Boolean? = false,

diff --git a/...-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentOutcomeService.kt b/...-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/AppointmentOutcomeService.kt
@@ -2,10 +2,12 @@ package uk.gov.justice.digital.hmpps.service
 
 import org.springframework.stereotype.Service
 import uk.gov.justice.digital.hmpps.api.model.appointment.Outcome
+import uk.gov.justice.digital.hmpps.datetime.DeliusDateTimeFormatter
 import uk.gov.justice.digital.hmpps.exception.NotFoundException
 import uk.gov.justice.digital.hmpps.integrations.delius.sentence.entity.AppointmentRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.sentence.entity.ContactTypeOutcomeRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.sentence.entity.getByTypeIdAndOutcomeCode
+import java.time.LocalDateTime
 
 @Service
 class AppointmentOutcomeService(
@@ -21,9 +23,13 @@ class AppointmentOutcomeService(
             contactTypeOutcomeRepository.getByTypeIdAndOutcomeCode(appointment.type.id, outcome.code)
 
         appointment.apply {
+            val dateTime = LocalDateTime.now()
             attended = outcome.attended
             complied = if (contactTypeOutcome.outcome.outcomeCompliantAcceptable!!) "Y" else "N"
-            notes = outcome.notes
+            notes = outcome.notes?.let { """
+                Comment added by ${outcome.recordedBy} on ${dateTime.format(DeliusDateTimeFormatter).substring(0, 10)} at ${dateTime.format(DeliusDateTimeFormatter).substring(11, 16)}
+                $it
+            """.trimIndent() }
             outcomeId = contactTypeOutcome.outcome.id
             sensitive = outcome.sensitive
         }