PI-1599 addeded .updated meessage processing

ministryofjustice · Nov 1, 2023 · 3dd9e81 · 3dd9e81
1 parent 1393dc8
commit 3dd9e81
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 7 deletions.
diff --git a/...-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CASIntegrationTest.kt b/...-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/CASIntegrationTest.kt
@@ -2,6 +2,9 @@ package uk.gov.justice.digital.hmpps
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import com.github.tomakehurst.wiremock.WireMockServer
+import com.github.tomakehurst.wiremock.client.WireMock.aResponse
+import com.github.tomakehurst.wiremock.client.WireMock.get
+import com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo
 import org.hamcrest.MatcherAssert
 import org.hamcrest.Matchers
 import org.junit.jupiter.api.MethodOrderer
@@ -31,6 +34,7 @@ import uk.gov.justice.digital.hmpps.messaging.crn
 import uk.gov.justice.digital.hmpps.resourceloader.ResourceLoader
 import uk.gov.justice.digital.hmpps.telemetry.TelemetryService
 import uk.gov.justice.digital.hmpps.telemetry.notificationReceived
+import java.time.ZonedDateTime
 
 @AutoConfigureMockMvc
 @SpringBootTest(webEnvironment = RANDOM_PORT)
@@ -85,14 +89,23 @@ internal class CASIntegrationTest {
     fun `booking cancelled message is processed correctly`() {
         val eventName = "booking-cancelled"
         val event = prepEvent(eventName, wireMockServer.port())
+        val eventDetails = ResourceLoader.file<EventDetails<BookingCancelled>>("cas3-$eventName")
+        val eventDetailsCopy = eventDetails.copy(timestamp = ZonedDateTime.now().minusSeconds(3))
+        wireMockServer.stubFor(
+            get(urlEqualTo("/cas3-api/events/booking-cancelled/1234"))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(eventDetailsCopy))
+                )
+        )
 
         // When it is received
         channelManager.getChannel(queueName).publishAndWait(event)
 
         // Then it is logged to telemetry
         Mockito.verify(telemetryService).notificationReceived(event)
 
-        val eventDetails = ResourceLoader.file<EventDetails<BookingCancelled>>("cas3-$eventName")
         val contact = contactRepository.getByExternalReference(eventDetails.eventDetails.urn)
 
         MatcherAssert.assertThat(contact!!.type.code, Matchers.equalTo("EACA"))
@@ -139,14 +152,23 @@ internal class CASIntegrationTest {
     fun `person arrived message is processed correctly`() {
         val eventName = "person-arrived"
         val event = prepEvent(eventName, wireMockServer.port())
+        val eventDetails = ResourceLoader.file<EventDetails<PersonArrived>>("cas3-$eventName")
+        val eventDetailsCopy = eventDetails.copy(timestamp = ZonedDateTime.now().minusSeconds(3))
+        wireMockServer.stubFor(
+            get(urlEqualTo("/cas3-api/events/person-arrived/1234"))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(eventDetailsCopy))
+                )
+        )
 
         // When it is received
         channelManager.getChannel(queueName).publishAndWait(event)
 
         // Then it is logged to telemetry
         Mockito.verify(telemetryService).notificationReceived(event)
 
-        val eventDetails = ResourceLoader.file<EventDetails<PersonArrived>>("cas3-$eventName")
         val contact = contactRepository.getByExternalReference(eventDetails.eventDetails.urn)
 
         MatcherAssert.assertThat(contact!!.type.code, Matchers.equalTo("EAAR"))
@@ -166,14 +188,23 @@ internal class CASIntegrationTest {
     fun `person departed message is processed correctly`() {
         val eventName = "person-departed"
         val event = prepEvent(eventName, wireMockServer.port())
+        val eventDetails = ResourceLoader.file<EventDetails<PersonDeparted>>("cas3-$eventName")
+        val eventDetailsCopy = eventDetails.copy(timestamp = ZonedDateTime.now().minusSeconds(3))
+        wireMockServer.stubFor(
+            get(urlEqualTo("/cas3-api/events/person-departed/1234"))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(eventDetailsCopy))
+                )
+        )
 
         // When it is received
         channelManager.getChannel(queueName).publishAndWait(event)
 
         // Then it is logged to telemetry
         Mockito.verify(telemetryService).notificationReceived(event)
 
