Skip to content

Use a build context #607

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 1 commit into
base: main
Choose a base branch
from
Open

Use a build context #607

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 12 additions & 0 deletions src/main/java/org/gridsuite/modification/server/dto/BuildContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
/**
* Copyright (c) 2025, RTE (http://www.rte-france.com)
* This Source Code Form is subject to the terms of the Mozilla Public
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
package org.gridsuite.modification.server.dto;

import java.util.Set;
import java.util.UUID;

public record BuildContext(UUID groupUuid, Set<UUID> excludedModifications, ReportInfos reportInfos) { }
12 changes: 3 additions & 9 deletions src/main/java/org/gridsuite/modification/server/dto/BuildInfos.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.*;

import java.util.*;
import java.util.ArrayList;
import java.util.List;

/**
* @author Franck Lecuyer <franck.lecuyer at rte-france.com>
Expand All @@ -25,12 +26,5 @@ public class BuildInfos {

private String destinationVariantId;

private List<UUID> modificationGroupUuids = new ArrayList<>();

// map with modification groups as key, modification to excludes as value
@Builder.Default
private Map<UUID, Set<UUID>> modificationUuidsToExclude = new HashMap<>();

private List<ReportInfos> reportsInfos = new ArrayList<>();

private List<BuildContext> buildContextsInfos = new ArrayList<>();
}
38 changes: 17 additions & 21 deletions src/main/java/org/gridsuite/modification/server/service/NetworkModificationService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
package org.gridsuite.modification.server.service;

import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.collect.Streams;
import com.powsybl.commons.PowsyblException;
import com.powsybl.iidm.network.Network;
import com.powsybl.iidm.network.VariantManagerConstants;
Expand Down Expand Up @@ -212,28 +211,25 @@ public NetworkModificationResult buildVariant(@NonNull UUID networkUuid, @NonNul
// Apply all modifications belonging to the modification groups uuids in buildInfos
List<Pair<ReportInfos, List<ModificationInfos>>> modificationInfos = new ArrayList<>();

Streams.forEachPair(buildInfos.getModificationGroupUuids().stream(), buildInfos.getReportsInfos().stream(),
(groupUuid, reporterId) -> {
Set<UUID> modificationsToExclude = buildInfos.getModificationUuidsToExclude().get(groupUuid);
List<ModificationInfos> modificationsByGroup = List.of();
try {
modificationsByGroup = networkModificationRepository.getModificationsInfos(List.of(groupUuid), false)
.stream()
.filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getUuid()))
.filter(m -> !m.getStashed())
.collect(Collectors.toList());
} catch (NetworkModificationException e) {
if (e.getType() != MODIFICATION_GROUP_NOT_FOUND) { // May not exist
throw e;
}
buildInfos.getBuildContextsInfos().stream().forEach(buildContext -> {
Set<UUID> modificationsToExclude = buildContext.excludedModifications();
List<ModificationInfos> modificationsByGroup = List.of();
try {
modificationsByGroup = networkModificationRepository.getModificationsInfos(List.of(buildContext.groupUuid()), false)
.stream()
.filter(m -> modificationsToExclude == null || !modificationsToExclude.contains(m.getUuid()))
.filter(m -> !m.getStashed())
.collect(Collectors.toList());
} catch (NetworkModificationException e) {
if (e.getType() != MODIFICATION_GROUP_NOT_FOUND) { // May not exist
throw e;
}
modificationInfos.add(
Pair.of(reporterId,
modificationsByGroup)
);

}
);
modificationInfos.add(
Pair.of(buildContext.reportInfos(),
modificationsByGroup)
);
});

PreloadingStrategy preloadingStrategy = modificationInfos.stream().map(Pair::getRight)
.flatMap(Collection::stream)
Expand Down
49 changes: 28 additions & 21 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 @@ -266,8 +266,10 @@ void runBuildForLineSplits(final MockWebServer server) throws Exception {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID, TEST_GROUP_ID_2))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)),
new BuildContext(TEST_GROUP_ID_2, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2))
))
.build();
mockMvc.perform(post(uriString, TEST_NETWORK_ID)
.contentType(MediaType.APPLICATION_JSON)
Expand All @@ -284,8 +286,7 @@ void runBuildForLineSplits(final MockWebServer server) throws Exception {
BuildInfos newBuildInfos = BuildInfos.builder()
.originVariantId(NetworkCreation.VARIANT_ID)
.destinationVariantId(VARIANT_ID_2)
.modificationGroupUuids(List.of())
.reportsInfos(List.of())
.buildContextsInfos(List.of())
.build();
mockMvc.perform(post(uriString, TEST_NETWORK_ID)
.contentType(MediaType.APPLICATION_JSON)
Expand All @@ -310,8 +311,9 @@ void runBuildWithEmptyGroupTest(final MockWebServer server) throws Exception {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1))
))
.build();
String expectedBody = mapper.writeValueAsString(ReportNode.newRootReportNode()
.withMessageTemplate(TEST_SUB_REPORTER_ID_1.toString(), TEST_SUB_REPORTER_ID_1.toString())
Expand Down Expand Up @@ -414,8 +416,9 @@ void testIndexationAfterBuild(final MockWebServer server) {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1))
))
.build();

// Build variant
Expand Down Expand Up @@ -706,8 +709,10 @@ void runBuildTest(final MockWebServer server) throws Exception {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID, TEST_GROUP_ID_2))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)),
new BuildContext(TEST_GROUP_ID_2, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_2))
))
.build();
String buildInfosJson = objectWriter.writeValueAsString(buildInfos);
mockMvc.perform(post(uriString, TEST_NETWORK_ID).contentType(MediaType.APPLICATION_JSON).content(buildInfosJson))
Expand Down Expand Up @@ -806,8 +811,7 @@ void runBuildTest(final MockWebServer server) throws Exception {
BuildInfos newBuildInfos = BuildInfos.builder()
.originVariantId(NetworkCreation.VARIANT_ID)
.destinationVariantId(VARIANT_ID_2)
.modificationGroupUuids(Collections.emptyList())
.reportsInfos(Collections.emptyList())
.buildContextsInfos(List.of())
.build();
buildInfosJson = objectWriter.writeValueAsString(newBuildInfos);
mockMvc.perform(post(uriString, TEST_NETWORK_ID).contentType(MediaType.APPLICATION_JSON).content(buildInfosJson)).andExpect(status().isOk());
Expand Down Expand Up @@ -849,8 +853,9 @@ void runBuildWithStashedModificationsTest(final MockWebServer server) {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1))
))
.build();
networkModificationService.buildVariant(TEST_NETWORK_ID, buildInfos);

Expand All @@ -876,9 +881,9 @@ void runBuildWithExcludedModificationsTest(final MockWebServer server) {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)))
.modificationUuidsToExclude(Map.of(TEST_GROUP_ID, Set.of(savedModificationEntities.get(1).getId())))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(savedModificationEntities.get(1).getId()), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1))
))
.build();
networkModificationService.buildVariant(TEST_NETWORK_ID, buildInfos);

Expand All @@ -904,8 +909,9 @@ void stopBuildTest() throws Exception {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID))
.reportsInfos(List.of(new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(UUID.randomUUID(), TEST_SUB_REPORTER_ID_1))
))
.build();
String buildInfosJson = mapper.writeValueAsString(buildInfos);
CompletableFuture.runAsync(() -> {
Expand Down Expand Up @@ -946,8 +952,9 @@ void runBuildWithReportErrorTest(final MockWebServer server) throws Exception {
BuildInfos buildInfos = BuildInfos.builder()
.originVariantId(VariantManagerConstants.INITIAL_VARIANT_ID)
.destinationVariantId(NetworkCreation.VARIANT_ID)
.modificationGroupUuids(List.of(TEST_GROUP_ID))
.reportsInfos(List.of(new ReportInfos(TEST_ERROR_REPORT_ID, TEST_SUB_REPORTER_ID_1)))
.buildContextsInfos(List.of(
new BuildContext(TEST_GROUP_ID, Set.of(), new ReportInfos(TEST_ERROR_REPORT_ID, TEST_SUB_REPORTER_ID_1))
))
.build();
mockMvc.perform(post(uriString, TEST_NETWORK_ID)
.contentType(MediaType.APPLICATION_JSON)
Expand Down