PI-2199 Only match if there is a single custodial sentence (#3797)

ministryofjustice · May 14, 2024 · e4ad711 · e4ad711
1 parent d99fa85
commit e4ad711
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/.../src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt b/.../src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/PrisonMatchingIntegrationTest.kt
@@ -62,25 +62,18 @@ internal class PrisonMatchingIntegrationTest {
 
     @Test
     @Order(2)
-    fun `single match with existing noms number`() {
+    fun `no match with existing noms number if no custodial sentence in Delius`() {
         val crn = PersonGenerator.PERSON_WITH_NOMS.crn
 
         mockMvc
             .perform(post("/person/match-by-crn").withToken().withJson(listOf(crn)))
             .andExpect(status().is2xxSuccessful)
 
         verify(telemetryService, timeout(5000)).trackEvent(
-            "MatchResultSuccess", mapOf(
-                "reason" to "Matched CRN A000001 to NOMS number E1234XS",
+            "MatchResultNoMatch", mapOf(
+                "reason" to "No single match found in prison system",
                 "crn" to "A000001",
                 "potentialMatches" to """[{"nomsNumber":"E1234XS"}]""",
-                "existingNomsNumber" to "E1234XS",
-                "matchedNomsNumber" to "E1234XS",
-                "nomsNumberChanged" to "false",
-                "matchedBookingNumber" to "76543A",
-                "bookingNumberChanged" to "false",
-                "totalCustodialEvents" to "1",
-                "matchingCustodialEvents" to "0",
                 "dryRun" to "true"
             )
         )

diff --git a/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/PrisonMatchingService.kt b/...-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/service/PrisonMatchingService.kt
@@ -46,6 +46,9 @@ class PrisonMatchingService(
         val matchingCustodies = matchedPrisoner.sentenceStartDate
             ?.let { person.custodiesWithSentenceDateCloseTo(it) } ?: emptyList()
         val matchingCustody = matchingCustodies.singleOrNull()
+        val matchingPerson = matchingCustodies.map { it.disposal.event.person }.distinctBy { it.crn }.singleOrNull()
+        if (matchingPerson == null)
+            return NoMatch("No single match found in prison system", prisonerMatches.telemetry())
 
         return Success(
             identifiers, person, matchingCustody, prisonerMatches.telemetry() + mapOf(