retreive busBarSectionId and VoltageId not set in modification connec…

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

@@ -0,0 +1,48 @@
+/**
+ * Copyright (c) 2024, 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.IdentifiableType;
+import com.powsybl.iidm.network.Switch;
+import com.powsybl.iidm.network.Terminal;
+import com.powsybl.math.graph.TraverseResult;
+
+/**
+ * @author Slimane Amar <slimane.amar at rte-france.com>
+ */
+public class BusbarSectionFinderTraverser implements Terminal.TopologyTraverser {
+
+    private final boolean onlyConnectedBbs;
+
+    private String firstTraversedBbsId;
+
+    public BusbarSectionFinderTraverser(boolean onlyConnectedBbs) {
+        this.onlyConnectedBbs = onlyConnectedBbs;
+    }
+
+    @Override
+    public TraverseResult traverse(Terminal terminal, boolean connected) {
+        if (terminal.getConnectable().getType() == IdentifiableType.BUSBAR_SECTION) {
+            firstTraversedBbsId = terminal.getConnectable().getId();
+            return TraverseResult.TERMINATE_TRAVERSER;
+        }
+        return TraverseResult.CONTINUE;
+    }
+
+    @Override
+    public TraverseResult traverse(Switch aSwitch) {
+        if (onlyConnectedBbs && aSwitch.isOpen()) {
+            return TraverseResult.TERMINATE_PATH;
+        }
+        return TraverseResult.CONTINUE;
+    }
+
+    public String getFirstTraversedBbsId() {
+        return firstTraversedBbsId;
+    }
+}
+

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

@@ -13,6 +13,7 @@
 import com.powsybl.iidm.modification.topology.*;
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.*;
+import com.powsybl.math.graph.TraversalType;
 import com.powsybl.network.store.iidm.impl.MinMaxReactiveLimitsImpl;
 import org.gridsuite.modification.server.NetworkModificationException;
 import org.gridsuite.modification.server.dto.*;
