PI-2667 Common Platform Address records - OS Places API

- Added wiremock mappings files - Fixed failing tests
ministryofjustice · Dec 6, 2024 · f4e41fe · f4e41fe
1 parent 0267333
commit f4e41fe
Show file tree

Hide file tree

Showing 5 changed files with 50 additions and 105 deletions.
diff --git a/...-platform-and-delius/src/dev/resources/simulations/__files/address-lookup-no-results.json b/...-platform-and-delius/src/dev/resources/simulations/__files/address-lookup-no-results.json
@@ -0,0 +1,4 @@
+{
+  "header": { "totalresults": 0 },
+  "results": []
+}
diff --git a/...atform-and-delius/src/dev/resources/simulations/__files/address-lookup-single-result.json b/...atform-and-delius/src/dev/resources/simulations/__files/address-lookup-single-result.json
@@ -0,0 +1,15 @@
+{
+  "header": { "totalresults": 1 },
+  "results": [
+    {
+      "DPA": {
+        "ADDRESS": "123 Test Street, Test, AB1 2CD",
+        "POSTCODE": "AB1 2CD",
+        "BUILDING_NUMBER": "123",
+        "THOROUGHFARE_NAME": "Test Street",
+        "POST_TOWN": "Test",
+        "MATCH": 0.9
+      }
+    }
+  ]
+}
diff --git a/...on-platform-and-delius/src/dev/resources/simulations/mappings/address-lookup-mapping.json b/...on-platform-and-delius/src/dev/resources/simulations/mappings/address-lookup-mapping.json
@@ -0,0 +1,13 @@
+{
+  "request": {
+    "method": "GET",
+    "urlPath": "/address-lookup/search/places/v1/find"
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "bodyFileName": "address-lookup-single-result.json"
+  }
+}
diff --git a/...-platform-and-delius/src/dev/resources/simulations/mappings/probation-search-mapping.json b/...-platform-and-delius/src/dev/resources/simulations/mappings/probation-search-mapping.json
@@ -0,0 +1,13 @@
+{
+  "request": {
+    "method": "POST",
+    "urlPath": "/probation-search/match"
+  },
+  "response": {
+    "status": 200,
+    "headers": {
+      "Content-Type": "application/json"
+    },
+    "bodyFileName": "probation-search-no-results.json"
+  }
+}
diff --git a/...orm-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt b/...orm-and-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/IntegrationTest.kt
@@ -97,67 +97,27 @@ internal class IntegrationTest {
 
     @Test
     fun `When a message with no prosecution cases is found no insert is performed`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT_NO_CASES)
         channelManager.getChannel(queueName).publishAndWait(notification)
         thenNoRecordsAreInserted()
     }
 
     @Test
     fun `When a message without a judicial result of remanded in custody is found`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT_NO_REMAND)
         channelManager.getChannel(queueName).publishAndWait(notification)
         thenNoRecordsAreInserted()
     }
 
     @Test
     fun `When a person under 10 years old is found no insert is performed`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT_DOB_ERROR)
         channelManager.getChannel(queueName).publishAndWait(notification)
         thenNoRecordsAreInserted()
     }
 
     @Test
     fun `When a probation search match is not detected then a person is inserted`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT)
         channelManager.getChannel(queueName).publishAndWait(notification)
 
@@ -181,33 +141,13 @@ internal class IntegrationTest {
 
     @Test
     fun `When a hearing message with missing required fields is detected no records are inserted`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT_NULL_FIELDS)
         channelManager.getChannel(queueName).publishAndWait(notification)
         thenNoRecordsAreInserted()
     }
 
     @Test
     fun `When a hearing with an address is received then an address record is inserted`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT)
         channelManager.getChannel(queueName).publishAndWait(notification)
 
@@ -236,16 +176,6 @@ internal class IntegrationTest {
 
     @Test
     fun `When a hearing with an empty address is received then an address record is not inserted`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT_BLANK_ADDRESS)
         channelManager.getChannel(queueName).publishAndWait(notification)
 
@@ -265,16 +195,6 @@ internal class IntegrationTest {
     @Order(1)
     @Test
     fun `engagement created and address created sns messages are published on insert person`() {
-        wireMockServer.stubFor(
-            post(urlPathEqualTo("/probation-search/match"))
-                .willReturn(
-                    aResponse()
-                        .withStatus(200)
-                        .withHeader("Content-Type", "application/json")
-                        .withBodyFile("probation-search-no-results.json")
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT)
         channelManager.getChannel(queueName).publishAndWait(notification)
 
@@ -377,31 +297,6 @@ internal class IntegrationTest {
 
     @Test
     fun `Address lookup api is inserted when result is found`() {
-        wireMockServer.stubFor(
-            get(urlPathEqualTo("/address-lookup/search/places/v1/find"))
-                .willReturn(
-                    okJson(
-                        """
-                {
-                    "header": { "totalresults": 1 },
-                    "results": [
-                        {
-                            "DPA": {
-                                "address": "123 Test Street, Test, AB1 2CD",
-                                "postcode": "AB1 2CD",
-                                "buildingNumber": "123",
-                                "thoroughfareName": "Test Street",
-                                "postTown": "Test",
-                                "match": 0.9
-                            }
-                        }
-                    ]
-                }
-                """
-                    )
-                )
-        )
-
         val notification = Notification(message = MessageGenerator.COMMON_PLATFORM_EVENT)
         channelManager.getChannel(queueName).publishAndWait(notification)
 
@@ -429,4 +324,9 @@ internal class IntegrationTest {
         verify(auditedInteractionService, Mockito.never())
             .createAuditedInteraction(any(), any(), eq(AuditedInteraction.Outcome.SUCCESS), any(), anyOrNull())
     }
+
+    @AfterEach
+    fun resetWireMock() {
+        wireMockServer.resetAll()
+    }
 }