fix

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

Author: EtienneLt

src/main/java/org/gridsuite/modification/modifications/byfilter/AbstractModificationByAssignment.java

@@ -56,8 +56,7 @@ public abstract class AbstractModificationByAssignment extends AbstractModificat
     public static final String VALUE_KEY_ARROW_NAME = "arrow";
     public static final String VALUE_KEY_ARROW_VALUE = "→";
     public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_ZERO = "network.modification.equipmentModifiedError.zero";
-    public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_EMPTY = "network.modification.equipmentModifiedError.empty";
-    public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_NAN = "network.modification.equipmentModifiedError.nan";
+    public static final String REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_MISSING = "network.modification.equipmentModifiedError.missing";
     public static final String REPORT_KEY_BY_FILTER_MODIFICATION_SOME = "network.modification.byFilterModificationSome";
     public static final String REPORT_KEY_BY_FILTER_MODIFICATION_FAILED = "network.modification.byFilterModificationFailed";
     public static final String REPORT_KEY_BY_FILTER_MODIFICATION_SUCCESS = "network.modification.byFilterModificationSuccess";

src/main/java/org/gridsuite/modification/modifications/byfilter/ByFormulaModification.java

@@ -68,28 +68,25 @@ protected boolean preCheckValue(Identifiable<?> equipment, AbstractAssignmentInf
         FormulaInfos formulaInfos = (FormulaInfos) abstractAssignmentInfos;
         Double value1 = formulaInfos.getFieldOrValue1().getRefOrValue(equipment);
         Double value2 = formulaInfos.getFieldOrValue2().getRefOrValue(equipment);
-        if (value1 == null || value2 == null) {
-            return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_EMPTY, reports);
-        }
-
+        // value 1 and value 2 cannot be null because getRefOrValue returns NaN if value is null
         if (Double.isNaN(value1) || Double.isNaN(value2)) {
-            return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_NAN, reports);
+            return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_MISSING, TypedValue.WARN_SEVERITY, reports);
         }
 
         if (value2 == 0 && formulaInfos.getOperator() == Operator.DIVISION) {
-            return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_ZERO, reports);
+            return reportErrorOnEquipment(equipment, notEditableEquipments, REPORT_KEY_EQUIPMENT_MODIFIED_ERROR_ZERO, TypedValue.WARN_SEVERITY, reports);
         }
         return true;
     }
 
-    private boolean reportErrorOnEquipment(Identifiable<?> equipment, List<String> notEditableEquipments, String reportKey, List<ReportNode> reports) {
+    private boolean reportErrorOnEquipment(Identifiable<?> equipment, List<String> notEditableEquipments, String reportKey, TypedValue severity, List<ReportNode> reports) {
         equipmentNotModifiedCount += 1;
         notEditableEquipments.add(equipment.getId());
         reports.add(ReportNode.newRootReportNode()
                 .withResourceBundles(NetworkModificationReportResourceBundle.BASE_NAME)
                 .withMessageTemplate(reportKey)
                 .withUntypedValue(VALUE_KEY_EQUIPMENT_NAME, equipment.getId())
-                .withSeverity(TypedValue.WARN_SEVERITY)
+                .withSeverity(severity)
                 .build());
         return false;
     }

src/main/resources/org/gridsuite/modification/reports.properties

@@ -145,8 +145,7 @@ network.modification.equipmentDeletion = Equipment deletion ${equipmentId}
 network.modification.equipmentDisconnect = Equipment with id=${id} disconnected
 network.modification.equipmentDisconnect.side = Equipment with id=${id} disconnected on side ${side}
 network.modification.equipmentDisconnected = Equipment with id=${id} disconnected
-network.modification.equipmentModifiedError.empty = Cannot modify equipment ${equipmentName} : At least one of the value or referenced field is empty
-network.modification.equipmentModifiedError.nan = Cannot modify equipment ${equipmentName} : At least one of the value or referenced field is not a number
+network.modification.equipmentModifiedError.missing = Cannot modify equipment ${equipmentName} : At least one of the value or referenced field is missing
 network.modification.equipmentModifiedError.zero = Cannot modify equipment ${equipmentName} : The value or referenced field of the second operand in the division operator is zero
 network.modification.equipmentModifiedReport = ${equipmentType} id : ${equipmentName}, ${fieldName} : ${oldValue} ${arrow} ${newValue}
 network.modification.equipmentModifiedReportException = Cannot modify equipment ${equipmentName} : ${errorMessage}

src/test/java/org/gridsuite/modification/modifications/byfilter/formula/VoltageLevelByFormulaModificationTest.java

@@ -252,7 +252,7 @@ protected void assertAfterNetworkModificationApplication() {
 
         // check logs
         List<String> allLogs = reportNode.getChildren().getFirst().getChildren().stream().flatMap(child -> child.getChildren().stream().map(ReportNode::getMessage)).toList();
-        assertTrue(allLogs.contains("Cannot modify equipment v7 : At least one of the value or referenced field is not a number"));
+        assertTrue(allLogs.contains("Cannot modify equipment v7 : At least one of the value or referenced field is missing"));
         assertTrue(allLogs.contains("Cannot modify equipment v8 : The value or referenced field of the second operand in the division operator is zero"));
 
     }