@@ -615,9 +616,6 @@ public ReportNode modifyInjectionConnectivityAttributes(ConnectablePosition<?> c
                                                             InjectionModificationInfos modificationInfos,
                                                             ReportNode connectivityReports) {
         List<ReportNode> reports = new ArrayList<>();
-        if (isVoltageOrBusbarIdMissing(modificationInfos.getVoltageLevelId(), modificationInfos.getBusOrBusbarSectionId(), modificationInfos.getEquipmentId(), reports)) {
-            return reports.get(0);
-        }
         processConnectivityPosition(connectablePosition, connectablePositionAdder, modificationInfos, injection.getNetwork(), reports, false);
         modifyConnection(modificationInfos.getTerminalConnected(), injection, injection.getTerminal(), reports);
 
@@ -630,31 +628,13 @@ public ReportNode modifyBranchConnectivityAttributes(ConnectablePosition<?> conn
                                                          BranchModificationInfos modificationInfos,
                                                          ReportNode connectivityReports) {
         List<ReportNode> reports = new ArrayList<>();
-        if (isVoltageOrBusbarIdMissing(modificationInfos.getVoltageLevelId1(), modificationInfos.getBusOrBusbarSectionId1(), modificationInfos.getEquipmentId(), reports) ||
-            isVoltageOrBusbarIdMissing(modificationInfos.getVoltageLevelId2(), modificationInfos.getBusOrBusbarSectionId2(), modificationInfos.getEquipmentId(), reports)) {
-            return reports.get(0);
-        }
-
         processConnectivityPosition(connectablePosition, connectablePositionAdder, modificationInfos, branch.getNetwork(), reports, true);
         modifyConnection(modificationInfos.getTerminal1Connected(), branch, branch.getTerminal1(), reports);
         modifyConnection(modificationInfos.getTerminal2Connected(), branch, branch.getTerminal2(), reports);
 
         return reportModifications(connectivityReports, reports, "ConnectivityModified", CONNECTIVITY);
     }
 
-    private boolean isVoltageOrBusbarIdMissing(AttributeModification<String> voltageLevelId, AttributeModification<String> busbarSectionId, String equipmentId, List<ReportNode> reports) {
-        if (voltageLevelId == null || busbarSectionId == null) {
-            reports.add(ReportNode.newRootReportNode()
-                    .withMessageTemplate("VoltageLevelOrBusbarSectionNotFound",
-                            "Voltage level id or Bus bar section id of equipment id=${id} not found")
-                    .withUntypedValue("id", equipmentId)
-                    .withSeverity(TypedValue.WARN_SEVERITY)
-                    .build());
-            return true;
-        }
-        return false;
-    }
-
     private void processConnectivityPosition(ConnectablePosition<?> connectablePosition,
                                              ConnectablePositionAdder<?> connectablePositionAdder,
                                              BasicEquipmentModificationInfos modificationInfos,
@@ -739,10 +719,13 @@ private void addConnectablePosition(ConnectablePositionAdder<?> adder,
         AttributeModification<String> connectionName = getConnectionName(modificationInfos, feederNumber);
         AttributeModification<ConnectablePosition.Direction> connectionDirection = getConnectionDirection(modificationInfos, feederNumber);
         AttributeModification<Integer> connectionPosition = getConnectionPosition(modificationInfos, feederNumber);
+        if (Objects.isNull(connectionName) && Objects.isNull(connectionDirection) && Objects.isNull(connectionPosition)) {
+            return;
+        }
         AttributeModification<String> equipmentId = getEquipmentId(modificationInfos);
         AttributeModification<String> voltageLevelId = getVoltageLevelId(modificationInfos, feederNumber);
         AttributeModification<String> busOrBusbarSectionId = getBusOrBusbarSectionId(modificationInfos, feederNumber);
-        int position = getPosition(connectionPosition, busOrBusbarSectionId, network, voltageLevelId);
+        int position = getPosition(connectionPosition, busOrBusbarSectionId, voltageLevelId, equipmentId, feederNumber, network);
 
         ReportNode connectionNameReport = applyConnectablePositionAttribute(
                 feeder::withName, connectionName, equipmentId, reports,
@@ -858,16 +841,43 @@ private AttributeModification<Integer> getConnectionPosition(BasicEquipmentModif
                 InjectionModificationInfos::getConnectionPosition);
     }
 
+    private String getBusOrBusbarSection(Terminal terminal) {
+        String busOrBusbarSectionId;
+        if (terminal.getVoltageLevel().getTopologyKind().equals(TopologyKind.BUS_BREAKER)) {
+            if (terminal.isConnected()) {
+                busOrBusbarSectionId = terminal.getBusBreakerView().getBus().getId();
+            } else {
+                busOrBusbarSectionId = terminal.getBusBreakerView().getConnectableBus().getId();
+            }
+        } else {
+            busOrBusbarSectionId = getBusbarSectionId(terminal);
+        }
+        return busOrBusbarSectionId;
+    }
+
+    private String getBusbarSectionId(Terminal terminal) {
+        BusbarSectionFinderTraverser connectedBusbarSectionFinder = new BusbarSectionFinderTraverser(terminal.isConnected());
+        terminal.traverse(connectedBusbarSectionFinder, TraversalType.BREADTH_FIRST);
+        return connectedBusbarSectionFinder.getFirstTraversedBbsId();
+    }
+
     private int getPosition(AttributeModification<Integer> connectionPosition,
                             AttributeModification<String> busOrBusbarSectionId,
-                            Network network,
-                            AttributeModification<String> voltageLevelId) {
-        return getPosition(
-                connectionPosition == null ? null : connectionPosition.getValue(),
-                busOrBusbarSectionId == null ? null : busOrBusbarSectionId.getValue(),
-                network,
-                getVoltageLevel(network, voltageLevelId == null ? null : voltageLevelId.getValue())
-        );
+                            AttributeModification<String> voltageLevelId,
+                            AttributeModification<String> equipmentId,
+                            int feederNumber,
+                            Network network) {
+        String equipmentValue = equipmentId.getValue();
+        Terminal selectedTerminal = network.getIdentifiable(equipmentValue) instanceof Injection<?> injection ? injection.getTerminal() :
+                getTerminalsFromIdentifiable(network.getIdentifiable(equipmentValue)).get(feederNumber - 1);
+        String voltageLevel = (voltageLevelId != null && voltageLevelId.getValue() != null)
+                ? voltageLevelId.getValue()
+                : Optional.ofNullable(selectedTerminal).map(terminal -> terminal.getVoltageLevel().getId()).orElse(null);
+        String busOrBusbarSection = (busOrBusbarSectionId != null && busOrBusbarSectionId.getValue() != null)
+                ? busOrBusbarSectionId.getValue()
+                : Optional.ofNullable(selectedTerminal).map(this::getBusOrBusbarSection).orElse(null);
+        Integer connectionPositionValue = (connectionPosition != null) ? connectionPosition.getValue() : null;
+        return getPosition(connectionPositionValue, busOrBusbarSection, network, getVoltageLevel(network, voltageLevel));
     }
 
     private void modifyConnection(AttributeModification<Boolean> terminalConnected, Identifiable<?> equipment, Terminal terminal, List<ReportNode> reports) {

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

@@ -24,6 +24,8 @@
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.IntStream;
 
+import static org.gridsuite.modification.server.utils.NetworkUtil.*;
+import static org.gridsuite.modification.server.utils.NetworkUtil.createGeneratorOnBus;
 import static org.gridsuite.modification.server.utils.TestUtils.assertLogMessage;
 import static org.gridsuite.modification.server.utils.assertions.Assertions.assertThat;
 import static org.junit.Assert.assertNull;
@@ -445,6 +447,24 @@ public void testUnsetAttributes() throws Exception {
 
     }
 
+    @Test
+    public void changeGeneratorOnBusBreakerWithoutBusBarSection() throws Exception {
+        VoltageLevel v1 = createVoltageLevel(getNetwork().getSubstation("s1"), "v11", "v32", TopologyKind.BUS_BREAKER, 380.0);
+        createBusBarSection(getNetwork().getVoltageLevel("v1"), "1.7", "1.7", 0);
+        createBus(v1, "bus111", "bus111");
+        createGeneratorOnBus(v1, "idGenerator1", "bus111", 42.1, 1.0);
+        GeneratorModificationInfos generatorModificationInfos = GeneratorModificationInfos.builder()
+                .stashed(false)
+                .equipmentId("idGenerator1")
+                .connectionPosition(new AttributeModification<>(1, OperationType.SET))
+                .build();
+        String generatorModificationInfosJson = mapper.writeValueAsString(generatorModificationInfos);
+        mockMvc.perform(post(getNetworkModificationUri()).content(generatorModificationInfosJson).contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk());
+        generatorModificationInfos = (GeneratorModificationInfos) modificationRepository.getModifications(getGroupId(), false, true).get(0);
+        assertEquals(1, generatorModificationInfos.getConnectionPosition().getValue());
+    }
+
     @Override
     @SneakyThrows
     protected void testCreationModificationMessage(ModificationInfos modificationInfos) {

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

@@ -445,4 +445,22 @@ public void changeLineConnectablePosition() throws Exception {
         assertEquals(1, createdModification.getConnectionPosition2().getValue());
 
     }
+
+    @Test
+    public void changeLineConnectablePositionWithoutBusBarSection() throws Exception {
+        LineModificationInfos lineModificationInfos = LineModificationInfos.builder()
+                .stashed(false)
+                .equipmentId("line3")
+                .equipmentName(new AttributeModification<>("LineModified", OperationType.SET))
+                .connectionName1(new AttributeModification<>("line3", OperationType.SET))
+                .connectionName2(new AttributeModification<>("line3", OperationType.SET))
+                .build();
+        String modificationInfosJson = mapper.writeValueAsString(lineModificationInfos);
+        mockMvc.perform(post(getNetworkModificationUri()).content(modificationInfosJson).contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk());
+        LineModificationInfos createdModification = (LineModificationInfos) modificationRepository.getModifications(getGroupId(), false, true).get(0);
+        assertEquals("line3", createdModification.getConnectionName1().getValue());
+        assertEquals("line3", createdModification.getConnectionName2().getValue());
+
+    }
 }

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

@@ -602,7 +602,7 @@ public void testChangeConnectionStatus() {
         changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.ONE, true, true, null);
         changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.ONE, true, false, null);
         changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, true, null);
-        changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, false, "Could not disconnect equipment 'trf2' on side TWO");
+        changeConnectionState(getNetwork().getTwoWindingsTransformer("trf2"), TwoSides.TWO, true, false, "Could not disconnect equipment 'trf2'");
     }
 
     @SneakyThrows