PI-1960 (#3430)

* PI-1960
ministryofjustice · Mar 5, 2024 · 4547cae · 4547cae
1 parent 4172713
commit 4547cae
Show file tree

Hide file tree

Showing 11 changed files with 124 additions and 20 deletions.
diff --git a/...otes-to-probation/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/CaseNotesDataLoader.kt b/...otes-to-probation/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/CaseNotesDataLoader.kt
@@ -66,6 +66,8 @@ class CaseNotesDataLoader(
         caseNoteTypeRepository.save(CaseNoteTypeGenerator.DEFAULT)
         caseNoteTypeRepository.save(CaseNoteNomisTypeGenerator.NEG.type)
         caseNoteNomisTypeRepository.save(CaseNoteNomisTypeGenerator.NEG)
+        caseNoteTypeRepository.save(CaseNoteNomisTypeGenerator.RESETTLEMENT.type)
+        caseNoteNomisTypeRepository.save(CaseNoteNomisTypeGenerator.RESETTLEMENT)
 
         institutionRepository.save(ProbationAreaGenerator.DEFAULT.institution!!)
         probationAreaRepository.save(ProbationAreaGenerator.DEFAULT)

diff --git a/...on/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/CaseNoteMessageGenerator.kt b/...on/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/CaseNoteMessageGenerator.kt
@@ -7,4 +7,5 @@ object CaseNoteMessageGenerator {
     val EXISTS_IN_DELIUS: HmppsDomainEvent = ResourceLoader.message("case-note-exists-in-delius")
     val NEW_TO_DELIUS: HmppsDomainEvent = ResourceLoader.message("case-note-new-to-delius")
     val NOT_FOUND: HmppsDomainEvent = ResourceLoader.message("case-note-not-found")
+    val RESETTLEMENT_PASSPORT: HmppsDomainEvent = ResourceLoader.message("resettlement-passport-casenote")
 }
diff --git a/.../src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/CaseNoteNomisTypeGenerator.kt b/.../src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/CaseNoteNomisTypeGenerator.kt
@@ -20,4 +20,12 @@ object CaseNoteNomisTypeGenerator {
             false
         )
     )
+    val RESETTLEMENT = CaseNoteNomisType(
+        "RESET BCST",
+        CaseNoteType(
+            IdGenerator.getAndIncrement(),
+            "BCSP2",
+            false
+        )
+    )
 }
diff --git a/...ion/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PrisonCaseNoteGenerator.kt b/...ion/src/dev/kotlin/uk/gov/justice/digital/hmpps/data/generator/PrisonCaseNoteGenerator.kt
@@ -6,4 +6,5 @@ import uk.gov.justice.digital.hmpps.resourceloader.ResourceLoader
 object PrisonCaseNoteGenerator {
     val EXISTING_IN_BOTH = ResourceLoader.file<PrisonCaseNote>("get-case-note-body-exists-in-delius")
     val NEW_TO_DELIUS = ResourceLoader.file<PrisonCaseNote>("get-case-note-body-new-to-delius")
+    val RESETTLEMENT_PASSPORT = ResourceLoader.file<PrisonCaseNote>("get-case-note-body-resettlement-passport-new")
 }
