Skip to content

Commit

Permalink
Add measurements for line and 2wt update modification (#601)
Browse files Browse the repository at this point in the history 
Signed-off-by: David BRAQUART <david.braquart@rte-france.com>
  • Loading branch information
@dbraquart
dbraquart authored Feb 18, 2025
1 parent 518d498 commit 782caf0
Show file tree
Hide file tree
Showing 6 changed files with 282 additions and 0 deletions.
64 changes: 64 additions & 0 deletions ...idsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
}
}
8 changes: 8 additions & 0 deletions ...gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
8 changes: 8 additions & 0 deletions ...tion/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down
163 changes: 163 additions & 0 deletions src/main/resources/db/changelog/changesets/changelog_20250212T095646Z.xml
View file
Original file line number Diff line number Diff line change
@@ -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>
3 changes: 3 additions & 0 deletions src/main/resources/db/changelog/db.changelog-master.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -336,3 +336,6 @@ databaseChangeLog:
- include:
file: changesets/changelog_20250116T103740Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20250212T095646Z.xml
relativeToChangelogFile: true
Loading

0 comments on commit 782caf0

Please sign in to comment.