add topologyKind to distinct buses from TopologyKind.NODE_BREAKER and…

… TopologyKind.BUS_BREAKER

src/main/java/org/gridsuite/filter/server/FilterService.java

@@ -40,6 +40,7 @@
 import org.springframework.web.server.ResponseStatusException;
 
 import java.util.*;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -593,11 +594,17 @@ private List<Identifiable<?>> getVscConverterStationList(Network network, Abstra
 
     private List<Identifiable<?>> getBusList(Network network, AbstractFilter filter) {
         if (filter instanceof ExpertFilter expertFilter) {
-            var rule = expertFilter.getRules();
+            // topologyKind is an optional info attached into expert filter when filtering bus for optimizing the perf
+            // note that with voltage levels of kind TopologyKind.NODE_BREAKER, buses are computed on-the-fly => expensive
+            var topologyKind = expertFilter.getTopologyKind();
+            Predicate<VoltageLevel> voltageLevelFilter = (vl -> topologyKind == null || vl.getTopologyKind() == topologyKind);
+
             Stream<Identifiable<?>> stream = network.getVoltageLevelStream()
-                    .filter(elem -> elem.getTopologyKind() == TopologyKind.BUS_BREAKER) // get only bus for BUS_BREAKER voltage level
+                    .filter(voltageLevelFilter)
                     .map(VoltageLevel::getBusBreakerView)
                     .flatMap(VoltageLevel.BusBreakerView::getBusStream).map(bus -> bus);
+
+            var rule = expertFilter.getRules();
             return stream.filter(rule::evaluateRule).toList();
         } else {
             return Collections.emptyList();

src/main/java/org/gridsuite/filter/server/dto/expertfilter/ExpertFilter.java

@@ -7,6 +7,7 @@
 package org.gridsuite.filter.server.dto.expertfilter;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import com.powsybl.iidm.network.TopologyKind;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -31,6 +32,9 @@ public class ExpertFilter extends AbstractFilter {
     @Schema(description = "Rules")
     private AbstractExpertRule rules;
 
+    @Schema(description = "TopologyKind is an optional information used when filtering bus")
+    private TopologyKind topologyKind;
+
     public ExpertFilter(UUID id, Date modificationDate, EquipmentType equipmentType, AbstractExpertRule rules) {
         super(id, modificationDate, equipmentType);
         this.rules = rules;