Fix reports post processing (#113)

Signed-off-by: Ayoub LABIDI <ayoub.labidi@protonmail.com>
gridsuite · Sep 27, 2024 · 1eeae3f · 1eeae3f
1 parent e065d8b
commit 1eeae3f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 13 deletions.
diff --git a/src/main/java/org/gridsuite/shortcircuit/server/reports/AbstractReportMapper.java b/src/main/java/org/gridsuite/shortcircuit/server/reports/AbstractReportMapper.java
@@ -22,7 +22,7 @@
  * <br/>
  * The start tree structure returned by short-circuit is:
  * <pre>
- * 00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis  or  ShortCircuitAnalysis
+ * 00000000-0000-0000-0000-000000000000
  * \-- ShortCircuitAnalysis -> "ShortCircuitAnalysis (${providerToUse})"
  *     +-- [...]
  *     \-- [...]
@@ -43,9 +43,9 @@ public abstract class AbstractReportMapper {
      */
     public ReportNode processReporter(@NonNull final ReportNode reportNode, ShortCircuitRunContext runContext) {
         if (reportNode.getMessageKey() != null && reportNode.getMessageKey()
-                .matches("^([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12}@)?.*ShortCircuitAnalysis$")) {
+                .matches("^([a-fA-F0-9]{8}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{4}-[a-fA-F0-9]{12})")) {
             log.debug("ShortCircuitAnalysis root node found, will modify it!");
-            return forUuidAtShortCircuitAnalysis(reportNode, runContext);
+            return forRootReport(reportNode, runContext);
         } else {
             log.trace("Unrecognized ReportNode: {}", reportNode);
             return reportNode;
@@ -66,11 +66,11 @@ public static ReportNode insertReportNode(ReportNode parent, ReportNode child) {
     }
 
     /**
-     * Modify node with key {@code ********-****-****-****-************@ShortCircuitAnalysis} or {@code ShortCircuitAnalysis}
+     * Modify node with key {@code ********-****-****-****-************}
      *
      * @implNote we assume there will always be at least one modification
      */
-    protected ReportNode forUuidAtShortCircuitAnalysis(@NonNull final ReportNode reportNode, ShortCircuitRunContext runContext) {
+    protected ReportNode forRootReport(@NonNull final ReportNode reportNode, ShortCircuitRunContext runContext) {
         ReportNodeBuilder builder = ReportNode.newRootReportNode()
                 .withMessageTemplate(reportNode.getMessageKey(), reportNode.getMessageTemplate());
         reportNode.getValues().forEach((key, value) -> builder.withTypedValue(key, value.getValue().toString(), value.getType()));

diff --git a/src/main/java/org/gridsuite/shortcircuit/server/reports/ReportMapperShortCircuit.java b/src/main/java/org/gridsuite/shortcircuit/server/reports/ReportMapperShortCircuit.java
@@ -24,7 +24,7 @@
  * <br/>
  * The tree structure returned by short-circuit is:
  * <pre>
- * 00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis  or  ShortCircuitAnalysis
+ * 00000000-0000-0000-0000-000000000000
  * \-- ShortCircuitAnalysis -> "ShortCircuitAnalysis (${providerToUse})"
  *     +-- generatorConversion -> "Conversion of generators"
  *     +-- batteryConversion -> "Conversion of the batteries"

diff --git a/src/test/java/org/gridsuite/shortcircuit/server/reports/ReportMapperAbstractModelTest.java b/src/test/java/org/gridsuite/shortcircuit/server/reports/ReportMapperAbstractModelTest.java
@@ -17,8 +17,7 @@
 
 @Slf4j
 class ReportMapperAbstractModelTest extends AbstractReportMapperTest {
-    static final String ROOT_REPORTER_ID = "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis";
-    static final String ROOT_REPORTER_NO_ID = "ShortCircuitAnalysis";
+    static final String ROOT_REPORTER_ID = "00000000-0000-0000-0000-000000000000";
     static final String SHORTCIRCUIT_TYPE_REPORT = "ShortCircuitAnalysis";
 
     private final AbstractReportMapper reportMapper = new AbstractReportMapper() {
@@ -40,7 +39,7 @@ void testIgnoreOthersReportModels() {
     }
 
     @ParameterizedTest
-    @ValueSource(strings = {ROOT_REPORTER_ID, ROOT_REPORTER_NO_ID})
+    @ValueSource(strings = {ROOT_REPORTER_ID})
     void testModifyRootNode(final String rootId) {
         final ReportNode reportNode = ReportNode.newRootReportNode().withMessageTemplate(rootId, rootId).build();
         final ReportNode subReportNode = reportNode.newReportNode()

diff --git a/src/test/resources/reporter_shortcircuit_modified.json b/src/test/resources/reporter_shortcircuit_modified.json
@@ -2,7 +2,7 @@
   "version": "2.1",
   "dictionaries": {
     "default": {
-      "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis": "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis",
+      "00000000-0000-0000-0000-000000000000": "00000000-0000-0000-0000-000000000000",
       "ShortCircuitAnalysis": "ShortCircuitAnalysis (${providerToUse})",
       "TestReporter": "Test Reporter",
       "testReportLine": "Test log line",
@@ -27,7 +27,7 @@
     }
   },
   "reportRoot": {
-    "messageKey": "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis",
+    "messageKey": "00000000-0000-0000-0000-000000000000",
     "children": [
       {
         "messageKey": "TestReporter"

diff --git a/src/test/resources/reporter_shortcircuit_test.json b/src/test/resources/reporter_shortcircuit_test.json
@@ -2,7 +2,7 @@
   "version": "2.1",
   "dictionaries": {
     "default": {
-      "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis": "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis",
+      "00000000-0000-0000-0000-000000000000": "00000000-0000-0000-0000-000000000000",
       "ShortCircuitAnalysis": "ShortCircuitAnalysis (${providerToUse})",
       "TestReporter": "Test Reporter",
       "testReportLine": "Test log line",
@@ -24,7 +24,7 @@
     }
   },
   "reportRoot": {
-    "messageKey": "00000000-0000-0000-0000-000000000000@ShortCircuitAnalysis",
+    "messageKey": "00000000-0000-0000-0000-000000000000",
     "children": [
       {
         "messageKey": "TestReporter"