Merge branch 'main' into override-message-values-and-message-type

gridsuite · Feb 24, 2025 · bda171b · bda171b
2 parents 431678c + 782caf0
commit bda171b
Show file tree

Hide file tree

Showing 11 changed files with 291 additions and 10 deletions.
diff --git a/pom.xml b/pom.xml
@@ -49,7 +49,7 @@
         <mockwebserver3.version>5.0.0-alpha.14</mockwebserver3.version>
         <liquibase-hibernate-package>org.gridsuite.modification.server</liquibase-hibernate-package>
         <sonar.coverage.exclusions>**/migration/**/*</sonar.coverage.exclusions>
-        <network-modification.version>0.7.0</network-modification.version>
+        <network-modification.version>0.8.0</network-modification.version>
     </properties>
 
     <build>

diff --git a/...idsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java b/...idsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java
@@ -136,6 +136,62 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
     })
     private BooleanModificationEmbedded terminal2Connected;
 
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "p1MeasurementValue")),
+        @AttributeOverride(name = "opType", column = @Column(name = "p1MeasurementValueOp"))
+    })
+    private DoubleModificationEmbedded p1MeasurementValue;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "p1MeasurementValidity")),
+        @AttributeOverride(name = "opType", column = @Column(name = "p1MeasurementValidityOp"))
+    })
+    private BooleanModificationEmbedded p1MeasurementValidity;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "q1MeasurementValue")),
+        @AttributeOverride(name = "opType", column = @Column(name = "q1MeasurementValueOp"))
+    })
+    private DoubleModificationEmbedded q1MeasurementValue;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "q1MeasurementValidity")),
+        @AttributeOverride(name = "opType", column = @Column(name = "q1MeasurementValidityOp"))
+    })
+    private BooleanModificationEmbedded q1MeasurementValidity;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "p2MeasurementValue")),
+        @AttributeOverride(name = "opType", column = @Column(name = "p2MeasurementValueOp"))
+    })
+    private DoubleModificationEmbedded p2MeasurementValue;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "p2MeasurementValidity")),
+        @AttributeOverride(name = "opType", column = @Column(name = "p2MeasurementValidityOp"))
+    })
+    private BooleanModificationEmbedded p2MeasurementValidity;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "q2MeasurementValue")),
+        @AttributeOverride(name = "opType", column = @Column(name = "q2MeasurementValueOp"))
+    })
+    private DoubleModificationEmbedded q2MeasurementValue;
+
+    @Embedded
+    @AttributeOverrides(value = {
+        @AttributeOverride(name = "value", column = @Column(name = "q2MeasurementValidity")),
+        @AttributeOverride(name = "opType", column = @Column(name = "q2MeasurementValidityOp"))
+    })
+    private BooleanModificationEmbedded q2MeasurementValidity;
+
     protected BranchModificationEntity(BranchModificationInfos branchModificationInfos) {
         super(branchModificationInfos);
         assignAttributes(branchModificationInfos);
@@ -173,5 +229,13 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) {
         this.connectionPosition2 = branchModificationInfos.getConnectionPosition2() != null ? new IntegerModificationEmbedded(branchModificationInfos.getConnectionPosition2()) : null;
         this.terminal1Connected = branchModificationInfos.getTerminal1Connected() != null ? new BooleanModificationEmbedded(branchModificationInfos.getTerminal1Connected()) : null;
         this.terminal2Connected = branchModificationInfos.getTerminal2Connected() != null ? new BooleanModificationEmbedded(branchModificationInfos.getTerminal2Connected()) : null;
+        this.p1MeasurementValue = branchModificationInfos.getP1MeasurementValue() != null ? new DoubleModificationEmbedded(branchModificationInfos.getP1MeasurementValue()) : null;
+        this.p1MeasurementValidity = branchModificationInfos.getP1MeasurementValidity() != null ? new BooleanModificationEmbedded(branchModificationInfos.getP1MeasurementValidity()) : null;
+        this.q1MeasurementValue = branchModificationInfos.getQ1MeasurementValue() != null ? new DoubleModificationEmbedded(branchModificationInfos.getQ1MeasurementValue()) : null;
+        this.q1MeasurementValidity = branchModificationInfos.getQ1MeasurementValidity() != null ? new BooleanModificationEmbedded(branchModificationInfos.getQ1MeasurementValidity()) : null;
+        this.p2MeasurementValue = branchModificationInfos.getP2MeasurementValue() != null ? new DoubleModificationEmbedded(branchModificationInfos.getP2MeasurementValue()) : null;
+        this.p2MeasurementValidity = branchModificationInfos.getP2MeasurementValidity() != null ? new BooleanModificationEmbedded(branchModificationInfos.getP2MeasurementValidity()) : null;
+        this.q2MeasurementValue = branchModificationInfos.getQ2MeasurementValue() != null ? new DoubleModificationEmbedded(branchModificationInfos.getQ2MeasurementValue()) : null;
+        this.q2MeasurementValidity = branchModificationInfos.getQ2MeasurementValidity() != null ? new BooleanModificationEmbedded(branchModificationInfos.getQ2MeasurementValidity()) : null;
     }
 }
