diff --git a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java index 28443339..39ac1288 100644 --- a/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java +++ b/src/main/java/org/gridsuite/modification/dto/VoltageInitModificationInfos.java @@ -17,7 +17,10 @@ import org.gridsuite.modification.modifications.AbstractModification; import org.gridsuite.modification.modifications.VoltageInitModification; +import java.time.Instant; +import java.util.HashMap; import java.util.List; +import java.util.Map; /** * @author Franck Lecuyer @@ -48,6 +51,15 @@ public class VoltageInitModificationInfos extends ModificationInfos { @Schema(description = "buses modifications") private List buses; + @Schema(description = "root network name") + private String rootNetworkName; + + @Schema(description = "node name") + private String nodeName; + + @Schema(description = "computation date") + private Instant computationDate; + @Override public AbstractModification toModification() { return new VoltageInitModification(this); @@ -57,4 +69,13 @@ public AbstractModification toModification() { public ReportNode createSubReportNode(ReportNode reportNode) { return reportNode.newReportNode().withMessageTemplate("network.modification.voltageInitModification").add(); } + + @Override + public Map getMapMessageValues() { + Map mapMessageValues = new HashMap<>(); + mapMessageValues.put("rootNetworkName", getRootNetworkName()); + mapMessageValues.put("nodeName", getNodeName()); + mapMessageValues.put("computationDate", getComputationDate() != null ? getComputationDate().toString() : null); + return mapMessageValues; + } } diff --git a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java index a61cb735..4b64a2d7 100644 --- a/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java +++ b/src/test/java/org/gridsuite/modification/modifications/VoltageInitModificationTest.java @@ -13,7 +13,10 @@ import org.gridsuite.modification.report.NetworkModificationReportResourceBundle; import org.gridsuite.modification.utils.NetworkCreation; import org.junit.jupiter.api.Test; + +import java.time.Instant; import java.util.List; +import java.util.Map; import java.util.UUID; import static org.gridsuite.modification.utils.NetworkUtil.createGenerator; @@ -199,6 +202,9 @@ protected ModificationInfos buildModification() { .v(230.) .angle(0.5) .build())) + .rootNetworkName("rootNetwork1") + .nodeName("node1") + .computationDate(Instant.now()) .build(); } @@ -260,6 +266,14 @@ void testVoltageInitDisconnectedCurrentSection1Section1() throws Exception { assertEquals(1, getNetwork().getShuntCompensator("v5shunt").getSectionCount()); } + @Test + void testMapMessageValues() { + ModificationInfos modifications = buildModification(); + Map values = modifications.getMapMessageValues(); + assertEquals("rootNetwork1", values.get("rootNetworkName")); + assertEquals("node1", values.get("nodeName")); + } + @Override protected void assertAfterNetworkModificationApplication() { assertEquals(10., getNetwork().getGenerator("idGenerator").getTargetQ(), 0.001);