review fix

gridsuite · Dec 5, 2023 · d7c2360 · d7c2360
1 parent eedbc8c
commit d7c2360
Showing 1 changed file with 13 additions and 8 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ByFormulaModification.java b/src/main/java/org/gridsuite/modification/server/modifications/ByFormulaModification.java
@@ -107,6 +107,7 @@ public void apply(Network network, Reporter subReporter) {
                 createReport(subReporter, "byFormulaModificationALL",
                         String.format("All equipment have been modified : %s equipment(s)", equipmentCount),
                         TypedValue.INFO_SEVERITY);
+                report(formulaSubReporter, formulaReports);
             } else {
                 if (equipmentNotModifiedCount == equipmentCount) {
                     createReport(subReporter, "byFormulaModificationNone",
@@ -117,17 +118,21 @@ public void apply(Network network, Reporter subReporter) {
                             String.format("Some of the equipment have been modified : %s equipment(s) modified and %s equipment(s) not modified",
                                     equipmentCount - equipmentNotModifiedCount, equipmentNotModifiedCount + equipmentNotFoundCount),
                             TypedValue.WARN_SEVERITY);
+                    report(formulaSubReporter, formulaReports);
                 }
             }
-            formulaSubReporter.report(Report.builder()
-                    .withKey("appliedFormulasModifications")
-                    .withDefaultMessage("  Formulas")
-                    .withSeverity(TypedValue.INFO_SEVERITY)
-                    .build());
-            formulaReports.forEach(formulaSubReporter::report);
         }
     }
 
+    private void report(Reporter formulaSubReporter, List<Report> formulaReports) {
+        formulaSubReporter.report(Report.builder()
+                .withKey("appliedFormulasModifications")
+                .withDefaultMessage("  Formulas")
+                .withSeverity(TypedValue.INFO_SEVERITY)
+                .build());
+        formulaReports.forEach(formulaSubReporter::report);
+    }
+
     private void applyFormulaOnFilterEquipments(Network network,
                                                 Map<UUID, FilterEquipments> exportFilters,
                                                 List<Report> formulaReports,
@@ -158,13 +163,13 @@ private void applyFormulaOnFilterEquipments(Network network,
                     })
                     .forEach(identifiable -> applyFormula(identifiable, formulaInfos, equipmentsReport, notEditableEquipments));
 
-            createReports(formulaReports, formulaInfos, filterInfos, filterEquipments, notEditableEquipments);
+            createFormulaReports(formulaReports, formulaInfos, filterInfos, filterEquipments, notEditableEquipments);
 
             formulaReports.addAll(equipmentsReport);
         }
     }
 
-    private void createReports(List<Report> formulaReports, FormulaInfos formulaInfos, FilterInfos filterInfos, FilterEquipments filterEquipments, List<String> notEditableEquipments) {
+    private void createFormulaReports(List<Report> formulaReports, FormulaInfos formulaInfos, FilterInfos filterInfos, FilterEquipments filterEquipments, List<String> notEditableEquipments) {
         if (notEditableEquipments.size() == filterEquipments.getIdentifiableAttributes().size()) {
             formulaReports.add(Report.builder()
                     .withKey("byFormulaModificationFormulaFilter_" + formulaReports.size())