From 73bb37e15511d8c932c19febc304886ec04f3c8b Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Mon, 16 Dec 2024 15:54:09 +0100 Subject: [PATCH 1/4] Migration MAXIMUM_Q_AT_NOMINAL_VOLTAGE to MAX_Q_AT_NOMINAL_V for modification by filter and by formula Signed-off-by: Thang PHAM --- .../changesets/changelog_20241216T142706Z.xml | 23 +++++++++++++++++++ .../db/changelog/db.changelog-master.yaml | 5 +++- ...mpensatorModificationByAssignmentTest.java | 2 +- ...tCompensatorByFormulaModificationTest.java | 4 ++-- 4 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml diff --git a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml new file mode 100644 index 000000000..15e2ef8ca --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml @@ -0,0 +1,23 @@ + + + + + + edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + + + edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + equipment_field1='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + equipment_field2='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + diff --git a/src/main/resources/db/changelog/db.changelog-master.yaml b/src/main/resources/db/changelog/db.changelog-master.yaml index 6f2ec9372..161c6a68d 100644 --- a/src/main/resources/db/changelog/db.changelog-master.yaml +++ b/src/main/resources/db/changelog/db.changelog-master.yaml @@ -320,4 +320,7 @@ databaseChangeLog: file: changesets/changelog_20241015T130742Z.xml - include: relativeToChangelogFile: true - file: changesets/changelog_20241206T123930Z.xml \ No newline at end of file + file: changesets/changelog_20241206T123930Z.xml + - include: + relativeToChangelogFile: true + file: changesets/changelog_20241216T142706Z.xml \ No newline at end of file diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java index 71030d0d7..1a0e3285a 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java @@ -100,7 +100,7 @@ protected List> getAssignmentInfos() { .build(); DoubleAssignmentInfos assignmentInfos4 = DoubleAssignmentInfos.builder() - .editedField(ShuntCompensatorField.MAXIMUM_Q_AT_NOMINAL_VOLTAGE.name()) + .editedField(ShuntCompensatorField.MAX_Q_AT_NOMINAL_V.name()) .value(10.) .filters(List.of(filter5)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java index a78c92464..9d4a3bae1 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java @@ -104,10 +104,10 @@ protected List getFormulaInfos() { ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()).build(), ReferenceFieldOrValue.builder().value(5.).build()); - FormulaInfos formulaInfos4 = getFormulaInfo(ShuntCompensatorField.MAXIMUM_Q_AT_NOMINAL_VOLTAGE.name(), + FormulaInfos formulaInfos4 = getFormulaInfo(ShuntCompensatorField.MAX_Q_AT_NOMINAL_V.name(), List.of(filter5), Operator.DIVISION, - ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_Q_AT_NOMINAL_VOLTAGE.name()).build(), + ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAX_Q_AT_NOMINAL_V.name()).build(), ReferenceFieldOrValue.builder().value(2.).build()); return List.of(formulaInfos1, formulaInfos2, formulaInfos3, formulaInfos4); From 3c41a1d187f5a85efadefd1875767fedc6033d40 Mon Sep 17 00:00:00 2001 From: Thang PHAM Date: Wed, 18 Dec 2024 15:29:08 +0100 Subject: [PATCH 2/4] rename MAXIMUM_SUSCEPTANCE to MAX_SUSCEPTANCE Signed-off-by: Thang PHAM --- .../changesets/changelog_20241216T142706Z.xml | 16 ++++++++++++++++ ...tCompensatorModificationByAssignmentTest.java | 2 +- ...huntCompensatorByFormulaModificationTest.java | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml index 15e2ef8ca..d5d2be4f8 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml @@ -5,6 +5,10 @@ edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + edited_field='MAXIMUM_SUSCEPTANCE' + @@ -19,5 +23,17 @@ equipment_field2='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + edited_field='MAXIMUM_SUSCEPTANCE' + + + + equipment_field1='MAXIMUM_SUSCEPTANCE' + + + + equipment_field2='MAXIMUM_SUSCEPTANCE' + diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java index 1a0e3285a..010799e56 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java @@ -94,7 +94,7 @@ protected List> getAssignmentInfos() { .build(); DoubleAssignmentInfos assignmentInfos3 = DoubleAssignmentInfos.builder() - .editedField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()) + .editedField(ShuntCompensatorField.MAX_SUSCEPTANCE.name()) .value(5.) .filters(List.of(filter4)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java index 9d4a3bae1..a4cfe29d6 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java @@ -98,10 +98,10 @@ protected List getFormulaInfos() { ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SECTION_COUNT.name()).build(), ReferenceFieldOrValue.builder().value(2.).build()); - FormulaInfos formulaInfos3 = getFormulaInfo(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name(), + FormulaInfos formulaInfos3 = getFormulaInfo(ShuntCompensatorField.MAX_SUSCEPTANCE.name(), List.of(filter4), Operator.ADDITION, - ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()).build(), + ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAX_SUSCEPTANCE.name()).build(), ReferenceFieldOrValue.builder().value(5.).build()); FormulaInfos formulaInfos4 = getFormulaInfo(ShuntCompensatorField.MAX_Q_AT_NOMINAL_V.name(), From 04cf1beca6a0560c934b1cdcc54a525a3c33b1e3 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 20 Dec 2024 11:28:57 +0100 Subject: [PATCH 3/4] revert renaming for MAXIMUM_SUSCEPTANCE --- .../changesets/changelog_20241216T142706Z.xml | 16 ---------------- ...tCompensatorModificationByAssignmentTest.java | 2 +- ...huntCompensatorByFormulaModificationTest.java | 4 ++-- 3 files changed, 3 insertions(+), 19 deletions(-) diff --git a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml index d5d2be4f8..15e2ef8ca 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml @@ -5,10 +5,6 @@ edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' - - - edited_field='MAXIMUM_SUSCEPTANCE' - @@ -23,17 +19,5 @@ equipment_field2='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' - - - edited_field='MAXIMUM_SUSCEPTANCE' - - - - equipment_field1='MAXIMUM_SUSCEPTANCE' - - - - equipment_field2='MAXIMUM_SUSCEPTANCE' - diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java index 010799e56..1a0e3285a 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java @@ -94,7 +94,7 @@ protected List> getAssignmentInfos() { .build(); DoubleAssignmentInfos assignmentInfos3 = DoubleAssignmentInfos.builder() - .editedField(ShuntCompensatorField.MAX_SUSCEPTANCE.name()) + .editedField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()) .value(5.) .filters(List.of(filter4)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java index a4cfe29d6..7ca7af312 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java @@ -98,10 +98,10 @@ protected List getFormulaInfos() { ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SECTION_COUNT.name()).build(), ReferenceFieldOrValue.builder().value(2.).build()); - FormulaInfos formulaInfos3 = getFormulaInfo(ShuntCompensatorField.MAX_SUSCEPTANCE.name(), + FormulaInfos formulaInfos3 = getFormulaInfo(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name(), List.of(filter4), Operator.ADDITION, - ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAX_SUSCEPTANCE.name()).build(), + eferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()).build(), ReferenceFieldOrValue.builder().value(5.).build()); FormulaInfos formulaInfos4 = getFormulaInfo(ShuntCompensatorField.MAX_Q_AT_NOMINAL_V.name(), From b918d799292c066e61f82fdb7c240d92e2877281 Mon Sep 17 00:00:00 2001 From: Rehili Ghazwa Date: Fri, 20 Dec 2024 13:58:40 +0100 Subject: [PATCH 4/4] renaming for max_susceptance --- .../changesets/changelog_20241216T142706Z.xml | 16 ++++++++++++++++ ...tCompensatorModificationByAssignmentTest.java | 2 +- ...huntCompensatorByFormulaModificationTest.java | 4 ++-- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml index 15e2ef8ca..d5d2be4f8 100644 --- a/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml +++ b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml @@ -5,6 +5,10 @@ edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + edited_field='MAXIMUM_SUSCEPTANCE' + @@ -19,5 +23,17 @@ equipment_field2='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + edited_field='MAXIMUM_SUSCEPTANCE' + + + + equipment_field1='MAXIMUM_SUSCEPTANCE' + + + + equipment_field2='MAXIMUM_SUSCEPTANCE' + diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java index 1a0e3285a..010799e56 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/assignment/ShuntCompensatorModificationByAssignmentTest.java @@ -94,7 +94,7 @@ protected List> getAssignmentInfos() { .build(); DoubleAssignmentInfos assignmentInfos3 = DoubleAssignmentInfos.builder() - .editedField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()) + .editedField(ShuntCompensatorField.MAX_SUSCEPTANCE.name()) .value(5.) .filters(List.of(filter4)) .build(); diff --git a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java index 7ca7af312..a4cfe29d6 100644 --- a/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java +++ b/src/test/java/org/gridsuite/modification/server/modifications/byfilter/formula/ShuntCompensatorByFormulaModificationTest.java @@ -98,10 +98,10 @@ protected List getFormulaInfos() { ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SECTION_COUNT.name()).build(), ReferenceFieldOrValue.builder().value(2.).build()); - FormulaInfos formulaInfos3 = getFormulaInfo(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name(), + FormulaInfos formulaInfos3 = getFormulaInfo(ShuntCompensatorField.MAX_SUSCEPTANCE.name(), List.of(filter4), Operator.ADDITION, - eferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAXIMUM_SUSCEPTANCE.name()).build(), + ReferenceFieldOrValue.builder().equipmentField(ShuntCompensatorField.MAX_SUSCEPTANCE.name()).build(), ReferenceFieldOrValue.builder().value(5.).build()); FormulaInfos formulaInfos4 = getFormulaInfo(ShuntCompensatorField.MAX_Q_AT_NOMINAL_V.name(),