fix isRetrievedBusbarSections computation (#280)

ghazwarhili · web-flow · commit 8e4170a7a2f9 · 2025-08-29T09:35:31.000+02:00
Signed-off-by: Rehili Ghazwa &lt;ghazwarhili@gmail.com&gt;
diff --git a/src/main/java/org/gridsuite/network/map/dto/mapper/VoltageLevelInfosMapper.java b/src/main/java/org/gridsuite/network/map/dto/mapper/VoltageLevelInfosMapper.java
@@ -58,7 +58,7 @@ private static VoltageLevelTopologyInfos getTopologyInfos(VoltageLevel voltageLe
             int sectionIndex = extension.getSectionIndex();
             maxBusbarIndex = Math.max(maxBusbarIndex, busbarIndex);
             maxSectionIndex = Math.max(maxSectionIndex, sectionIndex);
-            nbSectionsPerBusbar.merge(busbarIndex, sectionIndex, Math::max);
+            nbSectionsPerBusbar.merge(busbarIndex, 1, Integer::sum);
             busbarSectionInfos.add(BusBarSectionFormInfos.builder()
                     .id(bbs.getId())
                     .vertPos(sectionIndex)
@@ -73,10 +73,9 @@ private static VoltageLevelTopologyInfos getTopologyInfos(VoltageLevel voltageLe
         voltageLevelTopologyInfos.setBusbarSections(busbarSectionInfos);
         voltageLevelTopologyInfos.setBusbarSectionPositionFound(true);
 
-        int finalMaxSectionIndex = maxSectionIndex;
-        boolean isSymmetrical = nbSectionsPerBusbar.values()
-                .stream()
-                .allMatch(v -> v == finalMaxSectionIndex);
+        boolean isSymmetrical = maxBusbarIndex == 1 ||
+                nbSectionsPerBusbar.values().stream().distinct().count() == 1
+                        && nbSectionsPerBusbar.values().stream().findFirst().orElse(0).equals(maxSectionIndex);
 
         if (isSymmetrical) {
             voltageLevelTopologyInfos.setBusbarCount(maxBusbarIndex);
diff --git a/src/test/java/org/gridsuite/network/map/NetworkMapControllerTest.java b/src/test/java/org/gridsuite/network/map/NetworkMapControllerTest.java
@@ -1062,16 +1062,27 @@ void setUp() {
                 .withSectionIndex(2)
                 .add();
         vlgen5.getNodeBreakerView().newBusbarSection()
-                .setId("NGEN5_2")
-                .setName("NGEN5_2")
+                .setId("NGEN5_2_1")
+                .setName("NGEN5_2_1")
                 .setNode(1)
                 .add();
         vlgen5.getNodeBreakerView()
-                .getBusbarSection("NGEN5_2")
+                .getBusbarSection("NGEN5_2_1")
                 .newExtension(BusbarSectionPositionAdder.class)
                 .withBusbarIndex(2)
                 .withSectionIndex(1)
                 .add();
+        vlgen5.getNodeBreakerView().newBusbarSection()
+                .setId("NGEN5_2_2")
+                .setName("NGEN5_2_2")
+                .setNode(0)
+                .add();
+        vlgen5.getNodeBreakerView()
+                .getBusbarSection("NGEN5_2_2")
+                .newExtension(BusbarSectionPositionAdder.class)
+                .withBusbarIndex(2)
+                .withSectionIndex(2)
+                .add();
 
         // Create a connected shunt compensator on a NODE_BREAKER voltage level
         ShuntCompensator shunt4 = vlgen4.newShuntCompensator().setId("SHUNT_VLNB")
diff --git a/src/test/resources/all-data-in-variant.json b/src/test/resources/all-data-in-variant.json
@@ -2367,8 +2367,13 @@
       "voltageLevelId": "VLGEN5"
     },
     {
-      "id": "NGEN5_2",
-      "name": "NGEN5_2",
+      "id": "NGEN5_2_1",
+      "name": "NGEN5_2_1",
+      "voltageLevelId": "VLGEN5"
+    },
+    {
+      "id": "NGEN5_2_2",
+      "name": "NGEN5_2_2",
       "voltageLevelId": "VLGEN5"
     }
   ]
diff --git a/src/test/resources/all-data.json b/src/test/resources/all-data.json
@@ -2355,8 +2355,13 @@
       "voltageLevelId": "VLGEN5"
     },
     {
-      "id": "NGEN5_2",
-      "name": "NGEN5_2",
+      "id": "NGEN5_2_1",
+      "name": "NGEN5_2_1",
+      "voltageLevelId": "VLGEN5"
+    },
+    {
+      "id": "NGEN5_2_2",
+      "name": "NGEN5_2_2",
       "voltageLevelId": "VLGEN5"
     }
   ]
diff --git a/src/test/resources/bus-bar-section-form-data.json b/src/test/resources/bus-bar-section-form-data.json
@@ -12,9 +12,15 @@
     "horizPos": 2
   },
   {
-    "id": "NGEN5_2",
-    "name": "NGEN5_2",
+    "id": "NGEN5_2_1",
+    "name": "NGEN5_2_1",
     "vertPos": 2,
     "horizPos": 1
+  },
+  {
+    "id": "NGEN5_2_2",
+    "name": "NGEN5_2_2",
+    "vertPos": 2,
+    "horizPos": 2
   }
 ]
