limits modification logs #124

Mathieu-Deharbe · 2025-11-21T15:41:09Z

PR Summary

reorganises the logs of the limit sets modification (transfo and lines)
refacto on the AbstractBranchModification
correction of a bad display of the modificatin of the name
corrections of a bug : when all the limit sets from a brnch are deleted, it doesn't work

Signed-off-by: Mathieu DEHARBE <[email protected]>

EtienneLt

some code suggestions

src/main/java/org/gridsuite/modification/modifications/AbstractBranchModification.java

src/main/java/org/gridsuite/modification/modifications/olg/OlgsModification.java

src/main/java/org/gridsuite/modification/modifications/olg/OlgModification.java

src/main/resources/org/gridsuite/modification/reports.properties

src/main/java/org/gridsuite/modification/modifications/olg/OlgModification.java

EtienneLt · 2025-11-25T09:53:53Z

src/main/java/org/gridsuite/modification/modifications/olg/OlgModification.java

+        if (applicableOnSide1() && modifiedBranch.getOperationalLimitsGroup1(olgId).isEmpty() ||
+            applicableOnSide2() && modifiedBranch.getOperationalLimitsGroup2(olgId).isEmpty()) {
+            throw new PowsyblException(
+                    "Cannot delete operational limit group " + olgId + " which has not been found in equipment on " + applicabilityToString(olgModifInfos.getApplicability()));


Suggested change

"Cannot delete operational limit group " + olgId + " which has not been found in equipment on " + applicabilityToString(olgModifInfos.getApplicability()));

"Cannot delete operational limit group " + olgId + " because it was not found in equipment on " + applicabilityToString(olgModifInfos.getApplicability()));

could add equipmentId to know which one is concerned ?

...in/java/org/gridsuite/modification/modifications/olg/OperationalLimitsGroupModification.java

src/main/java/org/gridsuite/modification/modifications/olg/OlgModification.java

Signed-off-by: Mathieu DEHARBE <[email protected]>

Co-authored-by: EtienneLt <[email protected]>

Signed-off-by: Mathieu DEHARBE <[email protected]>

…imits-modification-logs

Co-authored-by: EtienneLt <[email protected]>

Signed-off-by: Mathieu DEHARBE <[email protected]>

EtienneLt · 2025-11-25T13:46:56Z

missing detailed logs when creating

Signed-off-by: Mathieu DEHARBE <[email protected]>

EtienneLt

code ok I need to test

src/main/resources/org/gridsuite/modification/reports.properties

EtienneLt · 2025-11-26T14:25:05Z

src/main/java/org/gridsuite/modification/utils/ModificationUtils.java

     * @param side which side of the branch receives the limits
     */
