feat: add network existance check before applying modification

pom.xml

@@ -58,6 +58,9 @@
         <sonar.organization>gridsuite</sonar.organization>
         <sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
         <network-modification.version>1.8.0</network-modification.version>
+        <!-- FIXME remove this in the next powsybl release update -->
+        <network-store.version>1.51.0</network-store.version>
+        <network-modification.version>1.8.0</network-modification.version>
     </properties>
 
     <build>
@@ -129,6 +132,20 @@
         <dependency>
             <groupId>com.powsybl</groupId>
             <artifactId>powsybl-network-store-client</artifactId>
+            <!-- FIXME remove this in the next powsybl release update -->
+            <version>${network-store.version}</version>
+        </dependency>
+        <!-- FIXME: to be removed at next release of gridsuite-dependencies or powsybl-ws-dependencies -->
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-network-store-iidm-impl</artifactId>
+            <version>${network-store.version}</version>
+        </dependency>
+        <!-- FIXME: to be removed at next release of gridsuite-dependencies or powsybl-ws-dependencies -->
+        <dependency>
+            <groupId>com.powsybl</groupId>
+            <artifactId>powsybl-network-store-model</artifactId>
+            <version>${network-store.version}</version>
         </dependency>
         <dependency>
             <groupId>org.gridsuite</groupId>

src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java

