Use Voltage Level Deletion modification from powsybl (#209)

Signed-off-by: Etienne Homer <[email protected]>

Author: etiennehomer

src/main/java/org/gridsuite/modification/server/modifications/EquipmentDeletion.java

@@ -10,6 +10,7 @@
 import com.powsybl.commons.reporter.Reporter;
 import com.powsybl.commons.reporter.TypedValue;
 import com.powsybl.iidm.modification.topology.RemoveFeederBay;
+import com.powsybl.iidm.modification.topology.RemoveVoltageLevel;
 import com.powsybl.iidm.network.*;
 import org.gridsuite.modification.server.NetworkModificationException;
 import org.gridsuite.modification.server.dto.EquipmentDeletionInfos;
@@ -38,7 +39,7 @@ public void apply(Network network, Reporter subReporter) {
         } else if (identifiable instanceof HvdcLine) {
             ((HvdcLine) identifiable).remove();
         } else if (identifiable instanceof VoltageLevel) {
-            ((VoltageLevel) identifiable).remove();
+            new RemoveVoltageLevel(modificationInfos.getEquipmentId()).apply(network, true, subReporter);
         } else if (identifiable instanceof Substation) {
             ((Substation) identifiable).remove();
         }

src/test/java/org/gridsuite/modification/server/Impacts/TestImpactUtils.java

@@ -17,6 +17,8 @@
 import org.gridsuite.modification.server.impacts.SimpleElementImpact.SimpleImpactType;
 import org.gridsuite.modification.server.utils.MatcherJson;
 import org.hamcrest.MatcherAssert;
+import org.skyscreamer.jsonassert.JSONAssert;
+import org.skyscreamer.jsonassert.JSONCompareMode;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -78,7 +80,7 @@ public static void testElementImpacts(ObjectMapper mapper, String resultAsString
             .applicationStatus(ApplicationStatus.ALL_OK)
             .networkImpacts(elementImpactsExpected)
             .build();
-        assertThat(networkModificationResult.get(), new MatcherJson<>(mapper, resultExpected));
+        JSONAssert.assertEquals(mapper.writeValueAsString(resultExpected), resultAsString, JSONCompareMode.NON_EXTENSIBLE);
     }
 
     public static void testElementCreationImpact(ObjectMapper mapper, String resultAsString, IdentifiableType elementType, String elementId, Set<String> substationIds) {

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

@@ -866,16 +866,8 @@ public void testTombstonedEquipmentInfos() {
                 Pair.of(IdentifiableType.SHUNT_COMPENSATOR, "v5shunt"), Pair.of(IdentifiableType.STATIC_VAR_COMPENSATOR, "v5Compensator")),
             "s3"
         );
-        testNetworkModificationsCount(TEST_GROUP_ID, 14);
 
-        // try to delete voltage level (Internal error because the vl is still connected)
-        equipmentDeletionInfos.setEquipmentType(IdentifiableType.VOLTAGE_LEVEL.name());
-        equipmentDeletionInfos.setEquipmentId("v4");
-        mockMvc.perform(post(URI_NETWORK_MODIF).content(objectWriter.writeValueAsString(equipmentDeletionInfos)).contentType(MediaType.APPLICATION_JSON))
-            .andExpect(status().isOk());
-        assertNotNull(network.getVoltageLevel("v4"));
-        assertLogMessage(new PowsyblException(new AssertionError("The voltage level 'v4' cannot be removed because of a remaining LINE")).getMessage(),
-                equipmentDeletionInfos.getErrorType().name(), reportService);
+        testNetworkModificationsCount(TEST_GROUP_ID, 14);
 
         // delete substation
         equipmentDeletionInfos.setEquipmentType(IdentifiableType.SUBSTATION.name());
@@ -888,7 +880,7 @@ public void testTombstonedEquipmentInfos() {
                 Pair.of(IdentifiableType.SHUNT_COMPENSATOR, "v6shunt"), Pair.of(IdentifiableType.STATIC_VAR_COMPENSATOR, "v6Compensator")),
             "s3");
         testSubstationDeletionImpacts(mvcResult.getResponse().getContentAsString(), "s3", vlDeletionImpacts);