diff --git a/src/test/resources/bus-bar-section-list-data.json b/src/test/resources/bus-bar-section-list-data.json
@@ -8,7 +8,11 @@
     "name": "NGEN5"
   },
   {
-    "id": "NGEN5_2",
-    "name": "NGEN5_2"
+    "id": "NGEN5_2_1",
+    "name": "NGEN5_2_1"
+  },
+  {
+    "id": "NGEN5_2_2",
+    "name": "NGEN5_2_2"
   }
 ]
diff --git a/src/test/resources/bus-bar-section-operating-status-data.json b/src/test/resources/bus-bar-section-operating-status-data.json
@@ -9,7 +9,11 @@
     "operatingStatus": "FORCED_OUTAGE"
   },
     {
-    "id": "NGEN5_2",
-    "name": "NGEN5_2"
+    "id": "NGEN5_2_1",
+    "name": "NGEN5_2_1"
+  },
+  {
+    "id": "NGEN5_2_2",
+    "name": "NGEN5_2_2"
   }
 ]
diff --git a/src/test/resources/substations-form-data.json b/src/test/resources/substations-form-data.json
@@ -100,9 +100,7 @@
         "nominalV": 24.0,
         "busbarCount": 1,
         "sectionCount": 2,
-        "switchKinds": [
-          "DISCONNECTOR"
-        ],
+        "switchKinds": ["DISCONNECTOR"],
         "isRetrievedBusbarSections": true,
         "isBusbarSectionPositionFound": true,
         "busBarSectionInfos" : {
@@ -133,7 +131,7 @@
         "isBusbarSectionPositionFound": true,
         "busBarSectionInfos" : {
           "1" : [ "NGEN5"],
-          "2" : [ "NGEN5_2"]
+          "2" : [ "NGEN5_2_1", "NGEN5_2_2"]
         }
       }
     ]
diff --git a/src/test/resources/voltage-level-non-symmetrical-busbars-form-data.json b/src/test/resources/voltage-level-non-symmetrical-busbars-form-data.json
@@ -16,6 +16,6 @@
   "isBusbarSectionPositionFound": true,
   "busBarSectionInfos" : {
     "1" : [ "NGEN5"],
-    "2" : [ "NGEN5_2"]
+    "2" : [ "NGEN5_2_1","NGEN5_2_2"]
   }
 }