diff --git a/...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java b/...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java
@@ -106,6 +106,14 @@ public LineModificationInfos toModificationInfos() {
             .b1(toAttributeModification(getB1()))
             .g2(toAttributeModification(getG2()))
             .b2(toAttributeModification(getB2()))
+            .p1MeasurementValue(toAttributeModification(getP1MeasurementValue()))
+            .p1MeasurementValidity(toAttributeModification(getP1MeasurementValidity()))
+            .q1MeasurementValue(toAttributeModification(getQ1MeasurementValue()))
+            .q1MeasurementValidity(toAttributeModification(getQ1MeasurementValidity()))
+            .p2MeasurementValue(toAttributeModification(getP2MeasurementValue()))
+            .p2MeasurementValidity(toAttributeModification(getP2MeasurementValidity()))
+            .q2MeasurementValue(toAttributeModification(getQ2MeasurementValue()))
+            .q2MeasurementValidity(toAttributeModification(getQ2MeasurementValidity()))
              // properties
             .properties(CollectionUtils.isEmpty(getProperties()) ? null :
                         getProperties().stream()

diff --git a/...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
@@ -374,6 +374,14 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
                 .ratedU1(IAttributeModificationEmbeddable.toAttributeModification(getRatedU1()))
                 .ratedU2(IAttributeModificationEmbeddable.toAttributeModification(getRatedU2()))
                 .ratedS(IAttributeModificationEmbeddable.toAttributeModification(getRatedS()))
+                .p1MeasurementValue(toAttributeModification(getP1MeasurementValue()))
+                .p1MeasurementValidity(toAttributeModification(getP1MeasurementValidity()))
+                .q1MeasurementValue(toAttributeModification(getQ1MeasurementValue()))
+                .q1MeasurementValidity(toAttributeModification(getQ1MeasurementValidity()))
+                .p2MeasurementValue(toAttributeModification(getP2MeasurementValue()))
+                .p2MeasurementValidity(toAttributeModification(getP2MeasurementValidity()))
+                .q2MeasurementValue(toAttributeModification(getQ2MeasurementValue()))
+                .q2MeasurementValidity(toAttributeModification(getQ2MeasurementValidity()))
                 // properties
                 .properties(CollectionUtils.isEmpty(getProperties()) ? null :
                         getProperties().stream()

diff --git a/src/main/resources/db/changelog/changesets/changelog_20250212T095646Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250212T095646Z.xml
@@ -0,0 +1,163 @@
+<?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="braquartdav (generated)" id="1739354243909-25">
+        <addColumn tableName="line_modification">
+            <column name="p1measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-26">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p1measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-27">
+        <addColumn tableName="line_modification">
+            <column name="p1measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-28">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p1measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-29">
+        <addColumn tableName="line_modification">
+            <column name="p1measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-30">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p1measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-31">
+        <addColumn tableName="line_modification">
+            <column name="p1measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-32">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p1measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-33">
+        <addColumn tableName="line_modification">
+            <column name="p2measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-34">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p2measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-35">
+        <addColumn tableName="line_modification">
+            <column name="p2measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-36">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p2measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-37">
+        <addColumn tableName="line_modification">
+            <column name="p2measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-38">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p2measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-39">
+        <addColumn tableName="line_modification">
+            <column name="p2measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-40">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="p2measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-41">
+        <addColumn tableName="line_modification">
+            <column name="q1measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-42">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q1measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-43">
+        <addColumn tableName="line_modification">
+            <column name="q1measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-44">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q1measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-45">
+        <addColumn tableName="line_modification">
+            <column name="q1measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-46">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q1measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-47">
+        <addColumn tableName="line_modification">
+            <column name="q1measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-48">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q1measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-49">
+        <addColumn tableName="line_modification">
+            <column name="q2measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-50">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q2measurement_validity" type="boolean"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-51">
+        <addColumn tableName="line_modification">
+            <column name="q2measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-52">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q2measurement_validity_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-53">
+        <addColumn tableName="line_modification">
+            <column name="q2measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-54">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q2measurement_value" type="float(53)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-55">
+        <addColumn tableName="line_modification">
+            <column name="q2measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="braquartdav (generated)" id="1739354243909-56">
+        <addColumn tableName="two_windings_transformer_modification">
+            <column name="q2measurement_value_op" type="varchar(255)"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml
@@ -336,3 +336,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250116T103740Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250212T095646Z.xml
+      relativeToChangelogFile: true
diff --git a/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java b/src/test/java/org/gridsuite/modification/server/ModificationControllerTest.java
@@ -208,8 +208,7 @@ void testEquipmentIdNonNull() {
         String errorMessage = "equipmentId is marked non-null but is null";
         LoadCreationInfosBuilder<?, ?> loadCreationBuilder = LoadCreationInfos.builder();
         assertEquals(errorMessage, assertThrows(NullPointerException.class, loadCreationBuilder::build).getMessage());
-        LoadCreationInfosBuilder<?, ?> loadCreationBuilder1 = loadCreationBuilder.equipmentId(null);
-        assertEquals(errorMessage, assertThrows(NullPointerException.class, loadCreationBuilder1::build).getMessage());
+        assertEquals(errorMessage, assertThrows(NullPointerException.class, () -> loadCreationBuilder.equipmentId(null)).getMessage());
         LoadCreationInfos loadCreationInfos = LoadCreationInfos.builder().equipmentId("idLoad").build();
         assertEquals(errorMessage, assertThrows(NullPointerException.class, () -> loadCreationInfos.setEquipmentId(null)).getMessage());
     }