Prevent failure when there are some missing shortcircuit data (#55)

Signed-off-by: Hugo Marcellin <[email protected]>

Author: Meklo

src/main/java/org/gridsuite/shortcircuit/server/repositories/ShortCircuitAnalysisResultRepository.java

@@ -158,7 +158,7 @@ public void insertStatus(List<UUID> resultUuids, String status) {
     @Transactional
     public void insert(UUID resultUuid, ShortCircuitAnalysisResult result, Map<String, ShortCircuitLimits> allCurrentLimits, String status) {
         Objects.requireNonNull(resultUuid);
-        if (result != null && result.getFaultResults().stream().map(FaultResult::getStatus).noneMatch(FaultResult.Status.NO_SHORT_CIRCUIT_DATA::equals)) {
+        if (result != null && !result.getFaultResults().stream().map(FaultResult::getStatus).allMatch(FaultResult.Status.NO_SHORT_CIRCUIT_DATA::equals)) {
             resultRepository.save(toResultEntity(resultUuid, result, allCurrentLimits));
         }
         globalStatusRepository.save(toStatusEntity(resultUuid, status));

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitWorkerService.java

@@ -223,7 +223,8 @@ public Consumer<Message<String>> consumeRun() {
                 LOGGER.info("Stored in {}s", TimeUnit.NANOSECONDS.toSeconds(finalNanoTime - startTime.getAndSet(finalNanoTime)));
 
                 if (result != null) {  // result available
-                    if (result.getFaultResults().stream().map(FaultResult::getStatus).anyMatch(FaultResult.Status.NO_SHORT_CIRCUIT_DATA::equals)) {
+                    if (!result.getFaultResults().isEmpty() &&
+                        result.getFaultResults().stream().map(FaultResult::getStatus).allMatch(FaultResult.Status.NO_SHORT_CIRCUIT_DATA::equals)) {
                         LOGGER.error("Short circuit analysis failed (resultUuid='{}')", resultContext.getResultUuid());
                         notificationService.publishFail(resultContext.getResultUuid(), resultContext.getRunContext().getReceiver(),
                                 "Missing short-circuit extension data",

src/test/java/org/gridsuite/shortcircuit/server/ShortCircuitAnalysisControllerTest.java

@@ -607,4 +607,29 @@ public void runWithReportTest() {
             assertEquals("me", resultMessage.getHeaders().get("receiver"));
         }
     }
+
+    @SneakyThrows
+    @Test
+    public void runWithNoShortcircuitDataTest() {
+        try (MockedStatic<ShortCircuitAnalysis> shortCircuitAnalysisMockedStatic = TestUtils.injectShortCircuitAnalysisProvider(new ShortCircuitAnalysisProviderMock())) {
+            shortCircuitAnalysisMockedStatic.when(() -> ShortCircuitAnalysis.runAsync(eq(network1), anyList(), any(ShortCircuitParameters.class), any(ComputationManager.class), anyList(), any(Reporter.class)))
+                .thenReturn(CompletableFuture.completedFuture(RESULT));
+
+            mockMvc.perform(post(
+                    "/" + VERSION + "/networks/{networkUuid}/run-and-save?reporterId=myReporter&receiver=me&reportUuid=" + REPORT_UUID + "&variantId=" + VARIANT_2_ID, NETWORK_UUID)
+                    .header(HEADER_USER_ID, "user"))
+                .andExpect(status().isOk())
+                .andExpect(content().contentType(MediaType.APPLICATION_JSON))
+                .andReturn();
+
+            Message<byte[]> runMessage = output.receive(TIMEOUT, shortCircuitAnalysisRunDestination);
+            assertEquals(RESULT_UUID.toString(), runMessage.getHeaders().get("resultUuid"));
+            assertEquals("me", runMessage.getHeaders().get("receiver"));
+
+            //network1 has no shortcircuit data so the computation should fail
+            Message<byte[]> resultMessage = output.receive(TIMEOUT, shortCircuitAnalysisFailedDestination);
+            assertEquals(RESULT_UUID.toString(), resultMessage.getHeaders().get("resultUuid"));
+            assertEquals("me", resultMessage.getHeaders().get("receiver"));
+        }
+    }
 }