add isBusbarSectionPositionFound (#279)

Signed-off-by: Rehili Ghazwa <[email protected]>

Author: ghazwarhili

src/main/java/org/gridsuite/network/map/dto/definition/voltagelevel/VoltageLevelFormInfos.java

@@ -54,6 +54,9 @@ public class VoltageLevelFormInfos extends ElementInfosWithProperties {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean isRetrievedBusbarSections;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    private Boolean isBusbarSectionPositionFound;
+
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Map<String, List<String>> busBarSectionInfos;
 }

src/main/java/org/gridsuite/network/map/dto/mapper/VoltageLevelInfosMapper.java

@@ -8,6 +8,7 @@
 
 import com.powsybl.iidm.network.*;
 import com.powsybl.iidm.network.extensions.BusbarSectionPosition;
+import lombok.Builder;
 import lombok.Getter;
 import lombok.Setter;
 import org.gridsuite.network.map.dto.ElementInfos;
@@ -42,41 +43,48 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
     }
 
     private static VoltageLevelTopologyInfos getTopologyInfos(VoltageLevel voltageLevel) {
-        VoltageLevelTopologyInfos topologyInfos = new VoltageLevelTopologyInfos();
         Map<Integer, Integer> nbSectionsPerBusbar = new HashMap<>();
         List<BusBarSectionFormInfos> busbarSectionInfos = new ArrayList<>();
+        int maxBusbarIndex = 1;
+        int maxSectionIndex = 1;
+        boolean busbarSectionPositionFound = true;
         for (BusbarSection bbs : voltageLevel.getNodeBreakerView().getBusbarSections()) {
             var extension = bbs.getExtension(BusbarSectionPosition.class);
-            if (extension != null) {
-                if (extension.getBusbarIndex() > topologyInfos.getBusbarCount()) {
-                    topologyInfos.setBusbarCount(extension.getBusbarIndex());
-                }
-                if (extension.getSectionIndex() > topologyInfos.getSectionCount()) {
-                    topologyInfos.setSectionCount(extension.getSectionIndex());
-                }
-                nbSectionsPerBusbar.putIfAbsent(extension.getBusbarIndex(), 1);
-                if (extension.getSectionIndex() > nbSectionsPerBusbar.get(extension.getBusbarIndex())) {
-                    nbSectionsPerBusbar.put(extension.getBusbarIndex(), extension.getSectionIndex());
-                }
-                BusBarSectionFormInfos busbarSectionInfo = BusBarSectionFormInfos.builder()
-                        .id(bbs.getId())
-                        .vertPos(extension.getSectionIndex())
-                        .horizPos(extension.getBusbarIndex())
-                        .build();
-                busbarSectionInfos.add(busbarSectionInfo);
-            } else {
-                return new VoltageLevelTopologyInfos();
+            if (extension == null) {
+                busbarSectionPositionFound = false;
+                break;
             }
+            int busbarIndex = extension.getBusbarIndex();
+            int sectionIndex = extension.getSectionIndex();
+            maxBusbarIndex = Math.max(maxBusbarIndex, busbarIndex);
+            maxSectionIndex = Math.max(maxSectionIndex, sectionIndex);
+            nbSectionsPerBusbar.merge(busbarIndex, sectionIndex, Math::max);
+            busbarSectionInfos.add(BusBarSectionFormInfos.builder()
+                    .id(bbs.getId())
+                    .vertPos(sectionIndex)
+                    .horizPos(busbarIndex)
+                    .build());
         }
-        if (nbSectionsPerBusbar.values().stream().anyMatch(v -> v != topologyInfos.getSectionCount())) { // Non-symmetrical busbars (nb sections)
-            return new VoltageLevelTopologyInfos();
+        VoltageLevelTopologyInfos voltageLevelTopologyInfos = createDefaultTopologyInfosBuilder().build();
+        if (!busbarSectionPositionFound) {
+            return voltageLevelTopologyInfos;
         }
 
-        topologyInfos.setRetrievedBusbarSections(true);
-        topologyInfos.setSwitchKinds(Collections.nCopies(topologyInfos.getSectionCount() - 1, SwitchKind.DISCONNECTOR));
-        topologyInfos.setBusbarSections(busbarSectionInfos);
+        voltageLevelTopologyInfos.setBusbarSections(busbarSectionInfos);
+        voltageLevelTopologyInfos.setBusbarSectionPositionFound(true);
 
-        return topologyInfos;
+        int finalMaxSectionIndex = maxSectionIndex;
+        boolean isSymmetrical = nbSectionsPerBusbar.values()
+                .stream()
+                .allMatch(v -> v == finalMaxSectionIndex);
+
+        if (isSymmetrical) {
+            voltageLevelTopologyInfos.setBusbarCount(maxBusbarIndex);
+            voltageLevelTopologyInfos.setSectionCount(maxSectionIndex);
+            voltageLevelTopologyInfos.setRetrievedBusbarSections(true);
+            voltageLevelTopologyInfos.setSwitchKinds(Collections.nCopies(maxSectionIndex - 1, SwitchKind.DISCONNECTOR));
+        }
+        return voltageLevelTopologyInfos;
     }
 
     static VoltageLevelFormInfos toFormInfos(Identifiable<?> identifiable) {
@@ -97,6 +105,7 @@ static VoltageLevelFormInfos toFormInfos(Identifiable<?> identifiable) {
             builder.sectionCount(vlTopologyInfos.getSectionCount());
             builder.switchKinds(vlTopologyInfos.getSwitchKinds());
             builder.isRetrievedBusbarSections(vlTopologyInfos.isRetrievedBusbarSections());
+            builder.isBusbarSectionPositionFound(vlTopologyInfos.isBusbarSectionPositionFound());
             builder.busBarSectionInfos(vlTopologyInfos.getBusBarSectionInfosGrouped());
         }
 
@@ -133,14 +142,22 @@ static VoltageLevelTabInfos toTabInfos(Identifiable<?> identifiable) {
         return builder.build();
     }
 
+    private static VoltageLevelTopologyInfos.VoltageLevelTopologyInfosBuilder createDefaultTopologyInfosBuilder() {
+        return VoltageLevelTopologyInfos.builder()
+                .busbarCount(1).sectionCount(1).isRetrievedBusbarSections(false)
+                .switchKinds(List.of()).busbarSections(List.of()).isBusbarSectionPositionFound(false);
+    }
+
+    @Builder
     @Getter
     @Setter
     public static class VoltageLevelTopologyInfos {
-        private List<BusBarSectionFormInfos> busbarSections = List.of();
-        private boolean isRetrievedBusbarSections = false;
-        private int busbarCount = 1;
-        private int sectionCount = 1;
-        private List<SwitchKind> switchKinds = List.of();
+        private List<BusBarSectionFormInfos> busbarSections;
+        private boolean isRetrievedBusbarSections;   // true if busbar sections are symmetrical
+        private boolean isBusbarSectionPositionFound;
+        private int busbarCount;
+        private int sectionCount;
+        private List<SwitchKind> switchKinds;
 
         public Map<String, List<String>> getBusBarSectionInfosGrouped() {
             return busbarSections.stream()

src/test/java/org/gridsuite/network/map/NetworkMapControllerTest.java

@@ -1055,6 +1055,23 @@ void setUp() {
                 .add();
         bbs1.newExtension(OperatingStatusAdder.class).withStatus(OperatingStatus.Status.FORCED_OUTAGE).add();
         vlgen5.newExtension(IdentifiableShortCircuitAdder.class).withIpMin(0.0).withIpMax(100.0).add();
+        vlgen5.getNodeBreakerView()
+                .getBusbarSection("NGEN5")
+                .newExtension(BusbarSectionPositionAdder.class)
+                .withBusbarIndex(1)
+                .withSectionIndex(2)
+                .add();
+        vlgen5.getNodeBreakerView().newBusbarSection()
+                .setId("NGEN5_2")
+                .setName("NGEN5_2")
+                .setNode(1)
+                .add();
+        vlgen5.getNodeBreakerView()
+                .getBusbarSection("NGEN5_2")
+                .newExtension(BusbarSectionPositionAdder.class)
+                .withBusbarIndex(2)
+                .withSectionIndex(1)
+                .add();
 
         // Create a connected shunt compensator on a NODE_BREAKER voltage level
         ShuntCompensator shunt4 = vlgen4.newShuntCompensator().setId("SHUNT_VLNB")
@@ -2198,6 +2215,12 @@ void shouldReturnVotlageLevelFormData() throws Exception {
         succeedingTestForElementInfosWithElementId(NETWORK_UUID, VARIANT_ID, ElementType.VOLTAGE_LEVEL, InfoType.FORM, "VLGEN4", resourceToString("/voltage-level-form-data.json"));
     }
 
+    @Test
+    void shouldReturnVotlageLevelNonSymmetricalBusbarsFormData() throws Exception {
+        succeedingTestForElementInfosWithElementId(NETWORK_UUID, null, ElementType.VOLTAGE_LEVEL, InfoType.FORM, "VLGEN5", resourceToString("/voltage-level-non-symmetrical-busbars-form-data.json"));
+        succeedingTestForElementInfosWithElementId(NETWORK_UUID, VARIANT_ID, ElementType.VOLTAGE_LEVEL, InfoType.FORM, "VLGEN5", resourceToString("/voltage-level-non-symmetrical-busbars-form-data.json"));
+    }
+
     @Test
     void shouldReturnVotlageLevelTabData() throws Exception {
         succeedingTestForElementInfosWithElementId(NETWORK_UUID, null, ElementType.VOLTAGE_LEVEL, InfoType.TAB, "VLGEN4", resourceToString("/voltage-level-tab-data.json"));

src/test/resources/all-data-in-variant.json

@@ -2327,6 +2327,11 @@
       "id": "NGEN5",
       "name": "NGEN5",
       "voltageLevelId": "VLGEN5"
+    },
+    {
+      "id": "NGEN5_2",
+      "name": "NGEN5_2",
+      "voltageLevelId": "VLGEN5"
     }
   ]
 }

src/test/resources/all-data.json

@@ -2309,6 +2309,11 @@
       "id": "NGEN5",
       "name": "NGEN5",
       "voltageLevelId": "VLGEN5"
+    },
+    {
+      "id": "NGEN5_2",
+      "name": "NGEN5_2",
+      "voltageLevelId": "VLGEN5"
     }
   ]
 }

src/test/resources/bus-bar-section-form-data.json

@@ -7,6 +7,14 @@
   },
   {
     "id": "NGEN5",
-    "name": "NGEN5"
+    "name": "NGEN5",
+    "vertPos": 1,
+    "horizPos": 2
+  },
+  {
+    "id": "NGEN5_2",
+    "name": "NGEN5_2",
+    "vertPos": 2,
+    "horizPos": 1
   }
 ]

