Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
<sonar.organization>gridsuite</sonar.organization>
<sonar.projectKey>org.gridsuite:network-modification-server</sonar.projectKey>
<!-- TODO network-modification.version remove when upgrading gridsuite dependencies -->
<network-modification.version>0.38.0</network-modification.version>
<network-modification.version>0.39.0-SNAPSHOT</network-modification.version>
<powsybl-balances-adjustment.version>2.14.1</powsybl-balances-adjustment.version>
</properties>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity {
@OrderColumn(name = "pos_operationalLimitsGroups")
private List<OperationalLimitsGroupModificationEntity> operationalLimitsGroups;

@Column(name = "enable_olg_modification", columnDefinition = "boolean default true")
private Boolean enableOLGModification;

@Embedded
@AttributeOverrides(value = {
@AttributeOverride(name = "value", column = @Column(name = "selectedOperationalLimitsGroupId1")),
Expand Down Expand Up @@ -217,6 +220,8 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) {
x = new DoubleModificationEmbedded(branchModificationInfos.getX());
r = new DoubleModificationEmbedded(branchModificationInfos.getR());
this.operationalLimitsGroups = assignOperationalLimitsGroups(branchModificationInfos.getOperationalLimitsGroups(), operationalLimitsGroups);
this.enableOLGModification = branchModificationInfos.getEnableOLGModification() != null ?
branchModificationInfos.getEnableOLGModification() : true;
this.voltageLevelId1 = branchModificationInfos.getVoltageLevelId1() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId1()) : null;
this.voltageLevelId2 = branchModificationInfos.getVoltageLevelId2() != null ? new StringModificationEmbedded(branchModificationInfos.getVoltageLevelId2()) : null;
this.busOrBusbarSectionId1 = branchModificationInfos.getBusOrBusbarSectionId1() != null ? new StringModificationEmbedded(branchModificationInfos.getBusOrBusbarSectionId1()) : null;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ public LineModificationInfos toModificationInfos() {
.connectionName2(toAttributeModification(getConnectionName2()))
.selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
.selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
.enableOLGModification(getEnableOLGModification())
.connectionDirection1(toAttributeModification(getConnectionDirection1()))
.connectionDirection2(toAttributeModification(getConnectionDirection2()))
.connectionPosition1(toAttributeModification(getConnectionPosition1()))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -397,6 +397,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() {
.connectionName2(toAttributeModification(getConnectionName2()))
.selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1()))
.selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2()))
.enableOLGModification(getEnableOLGModification())
.connectionDirection1(toAttributeModification(getConnectionDirection1()))
.connectionDirection2(toAttributeModification(getConnectionDirection2()))
.connectionPosition1(toAttributeModification(getConnectionPosition1()))
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?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="deharbemat (generated)" id="1758636925802-35">
<addColumn tableName="line_modification">
<column defaultValueBoolean="true" name="enable_olg_modification" type="boolean"/>
</addColumn>
</changeSet>
<changeSet author="deharbemat (generated)" id="1758636925802-36">
<addColumn tableName="two_windings_transformer_modification">
<column defaultValueBoolean="true" name="enable_olg_modification" type="boolean"/>
</addColumn>
</changeSet>
</databaseChangeLog>
3 changes: 3 additions & 0 deletions src/main/resources/db/changelog/db.changelog-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -411,3 +411,6 @@ databaseChangeLog:
- include:
file: changesets/changelog_20250921T151431Z.xml
relativeToChangelogFile: true
- include:
file: changesets/changelog_20250923T141508Z.xml
relativeToChangelogFile: true
Loading