diff --git a/...on-case-notes-to-probation/src/dev/resources/messages/resettlement-passport-casenote.json b/...on-case-notes-to-probation/src/dev/resources/messages/resettlement-passport-casenote.json
@@ -0,0 +1,17 @@
+{
+  "MessageId": "ae06c49e-1f41-4b9f-b2f2-dcca610d02cd",
+  "Type": "Notification",
+  "Timestamp": "2019-10-21T14:01:18.500Z",
+  "Message": "{\"eventType\":\"prison.case-note.published\",\"version\":1,\"description\":\"A prison case note has been created or amended\",\"occurredAt\":\"2022-10-18T08:19:19.451579+01:00\",\"detailUrl\":\"http://localhost:{wiremock.port}/case-notes/AA0001A/5767\",\"additionalInformation\":{\"caseNoteId\":\"5767\",\"caseNoteType\":\"RESET-BCST\"},\"personReference\":{\"identifiers\":[{\"type\":\"NOMS\",\"value\":\"AA0001A\"}]}}",
+  "TopicArn": "arn:aws:sns:eu-west-1:000000000000:offender_events",
+  "MessageAttributes": {
+    "eventType": {
+      "Type": "String",
+      "Value": "prison.case-note.published"
+    },
+    "caseNoteType": {
+      "Type": "String",
+      "Value": "RESET-BCST"
+    }
+  }
+}
diff --git a/...n/src/dev/resources/simulations/__files/get-case-note-body-resettlement-passport-new.json b/...n/src/dev/resources/simulations/__files/get-case-note-body-resettlement-passport-new.json
@@ -0,0 +1,13 @@
+{
+  "caseNoteId": 5767,
+  "eventId": 576777,
+  "offenderIdentifier": "AA0001A",
+  "type": "RESET",
+  "subType": "BCST",
+  "creationDateTime": "2021-04-16T11:22:33+01:00",
+  "occurrenceDateTime": "2021-03-23T11:22:00+01:00",
+  "authorName": "Some Name",
+  "text": "note content",
+  "locationId": "LEI",
+  "amendments": []
+}
diff --git a/.../prison-case-notes-to-probation/src/dev/resources/simulations/mappings/get-case-note.json b/.../prison-case-notes-to-probation/src/dev/resources/simulations/mappings/get-case-note.json
@@ -27,6 +27,20 @@
         "bodyFileName": "get-case-note-body-new-to-delius.json"
       }
     },
