Skip to content

Commit 2492fcc

Browse files
dbraquartdbraquart
committed
Merge remote-tracking branch 'origin/main' into dbraquart/refacto-use-a-single-entity-for-tabulars
# Conflicts: # pom.xml # src/main/resources/db/changelog/db.changelog-master.yaml
2 parents cf5b029 + 4a640aa commit 2492fcc

17 files changed

+183
-21
lines changed

‎pom.xml‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
<sonar.organization>gridsuite</sonar.organization>
5353
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
5454
<!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
55-
<network-modification.version>0.41.0-SNAPSHOT</network-modification.version>
55+
<network-modification.version>0.42.0-SNAPSHOT</network-modification.version>
5656
<powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
5757
</properties>
5858

@@ -207,11 +207,6 @@
207207
<artifactId>powsybl-open-loadflow</artifactId>
208208
<scope>runtime</scope>
209209
</dependency>
210-
<dependency>
211-
<groupId>com.powsybl</groupId>
212-
<artifactId>powsybl-config-classic</artifactId>
213-
<scope>runtime</scope>
214-
</dependency>
215210

216211
<!-- Test dependencies -->
217212
<dependency>

‎src/main/java/org/gridsuite/modification/server/entities/equipment/creation/BatteryCreationEntity.java‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,12 @@ public class BatteryCreationEntity extends InjectionCreationEntity {
6161
@Column(name = "droop")
6262
private Float droop;
6363

64+
@Column(name = "directTransX")
65+
private Double directTransX;
66+
67+
@Column(name = "stepUpTransformerX")
68+
private Double stepUpTransformerX;
69+
6470
public BatteryCreationEntity(@NonNull BatteryCreationInfos batteryCreationInfos) {
6571
super(batteryCreationInfos);
6672
assignAttributes(batteryCreationInfos);
@@ -83,6 +89,8 @@ private void assignAttributes(BatteryCreationInfos batteryCreationInfos) {
8389
this.targetQ = batteryCreationInfos.getTargetQ();
8490
this.participate = batteryCreationInfos.getParticipate();
8591
this.droop = batteryCreationInfos.getDroop();
92+
this.directTransX = batteryCreationInfos.getDirectTransX();
93+
this.stepUpTransformerX = batteryCreationInfos.getStepUpTransformerX();
8694
}
8795

8896
@Override
@@ -117,6 +125,8 @@ public BatteryCreationInfos toModificationInfos() {
117125
.targetQ(getTargetQ())
118126
.participate(getParticipate())
119127
.droop(getDroop())
128+
.directTransX(getDirectTransX())
129+
.stepUpTransformerX(getStepUpTransformerX())
120130
// properties
121131
.properties(CollectionUtils.isEmpty(getProperties()) ? null :
122132
getProperties().stream()

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BatteryModificationEntity.java‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,16 @@ public class BatteryModificationEntity extends InjectionModificationEntity {
6363
})
6464
private FloatModificationEmbedded droop;
6565

66+
@Embedded
67+
@AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "directTransX")), @AttributeOverride(name = "opType", column = @Column(name = "directTransxOp"))
68+
})
69+
private DoubleModificationEmbedded directTransX;
70+
71+
@Embedded
72+
@AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "stepUpTransformerX")), @AttributeOverride(name = "opType", column = @Column(name = "stepUpTransformerxOp"))
73+
})
74+
private DoubleModificationEmbedded stepUpTransformerX;
75+
6676
@Embedded
6777
@AttributeOverrides(value = {@AttributeOverride(name = "value", column = @Column(name = "minQ")), @AttributeOverride(name = "opType", column = @Column(name = "minqOp"))
6878
})
@@ -102,6 +112,8 @@ private void assignAttributes(BatteryModificationInfos batteryModificationInfos)
102112
this.maxQ = batteryModificationInfos.getMaxQ() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getMaxQ()) : null;
103113
this.participate = batteryModificationInfos.getParticipate() != null ? new BooleanModificationEmbedded(batteryModificationInfos.getParticipate()) : null;
104114
this.droop = batteryModificationInfos.getDroop() != null ? new FloatModificationEmbedded(batteryModificationInfos.getDroop()) : null;
115+
this.directTransX = batteryModificationInfos.getDirectTransX() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getDirectTransX()) : null;
116+
this.stepUpTransformerX = batteryModificationInfos.getStepUpTransformerX() != null ? new DoubleModificationEmbedded(batteryModificationInfos.getStepUpTransformerX()) : null;
105117
this.reactiveCapabilityCurve = batteryModificationInfos.getReactiveCapabilityCurve() != null ? new BooleanModificationEmbedded(batteryModificationInfos.getReactiveCapabilityCurve()) : null;
106118
this.reactiveCapabilityCurvePoints = toEmbeddablePoints(batteryModificationInfos.getReactiveCapabilityCurvePoints());
107119
}
@@ -134,6 +146,8 @@ public BatteryModificationInfos toModificationInfos() {
134146
.maxQ(toAttributeModification(getMaxQ()))
135147
.participate(toAttributeModification(getParticipate()))
136148
.droop(toAttributeModification(getDroop()))
149+
.directTransX(toAttributeModification(getDirectTransX()))
150+
.stepUpTransformerX(toAttributeModification(getStepUpTransformerX()))
137151
.reactiveCapabilityCurve(toAttributeModification(getReactiveCapabilityCurve()))
138152
.reactiveCapabilityCurvePoints(DTOUtils.toReactiveCapabilityCurvePointsModificationInfos(getReactiveCapabilityCurvePoints()))
139153
// properties

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,9 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
4747
@OrderColumn(name = "pos_operationalLimitsGroups")
4848
private List<OperationalLimitsGroupModificationEntity> operationalLimitsGroups;
4949

50+
@Column(name = "enable_olg_modification", columnDefinition = "boolean default true")
51+
private Boolean enableOLGModification;
52+
5053
@Embedded
5154
@AttributeOverrides(value = {
5255
@AttributeOverride(name = "value", column = @Column(name = "selectedOperationalLimitsGroupId1")),
@@ -217,6 +220,7 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) {
217220
x = new DoubleModificationEmbedded(branchModificationInfos.getX());
218221
r = new DoubleModificationEmbedded(branchModificationInfos.getR());
219222
this.operationalLimitsGroups = assignOperationalLimitsGroups(branchModificationInfos.getOperationalLimitsGroups(), operationalLimitsGroups);
223+
this.enableOLGModification = branchModificationInfos.getEnableOLGModification() == null || branchModificationInfos.getEnableOLGModification();
220224
this.voltageLevelId1 = branchModificationInfos.getVoltageLevelId1() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId1()) : null;
221225
this.voltageLevelId2 = branchModificationInfos.getVoltageLevelId2() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId2()) : null;
222226
this.busOrBusbarSectionId1 = branchModificationInfos.getBusOrBusbarSectionId1() != null ? new StringModificationEmbedded(branchModificationInfos.getBusOrBusbarSectionId1()) : null;

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ public LineModificationInfos toModificationInfos() {
9696
.connectionName2(toAttributeModification(getConnectionName2()))
9797
.selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
9898
.selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
99+
.enableOLGModification(getEnableOLGModification())
99100
.connectionDirection1(toAttributeModification(getConnectionDirection1()))
100101
.connectionDirection2(toAttributeModification(getConnectionDirection2()))
101102
.connectionPosition1(toAttributeModification(getConnectionPosition1()))

‎src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -397,6 +397,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
397397
.connectionName2(toAttributeModification(getConnectionName2()))
398398
.selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
399399
.selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
400+
.enableOLGModification(getEnableOLGModification())
400401
.connectionDirection1(toAttributeModification(getConnectionDirection1()))
401402
.connectionDirection2(toAttributeModification(getConnectionDirection2()))
402403
.connectionPosition1(toAttributeModification(getConnectionPosition1()))

‎src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<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">
3+
<changeSet author="deharbemat (generated)" id="1758636925802-35">
4+
<addColumn tableName="line_modification">
5+
<column defaultValueBoolean="true" name="enable_olg_modification" type="boolean"/>
6+
</addColumn>
7+
</changeSet>
8+
<changeSet author="deharbemat (generated)" id="1758636925802-36">
9+
<addColumn tableName="two_windings_transformer_modification">
10+
<column defaultValueBoolean="true" name="enable_olg_modification" type="boolean"/>
11+
</addColumn>
12+
</changeSet>
13+
</databaseChangeLog>

‎src/main/resources/db/changelog/changesets/changelog_20251003T070056Z.xml‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.1" encoding="UTF-8" standalone="no"?>
2+
<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">
3+
<changeSet author="lesoteti (generated)" id="1759474876222-35">
4+
<addColumn tableName="battery_creation">
5+
<column name="direct_transx" type="float(53)"/>
6+
</addColumn>
7+
</changeSet>
8+
<changeSet author="lesoteti (generated)" id="1759474876222-36">
9+
<addColumn tableName="battery_modification">
10+
<column name="direct_transx" type="float(53)"/>
11+
</addColumn>
12+
</changeSet>
13+
<changeSet author="lesoteti (generated)" id="1759474876222-37">
14+
<addColumn tableName="battery_modification">
15+
<column name="direct_transx_op" type="varchar(255)"/>
16+
</addColumn>
17+
</changeSet>
18+
<changeSet author="lesoteti (generated)" id="1759474876222-38">
19+
<addColumn tableName="battery_creation">
20+
<column name="step_up_transformerx" type="float(53)"/>
21+
</addColumn>
22+
</changeSet>
23+
<changeSet author="lesoteti (generated)" id="1759474876222-39">
24+
<addColumn tableName="battery_modification">
25+
<column name="step_up_transformerx" type="float(53)"/>
26+
</addColumn>
27+
</changeSet>
28+
<changeSet author="lesoteti (generated)" id="1759474876222-40">
29+
<addColumn tableName="battery_modification">
30+
<column name="step_up_transformerx_op" type="varchar(255)"/>
31+
</addColumn>
32+
</changeSet>
33+
</databaseChangeLog>

‎src/main/resources/db/changelog/db.changelog-master.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -411,6 +411,13 @@ databaseChangeLog:
411411
- include:
412412
file: changesets/changelog_20250921T151431Z.xml
413413
relativeToChangelogFile: true
414+
- include:
415+
file: changesets/changelog_20251003T070056Z.xml
416+
relativeToChangelogFile: true
417+
- include:
418+
file: changesets/changelog_20250923T141508Z.xml
419+
relativeToChangelogFile: true
420+
414421
- include:
415422
file: changesets/changelog_20250930T101841Z.xml
416423
relativeToChangelogFile: true

‎src/test/java/org/gridsuite/modification/server/modifications/BatteryCreationInBusBreakerTest.java‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,8 @@ protected ModificationInfos buildModification() {
5656
.minQ(20.0)
5757
.maxQ(25.0)
5858
.droop(5f)
59+
.stepUpTransformerX(60.0)
60+
.directTransX(61.0)
5961
.participate(true)
6062
.reactiveCapabilityCurve(true)
6163
.reactiveCapabilityCurvePoints(Arrays.asList(new ReactiveCapabilityCurvePointsInfos(2.0, 3.0, 3.1),
@@ -81,6 +83,8 @@ protected ModificationInfos buildModificationUpdate() {
8183
.minQ(23.0)
8284
.maxQ(26.0)
8385
.droop(6f)
86+
.stepUpTransformerX(61.0)
87+
.directTransX(62.0)
8488
.participate(true)
8589
.reactiveCapabilityCurve(true)
8690
.reactiveCapabilityCurvePoints(Arrays.asList(new ReactiveCapabilityCurvePointsInfos(1.0, 2.0, 2.1),

0 commit comments

Comments
 (0)