From bc9971e1e639972ac54523255285b3335e700bf1 Mon Sep 17 00:00:00 2001 From: AAJELLAL <128486125+AAJELLAL@users.noreply.github.com> Date: Fri, 29 Dec 2023 15:00:29 +0100 Subject: [PATCH] Add substation tabular modifications. (#402) Signed-off-by: AAJELLAL --- .../entities/TabularModificationEntity.java | 13 +-- .../modifications/TabularModification.java | 3 + .../TabularSubstationModificationsTest.java | 96 +++++++++++++++++++ 3 files changed, 106 insertions(+), 6 deletions(-) create mode 100644 src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularSubstationModificationsTest.java diff --git a/src/main/java/org/gridsuite/modification/server/entities/TabularModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/TabularModificationEntity.java index 61b930bfb..8f649fad0 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/TabularModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/TabularModificationEntity.java @@ -16,12 +16,7 @@ import java.util.stream.Collectors; import org.gridsuite.modification.server.dto.*; -import org.gridsuite.modification.server.entities.equipment.modification.BatteryModificationEntity; -import org.gridsuite.modification.server.entities.equipment.modification.GeneratorModificationEntity; -import org.gridsuite.modification.server.entities.equipment.modification.LineModificationEntity; -import org.gridsuite.modification.server.entities.equipment.modification.LoadModificationEntity; -import org.gridsuite.modification.server.entities.equipment.modification.TwoWindingsTransformerModificationEntity; -import org.gridsuite.modification.server.entities.equipment.modification.VoltageLevelModificationEntity; +import org.gridsuite.modification.server.entities.equipment.modification.*; /** * @author Etienne Homer @@ -62,6 +57,9 @@ public TabularModificationEntity(TabularModificationInfos tabularModificationInf case "LINE_MODIFICATION": modifications = tabularModificationInfos.getModifications().stream().map(lineModificationInfos -> new LineModificationEntity((LineModificationInfos) lineModificationInfos)).collect(Collectors.toList()); break; + case "SUBSTATION_MODIFICATION": + modifications = tabularModificationInfos.getModifications().stream().map(subStationModificationInfos -> new SubstationModificationEntity((SubstationModificationInfos) subStationModificationInfos)).collect(Collectors.toList()); + break; default: break; } @@ -104,6 +102,9 @@ public void update(@NonNull ModificationInfos modificationInfos) { case "LINE_MODIFICATION": modifications.addAll(tabularModificationInfos.getModifications().stream().map(lineModificationInfos -> new LineModificationEntity((LineModificationInfos) lineModificationInfos)).collect(Collectors.toList())); break; + case "SUBSTATION_MODIFICATION": + modifications.addAll(tabularModificationInfos.getModifications().stream().map(subStationModificationInfos -> new SubstationModificationEntity((SubstationModificationInfos) subStationModificationInfos)).toList()); + break; default: break; } diff --git a/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java b/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java index 4ef29469d..a71181182 100644 --- a/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java +++ b/src/main/java/org/gridsuite/modification/server/modifications/TabularModification.java @@ -80,6 +80,9 @@ public void apply(Network network, Reporter subReporter) { case "LINE_MODIFICATION": defaultMessage = "lines" + defaultMessage; break; + case "SUBSTATION_MODIFICATION": + defaultMessage = "substations" + defaultMessage; + break; default: defaultMessage = "equipments of unknown type" + defaultMessage; break; diff --git a/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularSubstationModificationsTest.java b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularSubstationModificationsTest.java new file mode 100644 index 000000000..39f06bdf9 --- /dev/null +++ b/src/test/java/org/gridsuite/modification/server/modifications/tabularmodifications/TabularSubstationModificationsTest.java @@ -0,0 +1,96 @@ +/** + * Copyright (c) 2023, 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.modifications.tabularmodifications; + +import com.fasterxml.jackson.core.type.TypeReference; +import com.powsybl.iidm.network.Country; +import com.powsybl.iidm.network.Network; +import lombok.SneakyThrows; +import org.gridsuite.modification.server.dto.*; +import org.gridsuite.modification.server.modifications.AbstractNetworkModificationTest; +import org.gridsuite.modification.server.utils.NetworkCreation; +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Tag; + +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import static org.junit.Assert.assertEquals; + +/** + * @author AJELLAL Ali + */ +@Tag("IntegrationTest") +public class TabularSubstationModificationsTest extends AbstractNetworkModificationTest { + public static final String MODIFICATION_TYPE = "SUBSTATION_MODIFICATION"; + + @Override + protected Network createNetwork(UUID networkUuid) { + return NetworkCreation.create(networkUuid, true); + } + + @Override + protected ModificationInfos buildModification() { + + List modifications = List.of( + SubstationModificationInfos.builder().equipmentId("s1").equipmentName(new AttributeModification<>("s1", OperationType.SET)).substationCountry(new AttributeModification<>(Country.BE, OperationType.SET)).build(), + SubstationModificationInfos.builder().equipmentId("s2").equipmentName(new AttributeModification<>("s2", OperationType.SET)).substationCountry(new AttributeModification<>(Country.BE, OperationType.SET)).build() + ); + return TabularModificationInfos.builder() + .modificationType(MODIFICATION_TYPE) + .modifications(modifications) + .stashed(false) + .build(); + } + + @Override + protected ModificationInfos buildModificationUpdate() { + List modifications = List.of( + SubstationModificationInfos.builder().equipmentId("s1").equipmentName(new AttributeModification<>("s1", OperationType.SET)).substationCountry(new AttributeModification<>(Country.JP, OperationType.SET)).build(), + SubstationModificationInfos.builder().equipmentId("s2").equipmentName(new AttributeModification<>("s2", OperationType.SET)).substationCountry(new AttributeModification<>(Country.JP, OperationType.SET)).build() + ); + return TabularModificationInfos.builder() + .modificationType(MODIFICATION_TYPE) + .modifications(modifications) + .stashed(false) + .build(); + } + + @Override + protected void assertAfterNetworkModificationCreation() { + assertEquals(Country.BE, getNetwork().getSubstation("s1").getCountry().orElse(Country.AF)); + assertEquals("s1", getNetwork().getSubstation("s1").getOptionalName().orElse("s2")); + assertEquals(Country.BE, getNetwork().getSubstation("s2").getCountry().orElse(Country.AF)); + assertEquals("s2", getNetwork().getSubstation("s2").getOptionalName().orElse("s1")); + } + + @Override + protected void assertAfterNetworkModificationDeletion() { + assertEquals(Country.FR, getNetwork().getSubstation("s1").getCountry().orElse(Country.BE)); + assertEquals("s1", getNetwork().getSubstation("s1").getOptionalName().orElse("s2")); + assertEquals(Country.FR, getNetwork().getSubstation("s2").getCountry().orElse(Country.BE)); + assertEquals("s2", getNetwork().getSubstation("s2").getOptionalName().orElse("s1")); + } + + @Override + @SneakyThrows + protected void testCreationModificationMessage(ModificationInfos modificationInfos) { + assertEquals("TABULAR_MODIFICATION", modificationInfos.getMessageType()); + Map createdValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { }); + Assertions.assertEquals(MODIFICATION_TYPE, createdValues.get("tabularModificationType")); + } + + @Override + @SneakyThrows + protected void testUpdateModificationMessage(ModificationInfos modificationInfos) { + assertEquals("TABULAR_MODIFICATION", modificationInfos.getMessageType()); + Map updatedValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { }); + Assertions.assertEquals(MODIFICATION_TYPE, updatedValues.get("tabularModificationType")); + } +}