Skip to content

Replace modification report when building variant #670

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
+14 −12
Open

Replace modification report when building variant #670

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
893b1af
Replace modification report when building variant
ayolab Aug 6, 2025
fb5e1ac
Merge branch 'main' into ayolab/replace-modification-report-when-buil…
TheMaskedTurtle Aug 20, 2025
288c531
Merge remote-tracking branch 'origin/main' into ayolab/replace-modifi…
TheMaskedTurtle Aug 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions ...n/java/org/gridsuite/modification/server/modifications/NetworkModificationApplicator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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();
}

Expand All @@ -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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe isIncremental ? I don't know I feel like I don't understand easily this isVariantBuild boolean

ReportNode reportNode;
if (modificationGroupInfos.reportInfos().getNodeUuid() != null) {
UUID reporterId = modificationGroupInfos.reportInfos().getNodeUuid();
Expand All @@ -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;
}
Expand Down
3 changes: 2 additions & 1 deletion src/main/java/org/gridsuite/modification/server/service/ReportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe one method sendReport and another one sendAndReplaceReport ?

var path = UriComponentsBuilder.fromPath("{reportUuid}")
.queryParam("replace", isVariantBuild)
.buildAndExpand(reportUuid)
.toUriString();
var headers = new HttpHeaders();
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/gridsuite/modification/server/VoltageInitReportTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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",
Expand Down
6 changes: 3 additions & 3 deletions src/test/java/org/gridsuite/modification/server/service/BuildTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -985,15 +985,15 @@ 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);
NetworkModificationsResult networkModificationsResult = networkModificationService.createNetworkModification(groupUuid, loadCreationInfos, List.of(applicationContext));
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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/modification/server/utils/TestUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
Expand All @@ -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()));
}
Expand Down