--Change Specs : No id change for CurrentLimitsData when limits are different

Signed-off-by: basseche <[email protected]>

Author: basseche

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

@@ -66,18 +66,14 @@ private static LineFormInfos toFormInfos(Identifiable<?> identifiable) {
                 .b1(line.getB1())
                 .g2(line.getG2())
                 .b2(line.getB2())
-                .properties(getProperties(line));
-
-        Pair<String, String> newSelectedOpLimitsGroups = mergeCurrentLimits(line.getOperationalLimitsGroups1(), line.getOperationalLimitsGroups2(),
-                                                                            line.getSelectedOperationalLimitsGroupId1().orElse(null),
-                                                                            line.getSelectedOperationalLimitsGroupId2().orElse(null),
-                                                                            builder::currentLimits);
+                .properties(getProperties(line))
+                .selectedOperationalLimitsGroup1(line.getSelectedOperationalLimitsGroupId1().orElse(null))
+                .selectedOperationalLimitsGroup2(line.getSelectedOperationalLimitsGroupId2().orElse(null));
 
-        builder.selectedOperationalLimitsGroup1(!newSelectedOpLimitsGroups.getLeft().isEmpty() ? newSelectedOpLimitsGroups.getLeft() : line.getSelectedOperationalLimitsGroupId1().orElse(null));
-        builder.selectedOperationalLimitsGroup2(!newSelectedOpLimitsGroups.getRight().isEmpty() ? newSelectedOpLimitsGroups.getRight() : line.getSelectedOperationalLimitsGroupId2().orElse(null));
+        mergeCurrentLimits(line.getOperationalLimitsGroups1(), line.getOperationalLimitsGroups2(), builder::currentLimits);
 
-        buildCurrentLimits(line.getOperationalLimitsGroups1(), line.getSelectedOperationalLimitsGroupId1().orElse(null), newSelectedOpLimitsGroups.getLeft(), builder::currentLimits1);
-        buildCurrentLimits(line.getOperationalLimitsGroups2(), line.getSelectedOperationalLimitsGroupId2().orElse(null), newSelectedOpLimitsGroups.getRight(), builder::currentLimits2);
+        buildCurrentLimits(line.getOperationalLimitsGroups1(), builder::currentLimits1);
+        buildCurrentLimits(line.getOperationalLimitsGroups2(), builder::currentLimits2);
 
         builder.busOrBusbarSectionId1(getBusOrBusbarSection(terminal1))
                 .busOrBusbarSectionId2(getBusOrBusbarSection(terminal2));

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

@@ -78,17 +78,13 @@ private static TwoWindingsTransformerFormInfos toFormInfos(Identifiable<?> ident
         builder.q2(nullIfNan(terminal2.getQ()));
         builder.i1(nullIfNan(terminal1.getI()));
         builder.i2(nullIfNan(terminal2.getI()));
+        builder.selectedOperationalLimitsGroup1(twoWT.getSelectedOperationalLimitsGroupId1().orElse(null));
+        builder.selectedOperationalLimitsGroup2(twoWT.getSelectedOperationalLimitsGroupId2().orElse(null));
 
-        Pair<String, String> newSelectedOpLimitsGroups = mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2(),
-            twoWT.getSelectedOperationalLimitsGroupId1().orElse(null),
-            twoWT.getSelectedOperationalLimitsGroupId2().orElse(null),
-            builder::currentLimits);
-
-        builder.selectedOperationalLimitsGroup1(!newSelectedOpLimitsGroups.getLeft().isEmpty() ? newSelectedOpLimitsGroups.getLeft() : twoWT.getSelectedOperationalLimitsGroupId1().orElse(null));
-        builder.selectedOperationalLimitsGroup2(!newSelectedOpLimitsGroups.getRight().isEmpty() ? newSelectedOpLimitsGroups.getRight() : twoWT.getSelectedOperationalLimitsGroupId2().orElse(null));
+        mergeCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getOperationalLimitsGroups2(), builder::currentLimits);
 
