From 0ff9855b7f88d8b06359ccf02501b463d84f20a7 Mon Sep 17 00:00:00 2001
From: Seddik Yengui <seddik.yengui@rte-france.com>
Date: Thu, 9 Nov 2023 15:58:08 +0100
Subject: [PATCH] logs order fix

---
 .../server/modifications/ByFormulaModification.java      | 9 +++++----
 1 file changed, 5 insertions(+), 4 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
index 45a139e53..eb1ecc8aa 100644
--- a/src/main/java/org/gridsuite/modification/server/modifications/ByFormulaModification.java
+++ b/src/main/java/org/gridsuite/modification/server/modifications/ByFormulaModification.java
@@ -89,10 +89,6 @@ private void applyFormulaOnFilterEquipments(Network network,
                                                 FormulaInfos formulaInfos,
                                                 FilterInfos filterInfos) {
         var filterEquipments = exportFilters.get(filterInfos.getId());
-        filterEquipments.getIdentifiableAttributes().forEach(attributes -> applyFormula(network,
-                attributes.getId(),
-                formulaInfos,
-                formulaReports));
 
         formulaReports.add(Report.builder()
                 .withKey("byFormulaModificationFormulaFilter_" + formulaReports.size())
@@ -122,6 +118,11 @@ private void applyFormulaOnFilterEquipments(Network network,
                 .withDefaultMessage(String.format("      Edited field : %s", formulaInfos.getEditedField()))
                 .withSeverity(TypedValue.INFO_SEVERITY)
                 .build());
+
+        filterEquipments.getIdentifiableAttributes().forEach(attributes -> applyFormula(network,
+                attributes.getId(),
+                formulaInfos,
+                formulaReports));
     }
 
     @Nullable