src/test/resources/bus-bar-section-list-data.json

@@ -6,5 +6,9 @@
   {
     "id": "NGEN5",
     "name": "NGEN5"
+  },
+  {
+    "id": "NGEN5_2",
+    "name": "NGEN5_2"
   }
 ]

src/test/resources/bus-bar-section-operating-status-data.json

@@ -7,5 +7,9 @@
     "id": "NGEN5",
     "name": "NGEN5",
     "operatingStatus": "FORCED_OUTAGE"
+  },
+    {
+    "id": "NGEN5_2",
+    "name": "NGEN5_2"
   }
 ]

src/test/resources/substations-form-data.json

@@ -104,6 +104,7 @@
           "DISCONNECTOR"
         ],
         "isRetrievedBusbarSections": true,
+        "isBusbarSectionPositionFound": true,
         "busBarSectionInfos" : {
           "1" : ["NGEN4"]
         }
@@ -129,7 +130,11 @@
         "sectionCount": 1,
         "switchKinds": [],
         "isRetrievedBusbarSections": false,
-        "busBarSectionInfos" : { }
+        "isBusbarSectionPositionFound": true,
+        "busBarSectionInfos" : {
+          "1" : [ "NGEN5"],
+          "2" : [ "NGEN5_2"]
+        }
       }
     ]
   }

src/test/resources/voltage-level-form-data.json

@@ -7,6 +7,7 @@
   "sectionCount": 2,
   "switchKinds": ["DISCONNECTOR"],
   "isRetrievedBusbarSections": true,
+  "isBusbarSectionPositionFound": true,
   "busBarSectionInfos" : {
     "1" : [ "NGEN4"]
   }