PI-2391: Fixed issues with missing test data

ministryofjustice · Jul 29, 2024 · 8880c4e · 8880c4e
1 parent cea0e95
commit 8880c4e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/...nd-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ProxyIntegrationTest.kt b/...nd-delius/src/integrationTest/kotlin/uk/gov/justice/digital/hmpps/ProxyIntegrationTest.kt
@@ -282,8 +282,9 @@ internal class ProxyIntegrationTest {
                 .withToken()
         ).andExpect(status().is2xxSuccessful).andReturn().response.contentAsJson<CompareAllReport>()
 
-        assertThat(res.totalNumberOfRequests, equalTo(4))
+        assertThat(res.totalNumberOfRequests, equalTo(0))
         assertThat(res.totalNumberOfCrns, equalTo(2))
         assertThat(res.currentPageNumber, equalTo(2))
+        assertThat(res.unableToBeExecuted, equalTo(4))
     }
 }
diff --git a/...d-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/proxy/CommunityApiController.kt b/...d-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/proxy/CommunityApiController.kt
@@ -160,17 +160,17 @@ class CommunityApiController(
                 .map(CompletableFuture<CompareReport>::join)
                 .collect(Collectors.toList())
         }
-        val unsuccessful = reports.filter { !it.success }
-        val executionFailures = reports.filter { it.testExecuted == false }
+        val unsuccessful = reports.filter { !it.success && it.testExecuted == true }
+        val executionFailures = reports.filter { it.testExecuted == false }.size
 
         return CompareAllReport(
             totalNumberOfCrns = personList.totalElements.toInt(),
             totalPages = pageable.pageSize,
             currentPageNumber = compare.pageNumber,
-            totalNumberOfRequests = reports.size,
+            totalNumberOfRequests = reports.size - executionFailures,
             numberOfSuccessfulRequests = reports.size - unsuccessful.size,
             numberOfUnsuccessfulRequests = unsuccessful.size,
-            executionFailures = executionFailures,
+            unableToBeExecuted = executionFailures,
             failureReports = reports.filter { !it.success && it.testExecuted == true }
         )
     }

diff --git a/...ase-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/proxy/CompareAllReport.kt b/...ase-and-delius/src/main/kotlin/uk/gov/justice/digital/hmpps/api/proxy/CompareAllReport.kt
@@ -7,6 +7,6 @@ data class CompareAllReport(
     val totalNumberOfRequests: Int,
     val numberOfSuccessfulRequests: Int,
     val numberOfUnsuccessfulRequests: Int,
-    val executionFailures: List<CompareReport>,
+    val unableToBeExecuted: Int,
     val failureReports: List<CompareReport>,
 )