From 633352e41f0f76520da995d64b4c07bd29bf44e5 Mon Sep 17 00:00:00 2001 From: Mathieu DEHARBE Date: Tue, 23 Sep 2025 17:21:36 +0200 Subject: [PATCH 1/4] edit olg switch (adds editedOperationalLimitsGroups) Signed-off-by: Mathieu DEHARBE --- pom.xml | 1 + .../modification/BranchModificationEntity.java | 5 +++++ .../modification/LineModificationEntity.java | 1 + .../TwoWindingsTransformerModificationEntity.java | 1 + .../changesets/changelog_20250923T141508Z.xml | 13 +++++++++++++ .../resources/db/changelog/db.changelog-master.yaml | 3 +++ 6 files changed, 24 insertions(+) create mode 100644 src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml diff --git a/pom.xml b/pom.xml index 0568dcd23..db2bcb174 100644 --- a/pom.xml +++ b/pom.xml @@ -54,6 +54,7 @@ 0.36.0 2.14.1 + 0.37.0-SNAPSHOT diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java index 4119722be..ae21abeb4 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java @@ -47,6 +47,9 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity { @OrderColumn(name = "pos_operationalLimitsGroups") private List operationalLimitsGroups; + @Column(name = "editedOperationalLimitsGroups", columnDefinition = "boolean default false") + private Boolean editedOperationalLimitsGroups; + @Embedded @AttributeOverrides(value = { @AttributeOverride(name = "value", column = @Column(name = "selectedOperationalLimitsGroupId1")), @@ -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.editedOperationalLimitsGroups = branchModificationInfos.getEditedOperationalLimitsGroups() != null ? + branchModificationInfos.getEditedOperationalLimitsGroups() : 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; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java index ad5bb4408..3ce6d3b53 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java @@ -96,6 +96,7 @@ public LineModificationInfos toModificationInfos() { .connectionName2(toAttributeModification(getConnectionName2())) .selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1())) .selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2())) + .editedOperationalLimitsGroups(getEditedOperationalLimitsGroups()) .connectionDirection1(toAttributeModification(getConnectionDirection1())) .connectionDirection2(toAttributeModification(getConnectionDirection2())) .connectionPosition1(toAttributeModification(getConnectionPosition1())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java index 88a3dce87..98d7dcaa4 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java @@ -397,6 +397,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() { .connectionName2(toAttributeModification(getConnectionName2())) .selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1())) .selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2())) + .editedOperationalLimitsGroups(getEditedOperationalLimitsGroups()) .connectionDirection1(toAttributeModification(getConnectionDirection1())) .connectionDirection2(toAttributeModification(getConnectionDirection2())) .connectionPosition1(toAttributeModification(getConnectionPosition1())) diff --git a/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml new file mode 100644 index 000000000..647fc34c0 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index b21f47ed3..e8a04e6e2 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -408,3 +408,6 @@ databaseChangeLog: - include: file: changesets/changelog_20250822T115310Z.xml relativeToChangelogFile: true + - include: + file: changesets/changelog_20250923T141508Z.xml + relativeToChangelogFile: true From 7e40ce7f62b40485d22f5cd97fd73c5c176bbb8c Mon Sep 17 00:00:00 2001 From: Mathieu DEHARBE Date: Tue, 30 Sep 2025 14:40:48 +0200 Subject: [PATCH 2/4] default edited_operational_limits_groups to true Signed-off-by: Mathieu DEHARBE --- .../equipment/modification/BranchModificationEntity.java | 2 +- .../db/changelog/changesets/changelog_20250923T141508Z.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java index ae21abeb4..d684c0a75 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java @@ -47,7 +47,7 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity { @OrderColumn(name = "pos_operationalLimitsGroups") private List operationalLimitsGroups; - @Column(name = "editedOperationalLimitsGroups", columnDefinition = "boolean default false") + @Column(name = "editedOperationalLimitsGroups", columnDefinition = "boolean default true") private Boolean editedOperationalLimitsGroups; @Embedded diff --git a/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml index 647fc34c0..8345dda08 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml @@ -2,12 +2,12 @@ - + - + From 428df3c25a1005c6fb00882c6b695a35c4d5268b Mon Sep 17 00:00:00 2001 From: Mathieu DEHARBE Date: Tue, 30 Sep 2025 15:48:04 +0200 Subject: [PATCH 3/4] test EditedOperationalLimitsGroups Signed-off-by: Mathieu DEHARBE --- pom.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 51fee2cae..7d308f6dc 100644 --- a/pom.xml +++ b/pom.xml @@ -52,9 +52,8 @@ gridsuite org.gridsuite:network-modification-server - 0.38.0 + 0.39.0-SNAPSHOT 2.14.1 - 0.37.0-SNAPSHOT From 171a116cefcddca0e0336eb230b2d14bda7a21af Mon Sep 17 00:00:00 2001 From: Mathieu DEHARBE Date: Wed, 1 Oct 2025 12:11:56 +0200 Subject: [PATCH 4/4] rename EditedOperationalLimitsGroups to enable_olg_modification Signed-off-by: Mathieu DEHARBE --- .../equipment/modification/BranchModificationEntity.java | 8 ++++---- .../equipment/modification/LineModificationEntity.java | 2 +- .../TwoWindingsTransformerModificationEntity.java | 2 +- .../changelog/changesets/changelog_20250923T141508Z.xml | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java index d684c0a75..3708cd02c 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/BranchModificationEntity.java @@ -47,8 +47,8 @@ public class BranchModificationEntity extends BasicEquipmentModificationEntity { @OrderColumn(name = "pos_operationalLimitsGroups") private List operationalLimitsGroups; - @Column(name = "editedOperationalLimitsGroups", columnDefinition = "boolean default true") - private Boolean editedOperationalLimitsGroups; + @Column(name = "enable_olg_modification", columnDefinition = "boolean default true") + private Boolean enableOLGModification; @Embedded @AttributeOverrides(value = { @@ -220,8 +220,8 @@ private void assignAttributes(BranchModificationInfos branchModificationInfos) { x = new DoubleModificationEmbedded(branchModificationInfos.getX()); r = new DoubleModificationEmbedded(branchModificationInfos.getR()); this.operationalLimitsGroups = assignOperationalLimitsGroups(branchModificationInfos.getOperationalLimitsGroups(), operationalLimitsGroups); - this.editedOperationalLimitsGroups = branchModificationInfos.getEditedOperationalLimitsGroups() != null ? - branchModificationInfos.getEditedOperationalLimitsGroups() : true; + 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; diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java index 3ce6d3b53..bf59ec70e 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/LineModificationEntity.java @@ -96,7 +96,7 @@ public LineModificationInfos toModificationInfos() { .connectionName2(toAttributeModification(getConnectionName2())) .selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1())) .selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2())) - .editedOperationalLimitsGroups(getEditedOperationalLimitsGroups()) + .enableOLGModification(getEnableOLGModification()) .connectionDirection1(toAttributeModification(getConnectionDirection1())) .connectionDirection2(toAttributeModification(getConnectionDirection2())) .connectionPosition1(toAttributeModification(getConnectionPosition1())) diff --git a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java index 98d7dcaa4..f5c155f71 100644 --- a/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java +++ b/src/main/java/org/gridsuite/modification/server/entities/equipment/modification/TwoWindingsTransformerModificationEntity.java @@ -397,7 +397,7 @@ public TwoWindingsTransformerModificationInfos toModificationInfos() { .connectionName2(toAttributeModification(getConnectionName2())) .selectedOperationalLimitsGroup1(toAttributeModification(getSelectedOperationalLimitsGroupId1())) .selectedOperationalLimitsGroup2(toAttributeModification(getSelectedOperationalLimitsGroupId2())) - .editedOperationalLimitsGroups(getEditedOperationalLimitsGroups()) + .enableOLGModification(getEnableOLGModification()) .connectionDirection1(toAttributeModification(getConnectionDirection1())) .connectionDirection2(toAttributeModification(getConnectionDirection2())) .connectionPosition1(toAttributeModification(getConnectionPosition1())) diff --git a/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml b/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml index 8345dda08..071e5b284 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20250923T141508Z.xml @@ -2,12 +2,12 @@ - + - +