Skip to content
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.

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

Add substation's tabular modifications. #402

Merged
merged 7 commits into from
Dec 29, 2023
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +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.LoadModificationEntity;
import org.gridsuite.modification.server.entities.equipment.modification.VoltageLevelModificationEntity;
import org.gridsuite.modification.server.entities.equipment.modification.*;

/**
* @author Etienne Homer <etienne.homer at rte-france.com>
Expand Down Expand Up @@ -54,6 +51,9 @@ public TabularModificationEntity(TabularModificationInfos tabularModificationInf
case "VOLTAGE_LEVEL_MODIFICATION":
modifications = tabularModificationInfos.getModifications().stream().map(voltageLevelModificationInfos -> new VoltageLevelModificationEntity((VoltageLevelModificationInfos) voltageLevelModificationInfos)).collect(Collectors.toList());
break;
case "SUBSTATION_MODIFICATION":
modifications = tabularModificationInfos.getModifications().stream().map(subStationModificationInfos -> new SubstationModificationEntity((SubstationModificationInfos) subStationModificationInfos)).collect(Collectors.toList());
break;
default:
break;
}
Expand Down Expand Up @@ -90,6 +90,9 @@ public void update(@NonNull ModificationInfos modificationInfos) {
case "VOLTAGE_LEVEL_MODIFICATION":
modifications.addAll(tabularModificationInfos.getModifications().stream().map(voltageLevelModificationInfos -> new VoltageLevelModificationEntity((VoltageLevelModificationInfos) voltageLevelModificationInfos)).collect(Collectors.toList()));
break;
case "SUBSTATION_MODIFICATION":
modifications.addAll(tabularModificationInfos.getModifications().stream().map(subStationModificationInfos -> new SubstationModificationEntity((SubstationModificationInfos) subStationModificationInfos)).toList());
break;
default:
break;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,9 @@ public void apply(Network network, Reporter subReporter) {
case "VOLTAGE_LEVEL_MODIFICATION":
defaultMessage = "voltage levels" + defaultMessage;
break;
case "SUBSTATION_MODIFICATION":
defaultMessage = "substations" + defaultMessage;
break;
default:
defaultMessage = "equipments of unknown type" + defaultMessage;
break;
Expand Down
Original file line number Diff line number Diff line change
@@ -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 <[email protected]>
*/
@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<ModificationInfos> 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<ModificationInfos> 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<String, String> 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<String, String> updatedValues = mapper.readValue(modificationInfos.getMessageValues(), new TypeReference<>() { });
Assertions.assertEquals(MODIFICATION_TYPE, updatedValues.get("tabularModificationType"));
}
}
Loading