Merge branch 'main' into send-all-limit-sets-to-branch-forms

Author: Mathieu-Deharbe

pom.xml

@@ -19,7 +19,7 @@
 
     <groupId>org.gridsuite</groupId>
     <artifactId>gridsuite-network-map-server</artifactId>
-    <version>2.22.0-SNAPSHOT</version>
+    <version>2.23.0-SNAPSHOT</version>
 
     <packaging>jar</packaging>
     <name>Network map server</name>

src/main/java/org/gridsuite/network/map/dto/common/CurrentLimitsData.java

@@ -10,7 +10,7 @@
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
-import org.springframework.util.CollectionUtils;
+import lombok.ToString;
 
 import java.util.List;
 import java.util.Objects;
@@ -22,6 +22,7 @@
 @Builder
 @Getter
 @EqualsAndHashCode
+@ToString
 public class CurrentLimitsData {
     // may be null in case we just need the selected limit set and don't really need its name/id
     @JsonInclude(JsonInclude.Include.NON_NULL)
@@ -42,10 +43,6 @@ public enum Applicability {
         SIDE2,
     }
 
-    public boolean hasLimits() {
-        return permanentLimit != null && !Double.isNaN(permanentLimit) || !CollectionUtils.isEmpty(temporaryLimits);
-    }
-
     public boolean limitsEquals(CurrentLimitsData other) {
         return Objects.equals(permanentLimit, other.permanentLimit)
             && Objects.equals(temporaryLimits, other.temporaryLimits);

src/main/java/org/gridsuite/network/map/dto/common/TemporaryLimitData.java

@@ -10,13 +10,15 @@
 import lombok.Builder;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
+import lombok.ToString;
 
 /**
  * @author David Braquart <david.braquart at rte-france.com>
  */
 @Builder
 @Getter
 @EqualsAndHashCode
+@ToString
 public class TemporaryLimitData {
     private String name;
 

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

@@ -15,6 +15,7 @@
 import org.gridsuite.network.map.dto.definition.extension.IdentifiableShortCircuitInfos;
 
 import java.util.List;
+import java.util.Map;
 import java.util.Optional;
 
 /**
@@ -53,4 +54,7 @@ public class VoltageLevelFormInfos extends ElementInfosWithProperties {
     @JsonInclude(JsonInclude.Include.NON_NULL)
     private Boolean isRetrievedBusbarSections;
 
+    @JsonInclude(JsonInclude.Include.NON_NULL)
+    Map<String, List<String>> busBarSectionInfos;
+
 }

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

@@ -12,15 +12,14 @@
 import lombok.Setter;
 import org.gridsuite.network.map.dto.ElementInfos;
 import org.gridsuite.network.map.dto.InfoTypeParameters;
+import org.gridsuite.network.map.dto.definition.busbarsection.BusBarSectionFormInfos;
 import org.gridsuite.network.map.dto.definition.voltagelevel.VoltageLevelFormInfos;
 import org.gridsuite.network.map.dto.definition.voltagelevel.VoltageLevelMapInfos;
 import org.gridsuite.network.map.dto.definition.voltagelevel.VoltageLevelTabInfos;
 import org.gridsuite.network.map.dto.utils.ElementUtils;
 
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
+import java.util.stream.Collectors;
 
 import static org.gridsuite.network.map.dto.utils.ElementUtils.*;
 
@@ -49,6 +48,7 @@ public static ElementInfos toData(Identifiable<?> identifiable, InfoTypeParamete
     public static VoltageLevelTopologyInfos getTopologyInfos(VoltageLevel voltageLevel) {
         VoltageLevelTopologyInfos topologyInfos = new VoltageLevelTopologyInfos();
         Map<Integer, Integer> nbSectionsPerBusbar = new HashMap<>();
+        List<BusBarSectionFormInfos> busbarSectionInfos = new ArrayList<>();
         for (BusbarSection bbs : voltageLevel.getNodeBreakerView().getBusbarSections()) {
             var extension = bbs.getExtension(BusbarSectionPosition.class);
             if (extension != null) {
@@ -62,6 +62,12 @@ public static VoltageLevelTopologyInfos getTopologyInfos(VoltageLevel voltageLev
                 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();
             }
@@ -72,6 +78,7 @@ public static VoltageLevelTopologyInfos getTopologyInfos(VoltageLevel voltageLev
 
         topologyInfos.setRetrievedBusbarSections(true);
         topologyInfos.setSwitchKinds(Collections.nCopies(topologyInfos.getSectionCount() - 1, SwitchKind.DISCONNECTOR));
+        topologyInfos.setBusbarSections(busbarSectionInfos);
 
         return topologyInfos;
     }
@@ -94,6 +101,7 @@ protected static VoltageLevelFormInfos toFormInfos(Identifiable<?> identifiable)
             builder.sectionCount(vlTopologyInfos.getSectionCount());
             builder.switchKinds(vlTopologyInfos.getSwitchKinds());
             builder.isRetrievedBusbarSections(vlTopologyInfos.isRetrievedBusbarSections());
+            builder.busBarSectionInfos(vlTopologyInfos.getBusBarSectionInfosGrouped());
         }
 
         builder.identifiableShortCircuit(toIdentifiableShortCircuit(voltageLevel));
@@ -132,9 +140,24 @@ protected static VoltageLevelTabInfos toTabInfos(Identifiable<?> identifiable) {
     @Getter
     @Setter
     public static class VoltageLevelTopologyInfos {
+        List<BusBarSectionFormInfos> busbarSections = List.of();
         boolean isRetrievedBusbarSections = false;
         int busbarCount = 1;
         int sectionCount = 1;
         List<SwitchKind> switchKinds = List.of();
+
+        public Map<String, List<String>> getBusBarSectionInfosGrouped() {
+            return busbarSections.stream()
+                    .collect(Collectors.groupingBy(
+                            section -> String.valueOf(section.getHorizPos()),
+                            Collectors.collectingAndThen(
+                                    Collectors.toList(),
+                                    list -> list.stream()
+                                            .sorted(Comparator.comparing(BusBarSectionFormInfos::getVertPos))
+                                            .map(BusBarSectionFormInfos::getId)
+                                            .toList()
+                            )
+                    ));
+        }
     }
 }

src/main/java/org/gridsuite/network/map/dto/utils/ElementUtils.java

@@ -11,16 +11,13 @@
 import com.powsybl.iidm.network.extensions.*;
 import com.powsybl.math.graph.TraversalType;
 import org.gridsuite.network.map.dto.common.*;
+import org.gridsuite.network.map.dto.common.CurrentLimitsData.Applicability;
 import org.gridsuite.network.map.dto.definition.extension.*;
 import org.gridsuite.network.map.dto.definition.threewindingstransformer.ThreeWindingsTransformerTabInfos;
+import org.springframework.lang.Nullable;
 import org.springframework.util.CollectionUtils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Optional;
+import java.util.*;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.stream.Collectors;
@@ -93,7 +90,7 @@ public static void buildCurrentLimits(Collection<OperationalLimitsGroup> current
         }
     }
 
-    private static CurrentLimitsData copyCurrentLimitsData(CurrentLimitsData currentLimitsData, CurrentLimitsData.Applicability applicability) {
+    private static CurrentLimitsData copyCurrentLimitsData(CurrentLimitsData currentLimitsData, Applicability applicability) {
         return CurrentLimitsData.builder()
             .id(currentLimitsData.getId())
             .applicability(applicability)
@@ -111,15 +108,17 @@ public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operati
 
         // Build temporary limit from side 1 and 2
         List<CurrentLimitsData> currentLimitsData1 = operationalLimitsGroups1.stream()
-            .map(currentLimitsData ->
-                ElementUtils.operationalLimitsGroupToMapDataCurrentLimits(currentLimitsData, SIDE1)).toList();
+            .map(currentLimitsData -> ElementUtils.operationalLimitsGroupToMapDataCurrentLimits(currentLimitsData, SIDE1))
+            .filter(Objects::nonNull)
+            .toList();
         ArrayList<CurrentLimitsData> currentLimitsData2 = new ArrayList<>(operationalLimitsGroups2.stream()
-            .map(currentLimitsData ->
-                ElementUtils.operationalLimitsGroupToMapDataCurrentLimits(currentLimitsData, SIDE2)).toList());
+            .map(currentLimitsData -> ElementUtils.operationalLimitsGroupToMapDataCurrentLimits(currentLimitsData, SIDE2))
+            .filter(Objects::nonNull)
+            .toList());
 
         // combine 2 sides in one list
 
-        // simple case : one of the arrays are empty
+        // simple case: one of the arrays are empty
         if (currentLimitsData2.isEmpty() && !currentLimitsData1.isEmpty()) {
             mergedLimitsData.addAll(currentLimitsData1);
             build.accept(mergedLimitsData);
@@ -134,30 +133,22 @@ public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operati
         // more complex case
         for (CurrentLimitsData limitsData : currentLimitsData1) {
             Optional<CurrentLimitsData> l2 = currentLimitsData2.stream().filter(l -> l.getId().equals(limitsData.getId())).findFirst();
-
             if (l2.isPresent()) {
                 CurrentLimitsData limitsData2 = l2.get();
-                // Only side one has limits
-                if (limitsData.hasLimits() && !limitsData2.hasLimits()) {
+                // both sides have limits and limits are equals
+                if (limitsData.limitsEquals(limitsData2)) {
+                    mergedLimitsData.add(copyCurrentLimitsData(limitsData, EQUIPMENT));
+                    // both sides have limits and are different: create 2 different limit sets
+                } else {
+                    // Side 1
                     mergedLimitsData.add(limitsData);
-                    // only side two has limits
-                } else if (limitsData2.hasLimits() && !limitsData.hasLimits()) {
+                    // Side 2
                     mergedLimitsData.add(limitsData2);
-                } else {
-                    // both sides have limits and limits are equals
-                    if (limitsData.limitsEquals(limitsData2)) {
-                        mergedLimitsData.add(copyCurrentLimitsData(limitsData, EQUIPMENT));
-                        // both side have limits and they are different : create 2 different limit sets
-                    } else {
-                        // Side 1
-                        mergedLimitsData.add(limitsData);
-                        // Side 2
-                        mergedLimitsData.add(limitsData2);
-                    }
                 }
                 // remove processed limits from side 2
                 currentLimitsData2.remove(l2.get());
             } else {
+                // only one side has limits
                 mergedLimitsData.add(limitsData);
             }
         }
@@ -261,7 +252,8 @@ public static CurrentLimitsData operationalLimitsGroupToMapDataCurrentLimits(Ope
         return operationalLimitsGroupToMapDataCurrentLimits(operationalLimitsGroup, null);
     }
 
-    public static CurrentLimitsData operationalLimitsGroupToMapDataCurrentLimits(OperationalLimitsGroup operationalLimitsGroup, CurrentLimitsData.Applicability applicability) {
+    @Nullable
+    public static CurrentLimitsData operationalLimitsGroupToMapDataCurrentLimits(OperationalLimitsGroup operationalLimitsGroup, Applicability applicability) {
         if (operationalLimitsGroup == null || operationalLimitsGroup.getCurrentLimits().isEmpty()) {
             return null;
         }