@@ -492,6 +492,11 @@ public void duplicateGroup(@NonNull UUID sourceGroupUuid, @NonNull UUID targetGr
     }
 
     private CompletableFuture<Optional<NetworkModificationResult>> applyModifications(UUID networkUuid, String variantId, ModificationApplicationGroup modificationGroupInfos) {
+        if (!networkStoreService.networkExists(networkUuid)) {
+            // The network is not loaded
+            return CompletableFuture.completedFuture(Optional.empty());
+        }
+
         if (!modificationGroupInfos.modifications().isEmpty()) {
             PreloadingStrategy preloadingStrategy = modificationGroupInfos.modifications().stream()
                 .filter(m -> m.isActivatedOn(modificationGroupInfos.rootNetworkTag()))

src/test/java/org/gridsuite/modification/server/CompositeControllerTest.java

@@ -55,8 +55,7 @@
 import static org.gridsuite.modification.server.utils.TestUtils.runRequestAsync;
 import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.*;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -105,6 +104,7 @@ void setUp() {
         objectWriter = mapper.writer().withDefaultPrettyPrinter();
         network = NetworkCreation.create(TEST_NETWORK_ID, true);
         when(networkStoreService.getNetwork(eq(TEST_NETWORK_ID), nullable(PreloadingStrategy.class))).then((Answer<Network>) invocation -> network);
+        when(networkStoreService.networkExists(any(UUID.class))).thenReturn(true);
         networkModificationRepository.deleteAll();
     }
 

src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java

@@ -172,6 +172,7 @@ void setUp() {
 
         when(networkStoreService.getNetwork(eq(TEST_NETWORK_MIXED_TOPOLOGY_ID),
                 nullable(PreloadingStrategy.class))).then((Answer<Network>) invocation -> NetworkCreation.createMixedTopology(TEST_NETWORK_MIXED_TOPOLOGY_ID));
+        when(networkStoreService.networkExists(any(UUID.class))).thenReturn(true);
 
         doThrow(new HttpServerErrorException(HttpStatus.INTERNAL_SERVER_ERROR, "Internal server error"))
             .when(networkStoreService).flush(argThat(n -> TEST_NETWORK_WITH_FLUSH_ERROR_ID.toString().equals(n.getId())));

src/test/java/org/gridsuite/modification/server/modifications/AbstractNetworkModificationTest.java

@@ -106,6 +106,7 @@ public void setUp() {
 
         when(networkStoreService.getNetwork(eq(NOT_FOUND_NETWORK_ID), any(PreloadingStrategy.class))).thenThrow(new PowsyblException());
         when(networkStoreService.getNetwork(eq(TEST_NETWORK_ID), any(PreloadingStrategy.class))).then((Answer<Network>) invocation -> network);
+        when(networkStoreService.networkExists(TEST_NETWORK_ID)).thenReturn(true);
 
         wireMockServer = new WireMockServer(wireMockConfig().dynamicPort());
         wireMockUtils = new WireMockUtils(wireMockServer);

src/test/java/org/gridsuite/modification/server/service/BuildTest.java

@@ -171,6 +171,7 @@ public void setUp(final MockWebServer mockWebServer) {
             network = NetworkCreation.create(TEST_NETWORK_ID, true);
             return network;
         });
+        when(networkStoreService.networkExists(any(UUID.class))).thenReturn(true);
 
         waitStartBuild = new CountDownLatch(1);
         blockBuild = new CountDownLatch(1);

src/test/java/org/gridsuite/modification/server/service/EquipmentIndexationTest.java

@@ -35,8 +35,7 @@
 import static com.powsybl.iidm.network.VariantManagerConstants.INITIAL_VARIANT_ID;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
-import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.ArgumentMatchers.nullable;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -87,6 +86,7 @@ class EquipmentIndexationTest {
     void setUp() {
         network = NetworkCreation.create(NETWORK_UUID, true);
         when(networkStoreService.getNetwork(eq(NETWORK_UUID), nullable(PreloadingStrategy.class))).then((Answer<Network>) invocation -> network);
+        when(networkStoreService.networkExists(any(UUID.class))).thenReturn(true);
 
         // clean DB
         modificationApplicationRepository.deleteAll();

src/test/java/org/gridsuite/modification/server/service/ModificationIndexationTest.java

@@ -95,6 +95,7 @@ void setUp() {
         when(networkInfos.getNetwork()).thenReturn(network);
         when(networkInfos.getNetworkUuuid()).thenReturn(networkUuid);
         when(networkStoreService.getNetwork(eq(networkInfos.getNetworkUuuid()), any(PreloadingStrategy.class))).thenReturn(network);
+        when(networkStoreService.networkExists(any(UUID.class))).thenReturn(true);
     }
 
     @AfterEach

src/test/java/org/gridsuite/modification/server/service/NetworkModificationServiceTest.java

@@ -6,21 +6,27 @@
  */
 package org.gridsuite.modification.server.service;
 
+import com.powsybl.network.store.client.NetworkStoreService;
 import org.gridsuite.modification.dto.CompositeModificationInfos;
 import org.gridsuite.modification.dto.LoadModificationInfos;
 import org.gridsuite.modification.dto.ModificationInfos;
+import org.gridsuite.modification.server.dto.ModificationApplicationContext;
+import org.gridsuite.modification.server.dto.NetworkModificationsResult;
 import org.gridsuite.modification.server.entities.ModificationEntity;
 import org.gridsuite.modification.server.repositories.ModificationRepository;
 import org.gridsuite.modification.server.repositories.NetworkModificationRepository;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.test.context.bean.override.mockito.MockitoBean;
 
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.when;
 
 /**
  * @author Mathieu Deharbe <mathieu.deharbe at rte-france.com>
@@ -37,6 +43,9 @@ class NetworkModificationServiceTest {
     @Autowired
     private ModificationRepository modificationRepository;
 
+    @MockitoBean
+    private NetworkStoreService networkStoreService;
+
     @Test
     void shouldMoveModificationOutOfCompositeContainerWhenStashed() {
         UUID groupUuid = UUID.randomUUID();
@@ -91,6 +100,27 @@ void shouldFindParentCompositeOnlyForModificationsNestedInAComposite() {
         assertFalse(parentComposites.containsKey(directGroupChildUuid));
     }
 
+    @Test
+    void shouldNotApplyModificationsWhenNetworkDoesNotExist() {
+        UUID networkUuid = UUID.randomUUID();
+        UUID targetGroupUuid = UUID.randomUUID();
+        List<ModificationInfos> saved = networkModificationRepository.saveModifications(
+                UUID.randomUUID(), List.of(ModificationEntity.fromDTO(dummyModification(UUID.randomUUID()))));
+
+        when(networkStoreService.networkExists(any(UUID.class))).thenReturn(false);
+
+        NetworkModificationsResult result = networkModificationService.duplicateModifications(
+                targetGroupUuid,
+                null,
+                saved.stream().map(ModificationInfos::getUuid).toList(),
+                List.of(new ModificationApplicationContext(networkUuid, "variant", UUID.randomUUID(), UUID.randomUUID(), "tag1"))
+        ).join();
+
+        assertEquals(1, result.modificationUuids().size());
+        assertEquals(1, result.modificationResults().size());
+        assertTrue(result.modificationResults().get(0).isEmpty());
+    }
+
     private static LoadModificationInfos dummyModification(UUID uuid) {
         return LoadModificationInfos.builder()
                 .equipmentId("dummyEquipmentId")