diff --git a/src/test/resources/voltage-levels-form-data.json b/src/test/resources/voltage-levels-form-data.json
@@ -86,7 +86,7 @@
     "isBusbarSectionPositionFound": true,
     "busBarSectionInfos" : {
       "1" : [ "NGEN5"],
-      "2" : [ "NGEN5_2"]
+      "2" : [ "NGEN5_2_1", "NGEN5_2_2" ]
     }
   },
   {

Original file line number	Diff line number	Diff line change
`@@ -2367,8 +2367,13 @@`
`2367`	`2367`	`"voltageLevelId": "VLGEN5"`
`2368`	`2368`	`},`
`2369`	`2369`	`{`
`2370`		`- "id": "NGEN5_2",`
`2371`		`- "name": "NGEN5_2",`
	`2370`	`+ "id": "NGEN5_2_1",`
	`2371`	`+ "name": "NGEN5_2_1",`
	`2372`	`+ "voltageLevelId": "VLGEN5"`
	`2373`	`+ },`
	`2374`	`+ {`
	`2375`	`+ "id": "NGEN5_2_2",`
	`2376`	`+ "name": "NGEN5_2_2",`
`2372`	`2377`	`"voltageLevelId": "VLGEN5"`
`2373`	`2378`	`}`
`2374`	`2379`	`]`
Original file line number	Diff line number	Diff line change
`@@ -2355,8 +2355,13 @@`
`2355`	`2355`	`"voltageLevelId": "VLGEN5"`
`2356`	`2356`	`},`
`2357`	`2357`	`{`
`2358`		`- "id": "NGEN5_2",`
`2359`		`- "name": "NGEN5_2",`
	`2358`	`+ "id": "NGEN5_2_1",`
	`2359`	`+ "name": "NGEN5_2_1",`
	`2360`	`+ "voltageLevelId": "VLGEN5"`
	`2361`	`+ },`
	`2362`	`+ {`
	`2363`	`+ "id": "NGEN5_2_2",`
	`2364`	`+ "name": "NGEN5_2_2",`
`2360`	`2365`	`"voltageLevelId": "VLGEN5"`
`2361`	`2366`	`}`
`2362`	`2367`	`]`
Original file line number	Diff line number	Diff line change
`@@ -12,9 +12,15 @@`
`12`	`12`	`"horizPos": 2`
`13`	`13`	`},`
`14`	`14`	`{`
`15`		`- "id": "NGEN5_2",`
`16`		`- "name": "NGEN5_2",`
	`15`	`+ "id": "NGEN5_2_1",`
	`16`	`+ "name": "NGEN5_2_1",`
`17`	`17`	`"vertPos": 2,`
`18`	`18`	`"horizPos": 1`
	`19`	`+ },`
	`20`	`+ {`
	`21`	`+ "id": "NGEN5_2_2",`
	`22`	`+ "name": "NGEN5_2_2",`
	`23`	`+ "vertPos": 2,`
	`24`	`+ "horizPos": 2`
`19`	`25`	`}`
`20`	`26`	`]`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,11 @@`
`8`	`8`	`"name": "NGEN5"`
`9`	`9`	`},`
`10`	`10`	`{`
`11`		`- "id": "NGEN5_2",`
`12`		`- "name": "NGEN5_2"`
	`11`	`+ "id": "NGEN5_2_1",`
	`12`	`+ "name": "NGEN5_2_1"`
	`13`	`+ },`
	`14`	`+ {`
	`15`	`+ "id": "NGEN5_2_2",`
	`16`	`+ "name": "NGEN5_2_2"`
`13`	`17`	`}`
`14`	`18`	`]`
Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,11 @@`
`9`	`9`	`"operatingStatus": "FORCED_OUTAGE"`
`10`	`10`	`},`
`11`	`11`	`{`
`12`		`- "id": "NGEN5_2",`
`13`		`- "name": "NGEN5_2"`
	`12`	`+ "id": "NGEN5_2_1",`
	`13`	`+ "name": "NGEN5_2_1"`
	`14`	`+ },`
	`15`	`+ {`
	`16`	`+ "id": "NGEN5_2_2",`
	`17`	`+ "name": "NGEN5_2_2"`
`14`	`18`	`}`
`15`	`19`	`]`
Original file line number	Diff line number	Diff line change
`@@ -100,9 +100,7 @@`
`100`	`100`	`"nominalV": 24.0,`
`101`	`101`	`"busbarCount": 1,`
`102`	`102`	`"sectionCount": 2,`
`103`		`- "switchKinds": [`
`104`		`- "DISCONNECTOR"`
`105`		`- ],`
	`103`	`+ "switchKinds": ["DISCONNECTOR"],`
`106`	`104`	`"isRetrievedBusbarSections": true,`
`107`	`105`	`"isBusbarSectionPositionFound": true,`
`108`	`106`	`"busBarSectionInfos" : {`
`@@ -133,7 +131,7 @@`
`133`	`131`	`"isBusbarSectionPositionFound": true,`
`134`	`132`	`"busBarSectionInfos" : {`
`135`	`133`	`"1" : [ "NGEN5"],`
`136`		`- "2" : [ "NGEN5_2"]`
	`134`	`+ "2" : [ "NGEN5_2_1", "NGEN5_2_2"]`
`137`	`135`	`}`
`138`	`136`	`}`
`139`	`137`	`]`
Original file line number	Diff line number	Diff line change
`@@ -16,6 +16,6 @@`
`16`	`16`	`"isBusbarSectionPositionFound": true,`
`17`	`17`	`"busBarSectionInfos" : {`
`18`	`18`	`"1" : [ "NGEN5"],`
`19`		`- "2" : [ "NGEN5_2"]`
	`19`	`+ "2" : [ "NGEN5_2_1","NGEN5_2_2"]`
`20`	`20`	`}`
`21`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -86,7 +86,7 @@`
`86`	`86`	`"isBusbarSectionPositionFound": true,`
`87`	`87`	`"busBarSectionInfos" : {`
`88`	`88`	`"1" : [ "NGEN5"],`
`89`		`- "2" : [ "NGEN5_2"]`
	`89`	`+ "2" : [ "NGEN5_2_1", "NGEN5_2_2" ]`
`90`	`90`	`}`
`91`	`91`	`},`
`92`	`92`	`{`