-        buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), twoWT.getSelectedOperationalLimitsGroupId1().orElse(null), newSelectedOpLimitsGroups.getLeft(), builder::currentLimits1);
-        buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), twoWT.getSelectedOperationalLimitsGroupId2().orElse(null), newSelectedOpLimitsGroups.getRight(), builder::currentLimits2);
+        buildCurrentLimits(twoWT.getOperationalLimitsGroups1(), builder::currentLimits1);
+        buildCurrentLimits(twoWT.getOperationalLimitsGroups2(), builder::currentLimits2);
 
         builder.operatingStatus(toOperatingStatus(twoWT));
         builder.connectablePosition1(toMapConnectablePosition(twoWT, 1))

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

@@ -85,79 +85,31 @@ public static Optional<HvdcOperatorActivePowerRangeInfos> toHvdcOperatorActivePo
                         .oprFromCS2toCS1(hvdcOperatorActivePowerRange.getOprFromCS2toCS1()).build());
     }
 
-    public static void buildCurrentLimits(Collection<OperationalLimitsGroup> currentLimits, String oldSelected, String newSelected, Consumer<List<CurrentLimitsData>> build) {
+    public static void buildCurrentLimits(Collection<OperationalLimitsGroup> currentLimits, Consumer<List<CurrentLimitsData>> build) {
 
         ArrayList<CurrentLimitsData> currentLimitsData = new ArrayList<>(currentLimits.stream()
                 .map(ElementUtils::operationalLimitsGroupToMapDataCurrentLimits)
                 .toList());
 
-        // if selected operationalLimitsGroups renamed, rename it also here
-        if (!newSelected.isEmpty()) {
-            Optional<CurrentLimitsData> limitsGroup = currentLimitsData.stream().filter(l -> l.getId().equals(oldSelected)).findFirst();
-            if (limitsGroup.isPresent()) {
-                CurrentLimitsData current = copyCurrentLimitsData(limitsGroup.get(), newSelected);
-                currentLimitsData.remove(limitsGroup.get());
-                currentLimitsData.add(current);
-            }
-        }
-
         if (!currentLimitsData.isEmpty()) {
             build.accept(currentLimitsData);
         }
     }
 
-    private static String generateSetName(String basicName, String suffix, List<CurrentLimitsData> mergedList, List<CurrentLimitsData> otherList) {
-
-        boolean nameUsed;
-        String strIncrement = "";
-        int increment = 1;
-
-        do {
-            String currentId = basicName + suffix + strIncrement;
-            if (!mergedList.stream().filter(l -> l.getId().equals(currentId)).toList().isEmpty()
-                || !otherList.stream().filter(l -> l.getId().equals(currentId)).toList().isEmpty()) {
-                nameUsed = true;
-                increment++;
-                strIncrement = "(" + increment + ")";
-            } else {
-                nameUsed = false;
-            }
-        } while (nameUsed);
-
-        return basicName + suffix + strIncrement;
-    }
-
-    private static CurrentLimitsData copyCurrentLimitsData(CurrentLimitsData currentLimitsData, CurrentLimitsData.Applicability applicability, String id) {
-        return CurrentLimitsData.builder()
-            .id(id.isEmpty() ? currentLimitsData.getId() : id)
-            .applicability(applicability)
-            .temporaryLimits(currentLimitsData.getTemporaryLimits())
-            .permanentLimit(currentLimitsData.getPermanentLimit()).build();
-    }
-
     private static CurrentLimitsData copyCurrentLimitsData(CurrentLimitsData currentLimitsData, CurrentLimitsData.Applicability applicability) {
-        return copyCurrentLimitsData(currentLimitsData, applicability, "");
-    }
-
-    private static CurrentLimitsData copyCurrentLimitsData(CurrentLimitsData currentLimitsData, String id) {
         return CurrentLimitsData.builder()
-            .id(id.isEmpty() ? currentLimitsData.getId() : id)
-            .applicability(currentLimitsData.getApplicability())
+            .id(currentLimitsData.getId())
+            .applicability(applicability)
             .temporaryLimits(currentLimitsData.getTemporaryLimits())
             .permanentLimit(currentLimitsData.getPermanentLimit()).build();
     }
 
     /**
      * @return id of the selected operation limits group 1 and 2 if they have been renamed
      */
-    public static Pair<String, String> mergeCurrentLimits(Collection<OperationalLimitsGroup> operationalLimitsGroups1,
+    public static void mergeCurrentLimits(Collection<OperationalLimitsGroup> operationalLimitsGroups1,
                                                           Collection<OperationalLimitsGroup> operationalLimitsGroups2,
-                                                          String selectedLimitsGroup1, String selectedLimitsGroup2,
                                                           Consumer<List<CurrentLimitsData>> build) {
-        final String orSuffix = "_OR";
-        final String exSuffix = "_EX";
-        String changedSelectedLimitsGroup1 = "";
-        String changedSelectedLimitsGroup2 = "";
         List<CurrentLimitsData> mergedLimitsData = new ArrayList<>();
 
         // Build temporary limit from side 1 and 2
@@ -174,13 +126,13 @@ public static Pair<String, String> mergeCurrentLimits(Collection<OperationalLimi
                 mergedLimitsData.add(copyCurrentLimitsData(currentLimitsData, SIDE1));
             }
             build.accept(mergedLimitsData);
-            return Pair.of("", "");
+            return;
         } else if (currentLimitsData1.isEmpty() && !currentLimitsData2.isEmpty()) {
             for (CurrentLimitsData currentLimitsData : currentLimitsData2) {
                 mergedLimitsData.add(copyCurrentLimitsData(currentLimitsData, SIDE2));
             }
             build.accept(mergedLimitsData);
-            return Pair.of("", "");
+            return;
         }
 
         // more complex case
@@ -199,23 +151,12 @@ public static Pair<String, String> mergeCurrentLimits(Collection<OperationalLimi
                     // both sides have limits and limits are equals
                     if (limitsData.limitsEquals(limitsData2)) {
                         mergedLimitsData.add(copyCurrentLimitsData(limitsData, EQUIPMENT));
-                        // both side have limits and they are differents : create 2 differents limitset with basename_Or and _Ex
+                        // both side have limits and they are different : create 2 different limit sets with basename_Or and _Ex
                     } else {
-                        String currentLimitId = limitsData.getId();
                         // Side 1
-                        String limitId = generateSetName(currentLimitId, orSuffix, mergedLimitsData, currentLimitsData2);
-                        mergedLimitsData.add(copyCurrentLimitsData(limitsData, SIDE1, limitId));
-                        // if name changed and is active limit set change also selected limit set
-                        if (selectedLimitsGroup1.equals(currentLimitId)) {
-                            changedSelectedLimitsGroup1 = limitId;
-                        }
+                        mergedLimitsData.add(copyCurrentLimitsData(limitsData, SIDE1));
                         // Side 2
-                        limitId = generateSetName(currentLimitId, exSuffix, mergedLimitsData, currentLimitsData2);
-                        mergedLimitsData.add(copyCurrentLimitsData(limitsData2, SIDE2, limitId));
-                        // if name changed and is active limit set change also selected limit set
-                        if (selectedLimitsGroup2.equals(currentLimitId)) {
-                            changedSelectedLimitsGroup2 = limitId;
-                        }
+                        mergedLimitsData.add(copyCurrentLimitsData(limitsData2, SIDE2));
                     }
                 }
                 // remove processed limits from side 2
@@ -233,8 +174,6 @@ public static Pair<String, String> mergeCurrentLimits(Collection<OperationalLimi
         if (!mergedLimitsData.isEmpty()) {
             build.accept(mergedLimitsData);
         }
-
-        return Pair.of(changedSelectedLimitsGroup1, changedSelectedLimitsGroup2);
     }
 
     public static Optional<StandbyAutomatonInfos> toStandbyAutomaton(StaticVarCompensator staticVarCompensator) {