-        testNetworkModificationsCount(TEST_GROUP_ID, 16);
+        testNetworkModificationsCount(TEST_GROUP_ID, 15);
 
         // try to delete substation (Internal error because the substation is still connected)
         equipmentDeletionInfos.setEquipmentType(IdentifiableType.SUBSTATION.name());

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

@@ -7,7 +7,6 @@
 
 package org.gridsuite.modification.server.modifications;
 
-import com.powsybl.commons.PowsyblException;
 import com.powsybl.iidm.network.Network;
 import lombok.SneakyThrows;
 import org.gridsuite.modification.server.NetworkModificationException;
@@ -95,16 +94,6 @@ public void testCreateWithErrors() {
         assertLogMessage(new NetworkModificationException(EQUIPMENT_NOT_FOUND, "Equipment with id=notFoundLoad not found or of bad type").getMessage(),
                 equipmentDeletionInfos.getErrorType().name(), reportService);
 
-        // try to delete voltage level (Internal error because the vl is still connected)
-        equipmentDeletionInfos.setEquipmentType("VOLTAGE_LEVEL");
-        equipmentDeletionInfos.setEquipmentId("v4");
-        mockMvc.perform(post(getNetworkModificationUri()).content(mapper.writeValueAsString(equipmentDeletionInfos)).contentType(MediaType.APPLICATION_JSON))
-                .andExpect(status().isOk());
-        assertLogMessage(new PowsyblException(new AssertionError("The voltage level 'v4' cannot be removed because of a remaining THREE_WINDINGS_TRANSFORMER")).getMessage(),
-                equipmentDeletionInfos.getErrorType().name(), reportService);
-        equipmentDeletionInfos.setEquipmentId("v4");
-        assertNotNull(getNetwork().getVoltageLevel("v4"));
-
         // try to delete substation (Internal error because the substation is still connected)
         equipmentDeletionInfos.setEquipmentType("SUBSTATION");
         equipmentDeletionInfos.setEquipmentId("s2");

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

@@ -0,0 +1,64 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+package org.gridsuite.modification.server.modifications;
+
+import com.powsybl.iidm.network.Network;
+import org.gridsuite.modification.server.dto.EquipmentDeletionInfos;
+import org.gridsuite.modification.server.dto.ModificationInfos;
+import org.gridsuite.modification.server.utils.MatcherEquipmentDeletionInfos;
+import org.gridsuite.modification.server.utils.NetworkCreation;
+
+import java.util.UUID;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
+/**
+ * @author Etienne Homer <etienne.homer at rte-france.com>
+ */
+public class VoltageLevelDeletionTest extends AbstractNetworkModificationTest {
+    @Override
+    protected Network createNetwork(UUID networkUuid) {
+        return NetworkCreation.create(networkUuid, true);
+    }
+
+    @Override
+    protected ModificationInfos buildModification() {
+        return EquipmentDeletionInfos.builder()
+                .equipmentType("VOLTAGE_LEVEL")
+                .equipmentId("v1")
+                .build();
+    }
+
+    @Override
+    protected ModificationInfos buildModificationUpdate() {
+        return EquipmentDeletionInfos.builder()
+                .equipmentType("LINE")
+                .equipmentId("v2")
+                .build();
+    }
+
+    @Override
+    protected MatcherEquipmentDeletionInfos createMatcher(ModificationInfos modificationInfos) {
+        return MatcherEquipmentDeletionInfos.createMatcherEquipmentDeletionInfos((EquipmentDeletionInfos) modificationInfos);
+    }
+
+    @Override
+    protected void assertNetworkAfterCreation() {
+        assertNull(getNetwork().getVoltageLevel("v1"));
+        assertNull(getNetwork().getLoad("v1load"));
+        assertNull(getNetwork().getLccConverterStation("v1lcc"));
+        assertNull(getNetwork().getSwitch("v1d1"));
+        assertNull(getNetwork().getLine("line2"));
+        assertNull(getNetwork().getHvdcLine("hvdcLine"));
+    }
+
+    @Override
+    protected void assertNetworkAfterDeletion() {
+        assertNotNull(getNetwork().getVoltageLevel("v1"));
+    }
+}