-        val eventDetails = ResourceLoader.file<EventDetails<PersonDeparted>>("cas3-$eventName")
         val contact = contactRepository.getByExternalReference(eventDetails.eventDetails.urn)
 
         MatcherAssert.assertThat(contact!!.type.code, Matchers.equalTo("EADP"))
@@ -190,12 +221,22 @@ internal class CASIntegrationTest {
         val existingEventDetails = ResourceLoader.file<EventDetails<PersonDeparted>>("cas3-person-departed")
         val existingContact = contactRepository.getByExternalReference(existingEventDetails.eventDetails.urn)
         val existingNotes = existingContact!!.notes
+        val eventDetails = ResourceLoader.file<EventDetails<PersonDeparted>>("cas3-$eventName")
+        val eventDetailsCopy = eventDetails.copy(timestamp = ZonedDateTime.now())
+        wireMockServer.stubFor(
+            get(urlEqualTo("/cas3-api/events/person-departed/12345"))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(eventDetailsCopy))
+                )
+        )
+
         // When it is received
         channelManager.getChannel(queueName).publishAndWait(event)
 
         // Then it is logged to telemetry
         Mockito.verify(telemetryService).notificationReceived(event)
-        val eventDetails = ResourceLoader.file<EventDetails<PersonDeparted>>("cas3-$eventName")
         val contact = contactRepository.getByExternalReference(eventDetails.eventDetails.urn)
 
         MatcherAssert.assertThat(
@@ -212,14 +253,23 @@ internal class CASIntegrationTest {
         val existingEventDetails = ResourceLoader.file<EventDetails<PersonArrived>>("cas3-person-arrived-update")
         val existingContact = contactRepository.getByExternalReference(existingEventDetails.eventDetails.urn)
         val existingNotes = existingContact!!.notes
+        val eventDetails = ResourceLoader.file<EventDetails<PersonArrived>>("cas3-$eventName")
+        val eventDetailsCopy = eventDetails.copy(timestamp = ZonedDateTime.now())
+        wireMockServer.stubFor(
+            get(urlEqualTo("/cas3-api/events/person-arrived/12345"))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(eventDetailsCopy))
+                )
+        )
 
         // When it is received
         channelManager.getChannel(queueName).publishAndWait(event)
 
         // Then it is logged to telemetry
         Mockito.verify(telemetryService).notificationReceived(event)
 
-        val eventDetails = ResourceLoader.file<EventDetails<PersonArrived>>("cas3-$eventName")
         val contact = contactRepository.getByExternalReference(eventDetails.eventDetails.urn)
 
         MatcherAssert.assertThat(
@@ -236,14 +286,23 @@ internal class CASIntegrationTest {
         val existingEventDetails = ResourceLoader.file<EventDetails<BookingCancelled>>("cas3-booking-cancelled-update")
         val existingContact = contactRepository.getByExternalReference(existingEventDetails.eventDetails.urn)
         val existingNotes = existingContact!!.notes
+        val eventDetails = ResourceLoader.file<EventDetails<BookingCancelled>>("cas3-$eventName")
+        val eventDetailsCopy = eventDetails.copy(timestamp = ZonedDateTime.now())
+        wireMockServer.stubFor(
+            get(urlEqualTo("/cas3-api/events/booking-cancelled/12345"))
+                .willReturn(
+                    aResponse()
+                        .withHeader("Content-Type", "application/json")
+                        .withBody(objectMapper.writeValueAsString(eventDetailsCopy))
+                )
+        )
 
         // When it is received
         channelManager.getChannel(queueName).publishAndWait(event)
 
         // Then it is logged to telemetry
         Mockito.verify(telemetryService).notificationReceived(event)
 
-        val eventDetails = ResourceLoader.file<EventDetails<BookingCancelled>>("cas3-$eventName")
         val contact = contactRepository.getByExternalReference(eventDetails.eventDetails.urn)
 
         MatcherAssert.assertThat(

diff --git a/...delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/ContactService.kt b/...delius/src/main/kotlin/uk/gov/justice/digital/hmpps/integrations/delius/ContactService.kt
@@ -37,7 +37,7 @@ class ContactService(
         val personId = person?.id ?: personRepository.getByCrn(crn).id
         val existing = contactRepository.getByExternalReference(event.eventDetails.urn)
         if (existing != null) {
-            if (existing.startTime < event.timestamp) {
+            if (existing.lastModifiedDateTime < event.timestamp) {
                 if (replaceNotes) {
                     existing.notes = event.eventDetails.noteText
                 } else {