fix missing properties when creating a vl in splitLineWithVoltageLevel modification (#146)

Signed-off-by: Etienne LESOT <etienne.lesot@rte-france.com>

Author: EtienneLt

src/main/java/org/gridsuite/modification/modifications/LineAttachToVoltageLevel.java

@@ -63,9 +63,6 @@ public void apply(Network network, ReportNode subReportNode) {
         VoltageLevelCreationInfos mayNewVL = modificationInfos.getMayNewVoltageLevelInfos();
         if (mayNewVL != null) {
             ModificationUtils.getInstance().createVoltageLevel(mayNewVL, subReportNode, network);
-            // properties
-            VoltageLevel voltageLevel = network.getVoltageLevel(mayNewVL.getEquipmentId());
-            PropertiesUtils.applyProperties(voltageLevel, null, mayNewVL.getProperties(), null);
         }
 
         LineCreationInfos attachmentLineInfos = modificationInfos.getAttachmentLine();

src/main/java/org/gridsuite/modification/modifications/LineSplitWithVoltageLevel.java

@@ -9,14 +9,15 @@
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.iidm.modification.topology.ConnectVoltageLevelOnLine;
 import com.powsybl.iidm.modification.topology.ConnectVoltageLevelOnLineBuilder;
-import com.powsybl.iidm.network.*;
+import com.powsybl.iidm.network.Network;
 import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.LineSplitWithVoltageLevelInfos;
 import org.gridsuite.modification.dto.VoltageLevelCreationInfos;
 import org.gridsuite.modification.utils.ModificationUtils;
 import org.springframework.lang.NonNull;
 
-import static org.gridsuite.modification.NetworkModificationException.Type.*;
+import static org.gridsuite.modification.NetworkModificationException.Type.LINE_ALREADY_EXISTS;
+import static org.gridsuite.modification.NetworkModificationException.Type.LINE_NOT_FOUND;
 
 /**
  * @author Slimane Amar <slimane.amar at rte-france.com>

src/main/java/org/gridsuite/modification/modifications/VoltageLevelCreation.java

@@ -8,11 +8,9 @@
 
 import com.powsybl.commons.report.ReportNode;
 import com.powsybl.iidm.network.Network;
-import com.powsybl.iidm.network.VoltageLevel;
 import org.gridsuite.modification.NetworkModificationException;
 import org.gridsuite.modification.dto.VoltageLevelCreationInfos;
 import org.gridsuite.modification.utils.ModificationUtils;
-import org.gridsuite.modification.utils.PropertiesUtils;
 
 import static org.gridsuite.modification.NetworkModificationException.Type.CREATE_VOLTAGE_LEVEL_ERROR;
 import static org.gridsuite.modification.utils.ModificationUtils.checkIsNotNegativeValue;
@@ -40,9 +38,6 @@ public void check(Network network) throws NetworkModificationException {
     @Override
     public void apply(Network network, ReportNode subReportNode) {
         ModificationUtils.getInstance().createVoltageLevel(modificationInfos, subReportNode, network);
-        // properties
-        VoltageLevel voltageLevel = network.getVoltageLevel(modificationInfos.getEquipmentId());
-        PropertiesUtils.applyProperties(voltageLevel, subReportNode, modificationInfos.getProperties(), "network.modification.VlProperties");
     }
 
     @Override

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

@@ -442,6 +442,7 @@ public void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInf
                 .withUntypedValue("id", voltageLevelCreationInfos.getEquipmentId())
                 .withSeverity(TypedValue.INFO_SEVERITY)
                 .add();
+        PropertiesUtils.applyProperties(voltageLevel, subReportNode, voltageLevelCreationInfos.getProperties(), "network.modification.VlProperties");
     }
 
     public LineAdder createLineAdder(Network network, VoltageLevel voltageLevel1, VoltageLevel voltageLevel2, LineCreationInfos lineCreationInfos, boolean withSwitch1, boolean withSwitch2) {

src/test/java/org/gridsuite/modification/modifications/LineSplitWithNewVoltageLevelTest.java

@@ -9,13 +9,12 @@
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.powsybl.iidm.network.Network;
 import com.powsybl.iidm.network.SwitchKind;
+import com.powsybl.iidm.network.VoltageLevel;
 import org.gridsuite.modification.NetworkModificationException;
-import org.gridsuite.modification.dto.CouplingDeviceInfos;
-import org.gridsuite.modification.dto.LineSplitWithVoltageLevelInfos;
-import org.gridsuite.modification.dto.ModificationInfos;
-import org.gridsuite.modification.dto.VoltageLevelCreationInfos;
+import org.gridsuite.modification.dto.*;
 import org.gridsuite.modification.utils.NetworkCreation;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Map;
 import java.util.UUID;
 
@@ -57,6 +56,11 @@ protected ModificationInfos buildModification() {
                 .sectionCount(2)
                 .switchKinds(Arrays.asList(SwitchKind.BREAKER))
                 .couplingDevices(Arrays.asList(CouplingDeviceInfos.builder().busbarSectionId1("1A").busbarSectionId2("1B").build()))
+                .properties(List.of(FreePropertyInfos.builder()
+                        .added(true)
+                        .name("voltageLevelProp")
+                        .value("valueVoltageLevel")
+                        .build()))
                 .build();
 
         return LineSplitWithVoltageLevelInfos.builder()
@@ -79,6 +83,9 @@ protected void assertAfterNetworkModificationApplication() {
         assertNotNull(getNetwork().getVoltageLevel("newVoltageLevel"));
         assertNotNull(getNetwork().getLine("nl1v"));
         assertNotNull(getNetwork().getLine("nl2v"));
+        VoltageLevel newVoltageLevel = getNetwork().getVoltageLevel("newVoltageLevel");
+        assertNotNull(newVoltageLevel);
+        assertEquals("valueVoltageLevel", newVoltageLevel.getProperty("voltageLevelProp"));
     }
 
     @Override