From 893b1af9ff8e2a6d6e987ba7f08ec36684315d6f Mon Sep 17 00:00:00 2001
From: Ayoub LABIDI <ayoub.labidi@protonmail.com>
Date: Wed, 6 Aug 2025 22:30:18 +0200
Subject: [PATCH] Replace modification report when building variant

Signed-off-by: Ayoub LABIDI <ayoub.labidi@protonmail.com>
---
 .../modifications/NetworkModificationApplicator.java   | 10 +++++-----
 .../modification/server/service/ReportService.java     |  3 ++-
 .../modification/server/VoltageInitReportTest.java     |  3 ++-
 .../modification/server/service/BuildTest.java         |  6 +++---
 .../gridsuite/modification/server/utils/TestUtils.java |  4 ++--
 5 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java b/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java
index 3c5de611f..a33ee0463 100644
--- a/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java
+++ b/src/main/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java
@@ -104,10 +104,10 @@ public NetworkModificationResult applyModifications(ModificationApplicationGroup
         ApplicationStatus groupApplicationStatus;
         if (preloadingStrategy == PreloadingStrategy.ALL_COLLECTIONS_NEEDED_FOR_BUS_VIEW) {
             groupApplicationStatus = largeNetworkModificationExecutionService
-                .supplyAsync(() -> apply(modificationInfosGroup, listener))
+                .supplyAsync(() -> apply(modificationInfosGroup, listener, false))
                 .join();
         } else {
-            groupApplicationStatus = apply(modificationInfosGroup, listener);
+            groupApplicationStatus = apply(modificationInfosGroup, listener, false);
         }
 
         return flushModificationApplications(groupApplicationStatus, listener);
@@ -157,7 +157,7 @@ public NetworkModificationResult applyModifications(List<ModificationApplication
     // This method is used when building a variant
     private List<ApplicationStatus> apply(List<ModificationApplicationGroup> modificationInfosGroups, NetworkStoreListener listener) {
         return modificationInfosGroups.stream()
-            .map(g -> apply(g, listener))
+            .map(g -> apply(g, listener, true))
             .toList();
     }
 
@@ -171,7 +171,7 @@ private NetworkModificationResult flushModificationApplications(List<Application
             .build();
     }
 
-    private ApplicationStatus apply(ModificationApplicationGroup modificationGroupInfos, NetworkStoreListener listener) {
+    private ApplicationStatus apply(ModificationApplicationGroup modificationGroupInfos, NetworkStoreListener listener, boolean isVariantBuild) {
         ReportNode reportNode;
         if (modificationGroupInfos.reportInfos().getNodeUuid() != null) {
             UUID reporterId = modificationGroupInfos.reportInfos().getNodeUuid();
@@ -192,7 +192,7 @@ private ApplicationStatus apply(ModificationApplicationGroup modificationGroupIn
                 .reduce(ApplicationStatus::max)
                 .orElse(ApplicationStatus.ALL_OK);
         if (modificationGroupInfos.reportInfos().getReportUuid() != null) {
-            reportService.sendReport(modificationGroupInfos.reportInfos().getReportUuid(), reportNode);
+            reportService.sendReport(modificationGroupInfos.reportInfos().getReportUuid(), reportNode, isVariantBuild);
         }
         return groupApplicationStatus;
     }
diff --git a/src/main/java/org/gridsuite/modification/server/service/ReportService.java b/src/main/java/org/gridsuite/modification/server/service/ReportService.java
index 02a228070..b64d2d112 100644
--- a/src/main/java/org/gridsuite/modification/server/service/ReportService.java
+++ b/src/main/java/org/gridsuite/modification/server/service/ReportService.java
@@ -60,8 +60,9 @@ public void setReportServerRest(RestTemplate reportServerRest) {
         this.reportServerRest = Objects.requireNonNull(reportServerRest, "reportServerRest can't be null");
     }
 
-    public void sendReport(UUID reportUuid, ReportNode reportNode) {
+    public void sendReport(UUID reportUuid, ReportNode reportNode, boolean isVariantBuild) {
         var path = UriComponentsBuilder.fromPath("{reportUuid}")
+            .queryParam("replace", isVariantBuild)
             .buildAndExpand(reportUuid)
             .toUriString();
         var headers = new HttpHeaders();
diff --git a/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java b/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java
index df946fac5..595ea1796 100644
--- a/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java
+++ b/src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java
@@ -53,6 +53,7 @@
 import java.util.UUID;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 
 @Slf4j
 @TestInstance(TestInstance.Lifecycle.PER_CLASS)
@@ -94,7 +95,7 @@ void testVoltageInitDuplicationLogs(final ApplicationStatus resultStatus, final
             .extracting(NetworkModificationResult::getApplicationStatus)
             .isEqualTo(resultStatus);
 
-        Mockito.verify(reportService, Mockito.times(1)).sendReport(Mockito.eq(reportUuid), reporterCaptor.capture());
+        Mockito.verify(reportService, Mockito.times(1)).sendReport(Mockito.eq(reportUuid), reporterCaptor.capture(), anyBoolean());
         final ReportNode result = reporterCaptor.getValue();
         log.info("Result = {}", objectMapper.writerWithDefaultPrettyPrinter().writeValueAsString(result));
         JSONAssert.assertEquals("voltage-init plan logs aggregated",
diff --git a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
index a71458102..e9ebf3d95 100644
--- a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
+++ b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
@@ -985,7 +985,7 @@ void testApplyModificationWithErrors(final MockWebServer server) {
             new NetworkInfos(network, TEST_NETWORK_ID, true));
         assertNotNull(networkModificationResult);
         testEmptyImpactsWithErrors(networkModificationResult);
-        assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s", reportUuid))));
+        assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s\\?replace=false", reportUuid))));
 
         // Incremental mode : No error send with exception
         ModificationApplicationContext applicationContext = new ModificationApplicationContext(TEST_NETWORK_ID, variantId, reportUuid, reporterId);
@@ -993,7 +993,7 @@ void testApplyModificationWithErrors(final MockWebServer server) {
         assertEquals(1, networkModificationsResult.modificationResults().size());
         assertTrue(networkModificationsResult.modificationResults().get(0).isPresent());
         testEmptyImpactsWithErrors(networkModificationResult);
-        assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s", reportUuid))));
+        assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s\\?replace=false", reportUuid))));
         testNetworkModificationsCount(groupUuid, 2);
 
         // Save mode only (variant does not exist) : No log and no error send with exception
@@ -1024,7 +1024,7 @@ void testLastGroupModificationStatus(final MockWebServer server) {
         NetworkModificationResult networkModificationResult = networkModificationApplicator.applyModifications(modificationInfosGroups, new NetworkInfos(network, TEST_NETWORK_ID, true));
         assertNotNull(networkModificationResult);
         testEmptyImpactsWithErrorsLastOK(networkModificationResult);
-        assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s", reportUuid))));
+        assertTrue(TestUtils.getRequestsDone(2, server).stream().anyMatch(r -> r.matches(String.format("/v1/reports/%s\\?replace=true", reportUuid))));
     }
 
     @Test
diff --git a/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java b/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java
index e1093786f..e9c274d69 100644
--- a/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java
+++ b/src/test/java/org/gridsuite/modification/server/utils/TestUtils.java
@@ -130,7 +130,7 @@ public static String resourceToString(String resource) throws IOException {
 
     public static void assertLogNthMessage(String expectedMessage, String reportKey, ReportService reportService, int rank) {
         ArgumentCaptor<ReportNode> reporterCaptor = ArgumentCaptor.forClass(ReportNode.class);
-        verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture());
+        verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture(), anyBoolean());
         assertNotNull(reporterCaptor.getValue());
         Optional<String> message = getMessageFromReporter(reportKey, reporterCaptor.getValue(), rank);
         assertTrue(message.isPresent());
@@ -143,7 +143,7 @@ public static void assertLogMessage(String expectedMessage, String reportKey, Re
 
     public static void assertLogMessageWithoutRank(String expectedMessage, String reportKey, ReportService reportService) {
         ArgumentCaptor<ReportNode> reporterCaptor = ArgumentCaptor.forClass(ReportNode.class);
-        verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture());
+        verify(reportService, atLeast(1)).sendReport(any(UUID.class), reporterCaptor.capture(), anyBoolean());
         assertNotNull(reporterCaptor.getValue());
         assertTrue(assertMessageFoundFromReporter(expectedMessage, reportKey, reporterCaptor.getValue()));
     }