Homogenize voltage level attributes (#425)

* Homogenize Voltage level attributes --------- Signed-off-by: maissa SOUISSI <maissa.souissi@rte-france.com>
gridsuite · Feb 21, 2024 · 8f9ebc6 · 8f9ebc6
1 parent c6ec679
commit 8f9ebc6
Show file tree

Hide file tree

Showing 18 changed files with 54 additions and 30 deletions.
diff --git a/src/main/java/org/gridsuite/modification/server/dto/VoltageLevelCreationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/VoltageLevelCreationInfos.java
@@ -40,7 +40,7 @@ public class VoltageLevelCreationInfos extends EquipmentCreationInfos {
     private String substationId;
 
     @Schema(description = "nominal voltage in kV")
-    private double nominalVoltage;
+    private double nominalV;
 
     @Schema(description = "low voltage limit in kV")
     private Double lowVoltageLimit;

diff --git a/src/main/java/org/gridsuite/modification/server/dto/VoltageLevelModificationInfos.java b/src/main/java/org/gridsuite/modification/server/dto/VoltageLevelModificationInfos.java
@@ -33,7 +33,7 @@
 @ModificationErrorTypeName("MODIFY_VOLTAGE_LEVEL_ERROR")
 public class VoltageLevelModificationInfos extends BasicEquipmentModificationInfos {
     @Schema(description = "nominal voltage in kV")
-    private AttributeModification<Double> nominalVoltage;
+    private AttributeModification<Double> nominalV;
 
     @Schema(description = "low voltage limit in kV")
     private AttributeModification<Double> lowVoltageLimit;

diff --git a/...gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java b/...gridsuite/modification/server/entities/equipment/creation/VoltageLevelCreationEntity.java
@@ -35,7 +35,7 @@ public class VoltageLevelCreationEntity extends EquipmentCreationEntity {
     private String substationId;
 
     @Column
-    private double nominalVoltage;
+    private double nominalV;
 
     @Column
     private Double lowVoltageLimit;
@@ -97,7 +97,7 @@ public VoltageLevelCreationInfos toVoltageLevelCreationInfos() {
                 .equipmentId(getEquipmentId())
                 .equipmentName(getEquipmentName())
                 .substationId(getSubstationId())
-                .nominalVoltage(getNominalVoltage())
+                .nominalV(getNominalV())
                 .lowVoltageLimit(getLowVoltageLimit())
                 .highVoltageLimit(getHighVoltageLimit())
                 .ipMin(getIpMin())
@@ -116,7 +116,7 @@ public void update(@NonNull ModificationInfos modificationInfos) {
 
     private void assignAttributes(VoltageLevelCreationInfos voltageLevelCreationInfos) {
         this.substationId = voltageLevelCreationInfos.getSubstationId();
-        this.nominalVoltage = voltageLevelCreationInfos.getNominalVoltage();
+        this.nominalV = voltageLevelCreationInfos.getNominalV();
         this.lowVoltageLimit = voltageLevelCreationInfos.getLowVoltageLimit();
         this.highVoltageLimit = voltageLevelCreationInfos.getHighVoltageLimit();
         this.ipMin = voltageLevelCreationInfos.getIpMin();

diff --git a/...e/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java b/...e/modification/server/entities/equipment/modification/VoltageLevelModificationEntity.java
@@ -37,10 +37,10 @@
 public class VoltageLevelModificationEntity extends BasicEquipmentModificationEntity {
     @Embedded
     @AttributeOverrides(value = {
-        @AttributeOverride(name = "value", column = @Column(name = "nominalVoltage")),
-        @AttributeOverride(name = "opType", column = @Column(name = "nominalVoltageOp"))
+        @AttributeOverride(name = "value", column = @Column(name = "nominalV")),
+        @AttributeOverride(name = "opType", column = @Column(name = "nominalV_Op"))
     })
-    private DoubleModificationEmbedded nominalVoltage;
+    private DoubleModificationEmbedded nominalV;
 
     @Embedded
     @AttributeOverrides(value = {
@@ -82,7 +82,7 @@ public void update(@NonNull ModificationInfos modificationInfos) {
     }
 
     private void assignAttributes(VoltageLevelModificationInfos voltageLevelModificationInfos) {
-        this.nominalVoltage = new DoubleModificationEmbedded(voltageLevelModificationInfos.getNominalVoltage());
+        this.nominalV = new DoubleModificationEmbedded(voltageLevelModificationInfos.getNominalV());
         this.lowVoltageLimit = new DoubleModificationEmbedded(voltageLevelModificationInfos.getLowVoltageLimit());
         this.highVoltageLimit = new DoubleModificationEmbedded(voltageLevelModificationInfos.getHighVoltageLimit());
         this.ipMin = new DoubleModificationEmbedded(voltageLevelModificationInfos.getIpMin());
@@ -101,7 +101,7 @@ public VoltageLevelModificationInfos toModificationInfos() {
                 .date(getDate())
                 .stashed(getStashed())
                 .equipmentName(toAttributeModification(getEquipmentNameValue(), getEquipmentNameOp()))
-                .nominalVoltage(toAttributeModification(getNominalVoltage()))
+                .nominalV(toAttributeModification(getNominalV()))
                 .lowVoltageLimit(toAttributeModification(getLowVoltageLimit()))
                 .highVoltageLimit(toAttributeModification(getHighVoltageLimit()))
                 .ipMin(toAttributeModification(this.getIpMin()))

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java b/src/main/java/org/gridsuite/modification/server/modifications/ModificationUtils.java
@@ -308,7 +308,7 @@ void createVoltageLevel(VoltageLevelCreationInfos voltageLevelCreationInfos,
             .setId(voltageLevelCreationInfos.getEquipmentId())
             .setName(voltageLevelCreationInfos.getEquipmentName())
             .setTopologyKind(TopologyKind.NODE_BREAKER)
-            .setNominalV(voltageLevelCreationInfos.getNominalVoltage())
+            .setNominalV(voltageLevelCreationInfos.getNominalV())
             .add();
 
         if (voltageLevelCreationInfos.getLowVoltageLimit() != null) {

diff --git a/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java b/src/main/java/org/gridsuite/modification/server/modifications/VoltageLevelModification.java
@@ -85,7 +85,7 @@ public void apply(Network network, Reporter subReporter) {
                 .build());
 
         ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setName, () -> voltageLevel.getOptionalName().orElse("No value"), modificationInfos.getEquipmentName(), subReporter, "Name");
-        ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setNominalV, voltageLevel::getNominalV, modificationInfos.getNominalVoltage(), subReporter, "Nominal voltage");
+        ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setNominalV, voltageLevel::getNominalV, modificationInfos.getNominalV(), subReporter, "Nominal voltage");
         ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setLowVoltageLimit, voltageLevel::getLowVoltageLimit, modificationInfos.getLowVoltageLimit(), subReporter, "Low voltage limit");
         ModificationUtils.getInstance().applyElementaryModifications(voltageLevel::setHighVoltageLimit, voltageLevel::getHighVoltageLimit, modificationInfos.getHighVoltageLimit(), subReporter, "High voltage limit");
 

diff --git a/src/main/resources/db/changelog/changesets/changelog_20240126T123545Z.xml b/src/main/resources/db/changelog/changesets/changelog_20240126T123545Z.xml
@@ -0,0 +1,21 @@
+<?xml version="1.1" encoding="UTF-8" standalone="no"?>
+<databaseChangeLog xmlns="http://www.liquibase.org/xml/ns/dbchangelog" xmlns:ext="http://www.liquibase.org/xml/ns/dbchangelog-ext" xmlns:pro="http://www.liquibase.org/xml/ns/pro" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog-ext http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-ext.xsd http://www.liquibase.org/xml/ns/pro http://www.liquibase.org/xml/ns/pro/liquibase-pro-latest.xsd http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-latest.xsd">
+    <changeSet author="souissimai (generated)" id="1706272561275-29">
+        <renameColumn tableName="voltage_level_creation_entity"
+                      columnDataType="float(53)"
+                      oldColumnName="nominal_voltage"
+                      newColumnName="nominalv" />
+    </changeSet>
+    <changeSet author="souissimai (generated)" id="1706272561275-30">
+        <renameColumn tableName="voltage_level_modification"
+                      columnDataType="float(53)"
+                      oldColumnName="nominal_voltage"
+                      newColumnName="nominalv" />
+    </changeSet>
+    <changeSet author="souissimai (generated)" id="1706272561275-31">
+        <renameColumn tableName="voltage_level_modification"
+                      columnDataType="float(53)"
+                      oldColumnName="nominal_voltage_op"
+                      newColumnName="nominalv_op" />
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -249,12 +249,15 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20240206T134814Z.xml
       relativeToChangelogFile: true
-  - include:    
+  - include:
       file: changesets/changelog_20240206T095518Z.xml
       relativeToChangelogFile: true
   - include:
       file: changesets/changelog_20240215T140011Z.xml
       relativeToChangelogFile: true
   - include:
       file: changesets/changelog_20240117T133229Z.xml
+      relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20240126T123545Z.xml
       relativeToChangelogFile: true
diff --git a/...java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java b/...java/org/gridsuite/modification/server/modifications/LineAttachToNewVoltageLevelTest.java
@@ -42,7 +42,7 @@ private VoltageLevelCreationInfos getNewVoltageLevel() {
                 .stashed(false)
                 .equipmentId("newVoltageLevel")
                 .equipmentName("NewVoltageLevel")
-                .nominalVoltage(379.3)
+                .nominalV(379.3)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/...st/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevelTest.java b/...st/java/org/gridsuite/modification/server/modifications/LineAttachToVoltageLevelTest.java
@@ -50,7 +50,7 @@ private VoltageLevelCreationInfos getNewVoltageLevel() {
                 .stashed(false)
                 .equipmentId("newVoltageLevel")
                 .equipmentName("NewVoltageLevel")
-                .nominalVoltage(379.3)
+                .nominalV(379.3)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/...ava/org/gridsuite/modification/server/modifications/LineSplitWithNewVoltageLevelTest.java b/...ava/org/gridsuite/modification/server/modifications/LineSplitWithNewVoltageLevelTest.java
@@ -58,7 +58,7 @@ protected ModificationInfos buildModification() {
                 .stashed(false)
                 .equipmentId("newVoltageLevel")
                 .equipmentName("NewVoltageLevel")
-                .nominalVoltage(379.3)
+                .nominalV(379.3)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/...t/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java b/...t/java/org/gridsuite/modification/server/modifications/LineSplitWithVoltageLevelTest.java
@@ -63,7 +63,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .stashed(false)
                 .equipmentId("newVoltageLevel")
                 .equipmentName("NewVoltageLevel")
-                .nominalVoltage(379.3)
+                .nominalV(379.3)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/VoltageLevelCreationTest.java
@@ -55,7 +55,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .equipmentId("VoltageLevelIdEdited")
                 .equipmentName("VoltageLevelEdited")
                 .substationId("s2")
-                .nominalVoltage(385)
+                .nominalV(385)
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
                 .ipMin(0.0)

diff --git a/...st/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java b/...st/java/org/gridsuite/modification/server/modifications/VoltageLevelModificationTest.java
@@ -46,7 +46,7 @@ protected ModificationInfos buildModification() {
                 .stashed(false)
                 .equipmentId("v1")
                 .equipmentName(new AttributeModification<>("test 1", OperationType.SET))
-                .nominalVoltage(new AttributeModification<>(420D, OperationType.SET))
+                .nominalV(new AttributeModification<>(420D, OperationType.SET))
                 .lowVoltageLimit(new AttributeModification<>(30D, OperationType.SET))
                 .highVoltageLimit(new AttributeModification<>(50D, OperationType.SET))
                 .ipMax(new AttributeModification<>(0.8, OperationType.SET))
@@ -60,7 +60,7 @@ protected ModificationInfos buildModificationUpdate() {
                 .stashed(false)
                 .equipmentId("v1Edited")
                 .equipmentName(new AttributeModification<>("test 2", OperationType.SET))
-                .nominalVoltage(new AttributeModification<>(450D, OperationType.SET))
+                .nominalV(new AttributeModification<>(450D, OperationType.SET))
                 .lowVoltageLimit(new AttributeModification<>(40D, OperationType.SET))
                 .highVoltageLimit(new AttributeModification<>(55D, OperationType.SET))
                 .ipMax(new AttributeModification<>(0.9, OperationType.SET))

diff --git a/...ation/server/modifications/tabularmodifications/TabularVoltageLevelModificationsTest.java b/...ation/server/modifications/tabularmodifications/TabularVoltageLevelModificationsTest.java
@@ -36,8 +36,8 @@ protected Network createNetwork(UUID networkUuid) {
     @Override
     protected ModificationInfos buildModification() {
         List<ModificationInfos> modifications = List.of(
-                VoltageLevelModificationInfos.builder().equipmentId("v1").nominalVoltage(new AttributeModification<>(300., OperationType.SET)).highVoltageLimit(new AttributeModification<>(400., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(299., OperationType.SET)).build(),
-                VoltageLevelModificationInfos.builder().equipmentId("v2").nominalVoltage(new AttributeModification<>(300., OperationType.SET)).highVoltageLimit(new AttributeModification<>(400., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(299., OperationType.SET)).build()
+                VoltageLevelModificationInfos.builder().equipmentId("v1").nominalV(new AttributeModification<>(300., OperationType.SET)).highVoltageLimit(new AttributeModification<>(400., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(299., OperationType.SET)).build(),
+                VoltageLevelModificationInfos.builder().equipmentId("v2").nominalV(new AttributeModification<>(300., OperationType.SET)).highVoltageLimit(new AttributeModification<>(400., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(299., OperationType.SET)).build()
         );
         return TabularModificationInfos.builder()
                 .modificationType(ModificationType.VOLTAGE_LEVEL_MODIFICATION)
@@ -49,8 +49,8 @@ protected ModificationInfos buildModification() {
     @Override
     protected ModificationInfos buildModificationUpdate() {
         List<ModificationInfos> modifications = List.of(
-                VoltageLevelModificationInfos.builder().equipmentId("v1").nominalVoltage(new AttributeModification<>(500., OperationType.SET)).highVoltageLimit(new AttributeModification<>(502., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(499., OperationType.SET)).build(),
-                VoltageLevelModificationInfos.builder().equipmentId("v2").nominalVoltage(new AttributeModification<>(500., OperationType.SET)).highVoltageLimit(new AttributeModification<>(502., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(499., OperationType.SET)).build()
+                VoltageLevelModificationInfos.builder().equipmentId("v1").nominalV(new AttributeModification<>(500., OperationType.SET)).highVoltageLimit(new AttributeModification<>(502., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(499., OperationType.SET)).build(),
+                VoltageLevelModificationInfos.builder().equipmentId("v2").nominalV(new AttributeModification<>(500., OperationType.SET)).highVoltageLimit(new AttributeModification<>(502., OperationType.SET)).lowVoltageLimit(new AttributeModification<>(499., OperationType.SET)).build()
         );
         return TabularModificationInfos.builder()
                 .modificationType(ModificationType.VOLTAGE_LEVEL_MODIFICATION)

diff --git a/src/test/java/org/gridsuite/modification/server/service/BuildTest.java b/src/test/java/org/gridsuite/modification/server/service/BuildTest.java
@@ -265,7 +265,7 @@ public void runBuildForLineSplits() throws Exception {
         entities2.add(VoltageLevelCreationInfos.builder()
                 .equipmentId("vl9")
                 .equipmentName("vl9")
-                .nominalVoltage(225)
+                .nominalV(225)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
@@ -357,7 +357,7 @@ public void testIndexationAfterBuild() throws Exception {
         equipmentsToAdd.add(VoltageLevelCreationInfos.builder()
                 .equipmentId("vl1")
                 .equipmentName("vl1")
-                .nominalVoltage(225)
+                .nominalV(225)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
@@ -562,7 +562,7 @@ public void runBuildTest() throws Exception {
         entities2.add(VoltageLevelCreationInfos.builder()
                 .equipmentId("vl9")
                 .equipmentName("vl9")
-                .nominalVoltage(225)
+                .nominalV(225)
                 .substationId("s1")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)

diff --git a/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java b/src/test/java/org/gridsuite/modification/server/service/ModificationRepositoryTest.java
@@ -721,7 +721,7 @@ public void testVoltageLevelCreation() {
                 .equipmentId("idVL1")
                 .equipmentName("VLName")
                 .substationId("s1")
-                .nominalVoltage(379.0)
+                .nominalV(379.0)
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
                 .ipMin(0.0)
@@ -755,7 +755,7 @@ public void testVoltageLevelCreation() {
     private VoltageLevelCreationInfos makeAVoltageLevelInfos() {
 
         VoltageLevelCreationInfos createVoltLvlEntity1 = VoltageLevelCreationInfos.builder()
-                .substationId("s1").nominalVoltage(379.0).equipmentId("idVL1").equipmentName("VLName")
+                .substationId("s1").nominalV(379.0).equipmentId("idVL1").equipmentName("VLName")
                 .lowVoltageLimit(0.0)
                 .highVoltageLimit(10.0)
                 .ipMin(0.0)

diff --git a/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java b/src/test/java/org/gridsuite/modification/server/utils/ModificationCreation.java
@@ -30,7 +30,7 @@ public static VoltageLevelCreationInfos getCreationVoltageLevel(String substatio
             .equipmentId(voltageLevelId)
             .equipmentName(voltageLevelName)
             .substationId(substationId)
-            .nominalVoltage(379.1)
+            .nominalV(379.1)
             .lowVoltageLimit(0.0)
             .highVoltageLimit(10.0)
             .ipMin(0.0)