fix bus is in node cluster (#194)

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

Author: EtienneLt

src/main/java/org/gridsuite/shortcircuit/server/service/ShortCircuitWorkerService.java

@@ -162,17 +162,12 @@ private List<Fault> getAllBusFaults(ShortCircuitRunContext context) {
 
     private List<Fault> getBusFaultFromBusId(ShortCircuitRunContext context) {
         String busId = context.getBusId();
-        if (context.getParameters().getSpecificParameters().containsKey(NODE_CLUSTER)) {
-            List<String> nodeClusters = deserializeNodeClusters(context);
-            if (!nodeClusters.isEmpty() && !nodeClusters.contains(busId)) {
-                throw new ShortCircuitException(BUS_OUT_OF_NODE_CLUSTER, "Selected bus is out of node cluster");
-            }
-        }
         Identifiable<?> identifiable = context.getNetwork().getIdentifiable(busId);
         Map<String, ShortCircuitLimits> shortCircuitLimits = new HashMap<>();
 
         if (identifiable instanceof BusbarSection busbarSection) {
             Bus bus = busbarSection.getTerminal().getBusView().getBus();
+            throwIfBusIsOutsideNodeCluster(context, bus);
             if (bus == null) {
                 throw new ShortCircuitException(BUS_OUT_OF_VOLTAGE, "Selected bus is out of voltage");
             }
@@ -185,6 +180,7 @@ private List<Fault> getBusFaultFromBusId(ShortCircuitRunContext context) {
         }
 
         if (identifiable instanceof Bus bus) {
+            throwIfBusIsOutsideNodeCluster(context, bus);
             String busIdFromBusView = bus.getVoltageLevel().getBusView().getMergedBus(busId).getId();
             IdentifiableShortCircuit<VoltageLevel> shortCircuitExtension = bus.getVoltageLevel().getBusView().getMergedBus(busId).getVoltageLevel().getExtension(IdentifiableShortCircuit.class);
             if (shortCircuitExtension != null) {
@@ -196,6 +192,15 @@ private List<Fault> getBusFaultFromBusId(ShortCircuitRunContext context) {
         throw new NoSuchElementException("No bus found for bus id " + busId);
     }
 
+    private void throwIfBusIsOutsideNodeCluster(ShortCircuitRunContext context, Bus bus) {
+        if (context.getParameters().getSpecificParameters().containsKey(NODE_CLUSTER)) {
+            List<String> nodeClusters = deserializeNodeClusters(context);
+            if (!nodeClusters.isEmpty() && !nodeClusters.contains(bus.getId())) {
+                throw new ShortCircuitException(BUS_OUT_OF_NODE_CLUSTER, "Selected bus is outside node cluster");
+            }
+        }
+    }
+
     protected String getComputationType() {
         return COMPUTATION_TYPE;
     }

src/test/java/org/gridsuite/shortcircuit/server/service/ShortCircuitWorkerServiceTest.java

@@ -187,6 +187,10 @@ void testBuseIdOutsideNodeCluster() throws Exception {
         var runContext = mock(ShortCircuitRunContext.class);
         var resultContext = new ShortCircuitResultContext(UUID.randomUUID(), runContext);
         var busId = "bus3";
+        var busbarSection = mock(BusbarSection.class);
+        var terminal = mock(Terminal.class);
+        var busView = mock(BusView.class);
+        var bus = mock(Bus.class);
 
         when(runContext.getBusId()).thenReturn(busId);
         when(runContext.getNetwork()).thenReturn(network);
@@ -195,13 +199,18 @@ void testBuseIdOutsideNodeCluster() throws Exception {
         when(runContext.getParameters())
                 .thenReturn(ShortCircuitParametersValues.builder().specificParameters(Map.of(NODE_CLUSTER, "bus1, bus2"))
                         .build());
+        doReturn(busbarSection).when(network).getIdentifiable(busId);
+        doReturn(terminal).when(busbarSection).getTerminal();
+        doReturn(busView).when(terminal).getBusView();
+        doReturn(bus).when(busView).getBus();
+        doReturn(busId).when(bus).getId();
 
         try (var shortCircuitAnalysisMockedStatic = TestUtils.injectShortCircuitAnalysisProvider(analysisProvider);
              var shortCircuitResultContextMockedStatic = mockStatic(ShortCircuitResultContext.class)) {
             shortCircuitResultContextMockedStatic.when(() -> ShortCircuitResultContext.fromMessage(message, objectMapper)).thenReturn(resultContext);
             final var run = workerService.consumeRun();
             String errorMessage = assertThrows(ComputationRunException.class, () -> run.accept(message)).getMessage();
-            assertThat(errorMessage).contains("Selected bus is out of node cluster");
+            assertThat(errorMessage).contains("Selected bus is outside node cluster");
         }
     }