From 68e970abd2fe7ccab0dfa3c5400a73145e12b94c Mon Sep 17 00:00:00 2001 From: Mathieu DEHARBE Date: Wed, 18 Sep 2024 12:32:12 +0200 Subject: [PATCH] revert to correct unit tests Signed-off-by: Mathieu DEHARBE --- .../TwoWindingsTransformerField.java | 3 +- .../VoltageLevelModification.java | 53 +++++++++---------- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/dto/formula/equipmentfield/TwoWindingsTransformerField.java b/src/main/java/org/gridsuite/modification/server/dto/formula/equipmentfield/TwoWindingsTransformerField.java index 4451c826b..6a13e93d6 100644 --- a/src/main/java/org/gridsuite/modification/server/dto/formula/equipmentfield/TwoWindingsTransformerField.java +++ b/src/main/java/org/gridsuite/modification/server/dto/formula/equipmentfield/TwoWindingsTransformerField.java @@ -51,6 +51,7 @@ public static void setNewValue(TwoWindingsTransformer transformer, String twoWin TwoWindingsTransformerField field = TwoWindingsTransformerField.valueOf(twoWindingsTransformerField); final PhaseTapChanger phaseTapChanger = transformer.getPhaseTapChanger(); final RatioTapChanger ratioTapChanger = transformer.getRatioTapChanger(); + final PhaseTapChanger.RegulationMode regulationMode = phaseTapChanger != null ? phaseTapChanger.getRegulationMode() : null; final AttributeModification attributeModification = new AttributeModification<>(newValue, OperationType.SET); switch (field) { @@ -68,7 +69,7 @@ public static void setNewValue(TwoWindingsTransformer transformer, String twoWin null, new AttributeModification<>(newValue.intValue(), OperationType.SET), null, null); case RATIO_TARGET_DEADBAND -> modifyTargets(ratioTapChanger, null, true, null, attributeModification, null); case REGULATION_VALUE -> processPhaseTapRegulation( - phaseTapChanger, null, null, true, attributeModification, null, null + phaseTapChanger, null, regulationMode, true, attributeModification, null, null ); case PHASE_LOW_TAP_POSITION -> processTapChangerPositionsAndSteps(phaseTapChanger, null, true, new AttributeModification<>(newValue.intValue(), OperationType.SET), null, null, null); diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java index d79f633b0..aca5bee9e 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java @@ -124,40 +124,37 @@ public static void modifyVoltageLevelShortCircuit(AttributeModification oldIpMin = identifiableShortCircuit.getIpMin(); oldIpMax = identifiableShortCircuit.getIpMax(); } - updateShortCircuitLimits(ipMin, ipMax, oldIpMin, oldIpMax, identifiableShortCircuitAdder, reports); - identifiableShortCircuitAdder.add(); - if (subReportNode != null) { - reports.forEach(report -> insertReportNode(subReportNode, report)); - } - } - - private static void updateShortCircuitLimits(AttributeModification ipMin, - AttributeModification ipMax, - Double oldIpMin, - Double oldIpMax, - IdentifiableShortCircuitAdder identifiableShortCircuitAdder, - List reports) { if (ipMin != null) { - updateShortCircuitLimit(ipMin.getValue(), oldIpMin, "Low short circuit current limit", identifiableShortCircuitAdder::withIpMin, reports); + var newIpMin = ipMin.getValue(); + + identifiableShortCircuitAdder.withIpMin(newIpMin); + + //convert to kA to report it like the user set it. + var oldIpMinToReport = convertToKiloAmps(oldIpMin); + var newIpMinToReport = convertToKiloAmps(newIpMin); + reports.add(ModificationUtils.getInstance() + .buildModificationReport(oldIpMinToReport, newIpMinToReport, "Low short circuit current limit")); + } else if (oldIpMin != null) { + identifiableShortCircuitAdder.withIpMin(oldIpMin); } + if (ipMax != null) { - updateShortCircuitLimit(ipMax.getValue(), oldIpMax, "High short circuit current limit", identifiableShortCircuitAdder::withIpMax, reports); + var newIpMax = ipMax.getValue(); + identifiableShortCircuitAdder.withIpMax(newIpMax); + + //Convert to kA to report it like the user set it. + var oldIpMaxToReport = convertToKiloAmps(oldIpMax); + var newIpMaxToReport = convertToKiloAmps(newIpMax); + reports.add(ModificationUtils.getInstance() + .buildModificationReport(oldIpMaxToReport, newIpMaxToReport, "High short circuit current limit")); + } else if (oldIpMax != null) { + identifiableShortCircuitAdder.withIpMax(oldIpMax); } - } - private static void updateShortCircuitLimit(Double newValue, - Double oldValue, - String limitDescription, - Consumer setterMethod, - List reports) { - if (newValue != null) { - setterMethod.accept(newValue); - Double oldValueToReport = convertToKiloAmps(oldValue); - Double newValueToReport = convertToKiloAmps(newValue); - reports.add(ModificationUtils.getInstance().buildModificationReport(oldValueToReport, newValueToReport, limitDescription)); - } else if (oldValue != null) { - setterMethod.accept(oldValue); + identifiableShortCircuitAdder.add(); + if (subReportNode != null) { + reports.forEach(report -> insertReportNode(subReportNode, report)); } }