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..d5d2be4f8 --- /dev/null +++ b/src/main/resources/db/changelog/changesets/changelog_20241216T142706Z.xml @@ -0,0 +1,39 @@ + + + + + + edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + edited_field='MAXIMUM_SUSCEPTANCE' + + + + + + edited_field='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + equipment_field1='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + equipment_field2='MAXIMUM_Q_AT_NOMINAL_VOLTAGE' + + + + edited_field='MAXIMUM_SUSCEPTANCE' + + + + equipment_field1='MAXIMUM_SUSCEPTANCE' + + + + equipment_field2='MAXIMUM_SUSCEPTANCE' + + + 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..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,13 +94,13 @@ 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(); 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..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,16 +98,16 @@ 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.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);