+    {
+      "request": {
+        "method": "GET",
+        "url": "/case-notes/AA0001A/5767"
+      },
+      "response": {
+        "headers": {
+          "Accept": "application/json",
+          "Content-Type": "application/json"
+        },
+        "status": 200,
+        "bodyFileName": "get-case-note-body-resettlement-passport-new.json"
+      }
+    },
     {
       "request": {
         "method": "GET",

diff --git a/...ation/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CaseNotesIntegrationTest.kt b/...ation/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CaseNotesIntegrationTest.kt
@@ -2,35 +2,26 @@ package uk.gov.justice.digital.hmpps
 
 import com.github.tomakehurst.wiremock.WireMockServer
 import org.hamcrest.MatcherAssert.assertThat
-import org.hamcrest.Matchers.equalTo
-import org.hamcrest.Matchers.greaterThan
-import org.hamcrest.Matchers.stringContainsInOrder
+import org.hamcrest.Matchers.*
 import org.junit.jupiter.api.Assertions.assertNotNull
 import org.junit.jupiter.api.Assertions.assertNull
 import org.junit.jupiter.api.Test
 import org.mockito.ArgumentMatchers.any
 import org.mockito.ArgumentMatchers.anyMap
-import org.mockito.kotlin.atLeastOnce
-import org.mockito.kotlin.eq
-import org.mockito.kotlin.never
-import org.mockito.kotlin.verify
+import org.mockito.kotlin.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.boot.test.mock.mockito.SpyBean
 import uk.gov.justice.digital.hmpps.audit.repository.AuditedInteractionRepository
-import uk.gov.justice.digital.hmpps.data.generator.CaseNoteMessageGenerator
-import uk.gov.justice.digital.hmpps.data.generator.CaseNoteNomisTypeGenerator
-import uk.gov.justice.digital.hmpps.data.generator.EventGenerator
-import uk.gov.justice.digital.hmpps.data.generator.NsiGenerator
-import uk.gov.justice.digital.hmpps.data.generator.PrisonCaseNoteGenerator
-import uk.gov.justice.digital.hmpps.data.generator.ProbationAreaGenerator
-import uk.gov.justice.digital.hmpps.data.generator.UserGenerator
+import uk.gov.justice.digital.hmpps.data.generator.*
 import uk.gov.justice.digital.hmpps.datetime.DeliusDateTimeFormatter
+import uk.gov.justice.digital.hmpps.flags.FeatureFlags
 import uk.gov.justice.digital.hmpps.integrations.delius.repository.CaseNoteRepository
 import uk.gov.justice.digital.hmpps.integrations.delius.repository.StaffRepository
 import uk.gov.justice.digital.hmpps.messaging.HmppsChannelManager
+import uk.gov.justice.digital.hmpps.messaging.ProcessResettlementPassport
 import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
 import uk.gov.justice.digital.hmpps.test.CustomMatchers.isCloseTo
 import java.time.ZonedDateTime
@@ -61,6 +52,9 @@ class CaseNotesIntegrationTest {
     @SpyBean
     lateinit var air: AuditedInteractionRepository
 
+    @MockBean
+    lateinit var featureFlags: FeatureFlags
+
     @Test
     fun `update an existing case note succesfully`() {
         val nomisCaseNote = PrisonCaseNoteGenerator.EXISTING_IN_BOTH
@@ -144,4 +138,47 @@ class CaseNotesIntegrationTest {
 
         verify(telemetryService, never()).trackEvent(eq(CASE_NOTE_MERGED), anyMap(), anyMap())
     }
+
+    @Test
+    fun `create a new case note for resettlement passport`() {
+        whenever(featureFlags.enabled(ProcessResettlementPassport)).thenReturn(true)
+        val nomisCaseNote = PrisonCaseNoteGenerator.RESETTLEMENT_PASSPORT
+
+        channelManager.getChannel(queueName).publishAndWait(
+            prepMessage(CaseNoteMessageGenerator.RESETTLEMENT_PASSPORT, wireMockserver.port())
+        )
+
+        verify(telemetryService).trackEvent(eq(CASE_NOTE_MERGED), anyMap(), anyMap())
+        val saved = caseNoteRepository.findByNomisId(nomisCaseNote.eventId)
+        assertNotNull(saved)
+
+        assertThat(
+            saved!!.notes,
+            stringContainsInOrder(nomisCaseNote.type, nomisCaseNote.subType, nomisCaseNote.text)
+        )
+
+        assertThat(
+            saved.type.code,
+            equalTo(CaseNoteNomisTypeGenerator.RESETTLEMENT.type.code)
+        )
+
+        assertThat(
+            saved.eventId,
+            equalTo(EventGenerator.CUSTODIAL_EVENT.id)
+        )
+
+        val staff = staffRepository.findById(saved.staffId).orElseThrow()
+        assertThat(staff.code, equalTo("${ProbationAreaGenerator.DEFAULT.code}B001"))
+    }
+
+    @Test
+    fun `does not create a new case note for resettlement passport when feature flag disabled`() {
+        whenever(featureFlags.enabled(ProcessResettlementPassport)).thenReturn(false)
+
+        channelManager.getChannel(queueName).publishAndWait(
+            prepMessage(CaseNoteMessageGenerator.RESETTLEMENT_PASSPORT, wireMockserver.port())
+        )
+
+        verify(telemetryService).trackEvent(eq("CaseNoteIgnored"), anyMap(), anyMap())
+    }
 }
diff --git a/...bation/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/prison/PrisonCaseNote.kt b/...bation/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/prison/PrisonCaseNote.kt
@@ -30,6 +30,8 @@ data class PrisonCaseNote(
         } else {
             StaffName(authorName.substringBeforeLast(" ").trim(), authorName.substringAfterLast(" ").trim())
         }
+
+    fun isResettlementPassport() = type == "RESET" && subType == "BCST"
 }
 
 data class CaseNoteAmendment(

diff --git a/...case-notes-to-probation/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt b/...case-notes-to-probation/src/main/kotlin/uk/gov/justice/digital/hmpps/messaging/Handler.kt
@@ -8,23 +8,24 @@ import org.springframework.web.client.HttpStatusCodeException
 import uk.gov.justice.digital.hmpps.converter.NotificationConverter
 import uk.gov.justice.digital.hmpps.datetime.DeliusDateTimeFormatter
 import uk.gov.justice.digital.hmpps.exceptions.OffenderNotFoundException
+import uk.gov.justice.digital.hmpps.flags.FeatureFlags
 import uk.gov.justice.digital.hmpps.integrations.delius.service.DeliusService
-import uk.gov.justice.digital.hmpps.integrations.prison.PrisonCaseNote
-import uk.gov.justice.digital.hmpps.integrations.prison.PrisonCaseNoteFilters
-import uk.gov.justice.digital.hmpps.integrations.prison.PrisonCaseNotesClient
-import uk.gov.justice.digital.hmpps.integrations.prison.toDeliusCaseNote
+import uk.gov.justice.digital.hmpps.integrations.prison.*
 import uk.gov.justice.digital.hmpps.message.HmppsDomainEvent
 import uk.gov.justice.digital.hmpps.message.Notification
 import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
 import uk.gov.justice.digital.hmpps.telemetry.notificationReceived
 import java.net.URI
 
+const val ProcessResettlementPassport = "case-note-resettlement-passport"
+
 @Component
 class Handler(
     val prisonCaseNotesClient: PrisonCaseNotesClient,
     val deliusService: DeliusService,
     val telemetryService: TelemetryService,
-    override val converter: NotificationConverter<HmppsDomainEvent>
+    override val converter: NotificationConverter<HmppsDomainEvent>,
+    val featureFlags: FeatureFlags
 ) : NotificationHandler<HmppsDomainEvent> {
 
     companion object {
@@ -61,7 +62,11 @@ class Handler(
         }
 
         val reasonToIgnore: Lazy<String?> = lazy {
-            PrisonCaseNoteFilters.filters.firstOrNull { it.predicate.invoke(prisonCaseNote!!) }?.reason
+            (PrisonCaseNoteFilters.filters + PrisonCaseNoteFilter(
+                "Processing of Resettlement Passport case notes is disabled"
+            ) { it.isResettlementPassport() && !featureFlags.enabled(ProcessResettlementPassport) }).firstOrNull {
+                it.predicate.invoke(prisonCaseNote!!)
+            }?.reason
         }
 
         if (prisonCaseNote == null || reasonToIgnore.value != null) {

diff --git a/...-notes-to-probation/src/test/kotlin/uk/gov/justice/digital/hmpps/messaging/HandlerTest.kt b/...-notes-to-probation/src/test/kotlin/uk/gov/justice/digital/hmpps/messaging/HandlerTest.kt
@@ -17,6 +17,7 @@ import uk.gov.justice.digital.hmpps.converter.NotificationConverter
 import uk.gov.justice.digital.hmpps.data.generator.CaseNoteMessageGenerator
 import uk.gov.justice.digital.hmpps.exceptions.OffenderNotFoundException
 import uk.gov.justice.digital.hmpps.exceptions.StaffCodeExhaustedException
+import uk.gov.justice.digital.hmpps.flags.FeatureFlags
 import uk.gov.justice.digital.hmpps.integrations.delius.service.DeliusService
 import uk.gov.justice.digital.hmpps.integrations.prison.PrisonCaseNote
 import uk.gov.justice.digital.hmpps.integrations.prison.PrisonCaseNotesClient
@@ -43,6 +44,9 @@ internal class HandlerTest {
     @Mock
     private lateinit var converter: NotificationConverter<HmppsDomainEvent>
 
+    @Mock
+    private lateinit var featureFlags: FeatureFlags
+
     @InjectMocks
     private lateinit var handler: Handler