-    public void setCurrentLimitsOnASide(ReportNode reportNode, List<OperationalLimitsGroupInfos> opLimitGroups, Branch<?> branch, TwoSides side) {
+    public void setCurrentLimitsOnASide(ReportNode reportNode, OperationalLimitsGroupInfos opLimitsGroup, Branch<?> branch, TwoSides side) {


Suggested change

public void setCurrentLimitsOnASide(ReportNode reportNode, OperationalLimitsGroupInfos opLimitsGroup, Branch<?> branch, TwoSides side) {

public void setCurrentLimits(ReportNode reportNode, OperationalLimitsGroupInfos opLimitsGroup, Branch<?> branch, TwoSides side) {

Signed-off-by: Mathieu DEHARBE <[email protected]>

basseche · 2025-11-26T15:10:23Z

...in/java/org/gridsuite/modification/modifications/olg/OperationalLimitsGroupModification.java

+    protected void applyModificationToOperationalLimitsGroup() {
+        switch (olgModifInfos.getModificationType()) {
+            case OperationalLimitsGroupModificationType.MODIFY_OR_ADD:
+                switch (olgModifInfos.getApplicability()) {


i think you should extract the content of this switch in a function

basseche · 2025-11-26T15:12:07Z

...in/java/org/gridsuite/modification/modifications/olg/OperationalLimitsGroupModification.java

+                            if (modifiedOperationalLimitsGroup2() == null) {
+                                addOlg(SIDE2);
+                            } else {
+                                modifyOLG(SIDE2);
+                            }


this code almost duplicate with the one above you should make a function as it can also be useful below

basseche · 2025-11-26T16:21:36Z

...in/java/org/gridsuite/modification/modifications/olg/OperationalLimitsGroupModification.java

+        } else {
+            if (currentLimits != null) {


merge if with else

basseche · 2025-11-26T16:28:01Z

...in/java/org/gridsuite/modification/modifications/olg/OperationalLimitsGroupModification.java

+            OperationalLimitsGroup modifiedOlg = modifiedOperationalLimitsGroup1();
+            if (modifiedOlg != null) {
+                modifiedOlg.removeCurrentLimits();
+                removeAllProperties(modifiedOlg);
+            }
+            OperationalLimitsGroup newOperationalLimitsGroup = modifiedBranch.newOperationalLimitsGroup1(olgModifInfos.getId());
+            modifyCurrentLimits(newOperationalLimitsGroup.newCurrentLimits(), null, SIDE1);
+            addProperties(newOperationalLimitsGroup, SIDE1);


this code could be extracted into a function

sonarqubecloud · 2025-11-27T10:02:57Z

Quality Gate passed

Issues
5 New issues
0 Accepted issues

Measures
0 Security Hotspots
85.6% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarQube Cloud

EtienneLt

Test Ok code Ok

Mathieu-Deharbe added 11 commits November 21, 2025 16:40

first refacto

a1ee8a6

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrects TU

f31fdc2

Signed-off-by: Mathieu DEHARBE <[email protected]>

permanent limit

47b4492

Signed-off-by: Mathieu DEHARBE <[email protected]>

applicabilityToString

8d6e732

Signed-off-by: Mathieu DEHARBE <[email protected]>

applicabilityToString in the UTs

2f4df9d

Signed-off-by: Mathieu DEHARBE <[email protected]>

correct handling of ambiguous ADD or MODIFY

fc9d514

Signed-off-by: Mathieu DEHARBE <[email protected]>

code style

6ce5c99

Signed-off-by: Mathieu DEHARBE <[email protected]>

sub report node for each side

6bc3cc7

Signed-off-by: Mathieu DEHARBE <[email protected]>

remove olgUtils

05eab30

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrects logSideNode

617b04c

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrects logSideNode

dda8e3d

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe requested review from EtienneLt and basseche November 24, 2025 17:48

log limits only if there is at least one actual modification

c0e89d2

Signed-off-by: Mathieu DEHARBE <[email protected]>

EtienneLt reviewed Nov 25, 2025

View reviewed changes

Mathieu-Deharbe and others added 8 commits November 25, 2025 11:14

Merge branch 'main' into limits-modification-logs

a722970

corrections post merge conflicts

cc3401c

Signed-off-by: Mathieu DEHARBE <[email protected]>

if (!limitsReportsSide1.isEmpty() || !limitsReportsSide2.isEmpty()) {

9df943c

Co-authored-by: EtienneLt <[email protected]>

createLogNodeForSide

0d9870d

Signed-off-by: Mathieu DEHARBE <[email protected]>

Merge remote-tracking branch 'origin/limits-modification-logs' into l…

fd828df

…imits-modification-logs

if (!limitsReportsSide1.isEmpty() || !limitsReportsSide2.isEmpty()) {

777057f

Co-authored-by: EtienneLt <[email protected]>

check on createLogNodeForSide parameter

803482c

Signed-off-by: Mathieu DEHARBE <[email protected]>

corrections post review

a3df970

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe added 2 commits November 26, 2025 12:08

corrects name modification

7b57038

Signed-off-by: Mathieu DEHARBE <[email protected]>

logs in case of line ceration and transfo creation

77930de

Signed-off-by: Mathieu DEHARBE <[email protected]>

Mathieu-Deharbe requested a review from EtienneLt November 26, 2025 12:34

rename classes

188eed4

Signed-off-by: Mathieu DEHARBE <[email protected]>

EtienneLt reviewed Nov 26, 2025

View reviewed changes

TU testRename

6155133

Signed-off-by: Mathieu DEHARBE <[email protected]>

basseche reviewed Nov 26, 2025

View reviewed changes

basseche approved these changes Nov 27, 2025

View reviewed changes

Merge branch 'main' into limits-modification-logs

1a1aa0b

EtienneLt approved these changes Nov 27, 2025

View reviewed changes

Mathieu-Deharbe merged commit 9e3304d into main Nov 27, 2025
4 checks passed

Mathieu-Deharbe deleted the limits-modification-logs branch November 27, 2025 10:09

	"Cannot delete operational limit group " + olgId + " which has not been found in equipment on " + applicabilityToString(olgModifInfos.getApplicability()));
	"Cannot delete operational limit group " + olgId + " because it was not found in equipment on " + applicabilityToString(olgModifInfos.getApplicability()));

	public void setCurrentLimitsOnASide(ReportNode reportNode, OperationalLimitsGroupInfos opLimitsGroup, Branch<?> branch, TwoSides side) {
	public void setCurrentLimits(ReportNode reportNode, OperationalLimitsGroupInfos opLimitsGroup, Branch<?> branch, TwoSides side) {

limits modification logs #124

limits modification logs #124

Uh oh!

Conversation

Mathieu-Deharbe commented Nov 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

PR Summary

Uh oh!

EtienneLt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EtienneLt Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

EtienneLt Nov 25, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

EtienneLt commented Nov 25, 2025

Uh oh!

EtienneLt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

EtienneLt Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

basseche Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

basseche Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

basseche Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

basseche Nov 26, 2025

Choose a reason for hiding this comment

Uh oh!

sonarqubecloud bot commented Nov 27, 2025

Quality Gate passed

Uh oh!

EtienneLt left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Mathieu-Deharbe commented Nov 21, 2025 •

edited

Loading