Skip to content

rename composite modif #988

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
souissimai wants to merge 2 commits into
base: main
Choose a base branch
from
Open

rename composite modif #988

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d9ac4d5
rename
May 5, 2026
c6d6196
Merge branch 'main' into update-composite-modification-rename
souissimai May 5, 2026
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
4 changes: 4 additions & 0 deletions src/main/java/org/gridsuite/study/server/dto/modification/NetworkModificationMetadata.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
*/
package org.gridsuite.study.server.dto.modification;

import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Getter;
Expand All @@ -29,4 +30,7 @@ public class NetworkModificationMetadata {
String description;
@Schema(description = "Modification type")
String type;
@Schema(description = "Modification name (only present for composite modifications)")
@JsonInclude(JsonInclude.Include.NON_NULL)
String name;
}
4 changes: 2 additions & 2 deletions src/test/java/org/gridsuite/study/server/NetworkModificationUnitTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,7 @@ void updateDescription() {
UUID modificationUuid = UUID.randomUUID();
List<UUID> childrenNodes = List.of(node2Uuid, node4Uuid, node3Uuid);

NetworkModificationMetadata metadata = new NetworkModificationMetadata(null, "new description", null);
NetworkModificationMetadata metadata = new NetworkModificationMetadata(null, "new description", null, null);
studyController.updateNetworkModificationsMetadata(studyUuid, node1Uuid, List.of(modificationUuid), metadata, USER_ID_HEADER);

checkModificationUpdatedMessageReceived(studyUuid, node1Uuid, childrenNodes, NotificationService.MODIFICATIONS_UPDATING_IN_PROGRESS);
Expand Down Expand Up @@ -283,7 +283,7 @@ void unbuildAllNodes() {
}

private void updateNetworkModificationActivationStatus(List<UUID> networkModificationUuids, UUID nodeWithModification, List<UUID> childrenNodes, List<UUID> nodesToUnbuild, boolean activated) {
NetworkModificationMetadata metadata = new NetworkModificationMetadata(activated, null, null);
NetworkModificationMetadata metadata = new NetworkModificationMetadata(activated, null, null, null);
studyController.updateNetworkModificationsMetadata(studyUuid, node1Uuid, networkModificationUuids, metadata, USER_ID_HEADER);

checkModificationUpdatedMessageReceived(studyUuid, nodeWithModification, childrenNodes, NotificationService.MODIFICATIONS_UPDATING_IN_PROGRESS);
Expand Down
2 changes: 1 addition & 1 deletion src/test/java/org/gridsuite/study/server/studycontroller/StudyControllerRebuildNodeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ void restoreNetworkModification() {
@Test
void updateNetworkModificationMetadata() {
List<UUID> modificationUuids = List.of(UUID.randomUUID());
NetworkModificationMetadata networkModificationMetadata = new NetworkModificationMetadata(true, "description", "type");
NetworkModificationMetadata networkModificationMetadata = new NetworkModificationMetadata(true, "description", "type", null);
studyController.updateNetworkModificationsMetadata(studyUuid, nodeUuid, modificationUuids, networkModificationMetadata, userId);

verify(rebuildNodeService, times(1)).updateNetworkModificationsMetadata(studyUuid, nodeUuid, modificationUuids, userId, networkModificationMetadata);
Expand Down
Loading