Flush network before inserting results (#198)

Author: antoinebhs

src/main/java/org/gridsuite/loadflow/server/service/LoadFlowWorkerService.java

@@ -115,16 +115,16 @@ protected PreloadingStrategy getNetworkPreloadingStrategy() {
     }
 
     @Override
-    protected void saveResult(Network network, AbstractResultContext<LoadFlowRunContext> resultContext, LoadFlowResult result) {
+    public void saveResult(Network network, AbstractResultContext<LoadFlowRunContext> resultContext, LoadFlowResult result) {
         LoadFlowModificationInfos loadFlowModificationInfos = handleSolvedValues(network, resultContext.getRunContext().isApplySolvedValues());
         List<LimitViolationInfos> limitViolationInfos = getLimitViolations(network, resultContext.getRunContext());
         List<LimitViolationInfos> limitViolationsWithCalculatedOverload = calculateOverloadLimitViolations(limitViolationInfos, network);
-        resultService.insert(resultContext.getResultUuid(), result,
-                LoadFlowService.computeLoadFlowStatus(result), loadFlowModificationInfos, limitViolationsWithCalculatedOverload);
         if (result != null && !result.isFailed()) {
             // flush network in the network store
             observer.observe("network.save", resultContext.getRunContext(), () -> networkStoreService.flush(resultContext.getRunContext().getNetwork()));
         }
+        resultService.insert(resultContext.getResultUuid(), result,
+                LoadFlowService.computeLoadFlowStatus(result), loadFlowModificationInfos, limitViolationsWithCalculatedOverload);
     }
 
     private LoadFlowModificationInfos handleSolvedValues(Network network, boolean applySolvedValues) {

src/test/java/org/gridsuite/loadflow/server/LoadFlowWorkerServiceTest.java

@@ -9,19 +9,42 @@
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.test.EurostagTutorialExample1Factory;
 import com.powsybl.iidm.network.util.LimitViolationUtils;
+import com.powsybl.loadflow.LoadFlowParameters;
+import com.powsybl.network.store.client.NetworkStoreService;
 import com.powsybl.network.store.iidm.impl.NetworkFactoryImpl;
 import com.powsybl.security.LimitViolationType;
+import org.gridsuite.computation.service.AbstractResultContext;
 import org.gridsuite.loadflow.server.dto.LimitViolationInfos;
+import org.gridsuite.loadflow.server.dto.parameters.LoadFlowParametersValues;
+import org.gridsuite.loadflow.server.service.LoadFlowResultService;
+import org.gridsuite.loadflow.server.service.LoadFlowRunContext;
 import org.gridsuite.loadflow.server.service.LoadFlowWorkerService;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
+import org.mockito.InOrder;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.boot.test.mock.mockito.MockBean;
+
+import java.util.UUID;
+
+import static org.mockito.Mockito.*;
 
 /**
  * @author Kevin Le Saulnier <kevin.le-saulnier at rte-france.com>
  */
 @SpringBootTest
 class LoadFlowWorkerServiceTest {
+
+    @MockBean
+    private NetworkStoreService networkStoreService;
+
+    @MockBean
+    private LoadFlowResultService loadFlowResultService;
+
+    @Autowired
+    private LoadFlowWorkerService loadFlowWorkerService;
+
     @Test
     void testGetNextLimitName() {
         Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits(new NetworkFactoryImpl());
@@ -83,4 +106,28 @@ void testGetNoTemporaryLimitNextLimitName() {
         String expectedNextLimitName = null;
         Assertions.assertEquals(expectedNextLimitName, nextLimitName);
     }
+
+    @Test
+    void testFlushIsCalledBeforeInsertResults() {
+        Network network = mock(Network.class);
+        LoadFlowRunContext runContext = mock(LoadFlowRunContext.class);
+        AbstractResultContext<LoadFlowRunContext> resultContext = mock(AbstractResultContext.class);
+        com.powsybl.loadflow.LoadFlowResult result = mock(com.powsybl.loadflow.LoadFlowResult.class);
+        LoadFlowParametersValues parametersValues = mock(LoadFlowParametersValues.class);
+        when(resultContext.getRunContext()).thenReturn(runContext);
+        when(resultContext.getResultUuid()).thenReturn(UUID.randomUUID());
+        when(runContext.isApplySolvedValues()).thenReturn(false);
+        when(runContext.getNetwork()).thenReturn(network);
+        when(runContext.buildParameters()).thenReturn(mock(LoadFlowParameters.class));
+        when(runContext.getParameters()).thenReturn(parametersValues);
+        when(parametersValues.getLimitReduction()).thenReturn(0.8f);
+        when(result.isFailed()).thenReturn(false);
+
+        loadFlowWorkerService.saveResult(network, resultContext, result);
+
+        // Verify results save (flush) is done before inserting results in DB
+        InOrder inOrder = inOrder(networkStoreService, loadFlowResultService);
+        inOrder.verify(networkStoreService).flush(resultContext.getRunContext().getNetwork());
+        inOrder.verify(loadFlowResultService).insert(any(UUID.class), eq(result), any(), any(), any());
+    }
 }