feat: add upcoming and current overload durations in result

Signed-off-by: LE SAULNIER Kevin <[email protected]>

Author: LE SAULNIER Kevin

src/main/java/org/gridsuite/securityanalysis/server/dto/LimitViolationDTO.java

@@ -24,7 +24,8 @@ public class LimitViolationDTO {
     private String limitName;
     private String nextLimitName;
     private ThreeSides side;
-    private int acceptableDuration;
+    private Integer acceptableDuration;
+    private Integer upcomingAcceptableDuration;
     private double limit;
     private Double patlLimit;
     private double limitReduction;
@@ -39,7 +40,8 @@ public static LimitViolationDTO toDto(AbstractLimitViolationEntity limitViolatio
             .limitName(limitViolation.getLimitName())
             .nextLimitName(limitViolation.getNextLimitName())
             .side(limitViolation.getSide())
-            .acceptableDuration((int) limitViolation.getAcceptableDuration())
+            .acceptableDuration(limitViolation.getAcceptableDuration())
+            .upcomingAcceptableDuration(limitViolation.getUpcomingAcceptableDuration())
             .limit(limitViolation.getLimit())
             .patlLimit(limitViolation.getPatlLimit())
             .limitReduction(limitViolation.getLimitReduction())

src/main/java/org/gridsuite/securityanalysis/server/entities/AbstractLimitViolationEntity.java

@@ -17,10 +17,7 @@
 import lombok.experimental.FieldNameConstants;
 import lombok.experimental.SuperBuilder;
 
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Optional;
-import java.util.UUID;
+import java.util.*;
 
 /**
  * @author Kevin Le Saulnier <kevin.lesaulnier at rte-france.com>
@@ -53,7 +50,9 @@ public abstract class AbstractLimitViolationEntity {
     @Enumerated(EnumType.STRING)
     private LimitViolationType limitType;
 
-    private long acceptableDuration;
+    private Integer acceptableDuration;
+
+    private Integer upcomingAcceptableDuration;
 
     private double limitReduction;
 
@@ -130,4 +129,47 @@ private static LoadingLimits.TemporaryLimit getNextTemporaryLimit(Branch<?> bran
 
         return null;
     }
+
+    protected static Integer calculateActualOverloadDuration(LimitViolation limitViolation, Network network) {
+        if (limitViolation.getValue() > limitViolation.getLimit()) {
+            return limitViolation.getAcceptableDuration();
+        } else {
+            String equipmentId = limitViolation.getSubjectId();
+            LoadingLimits.TemporaryLimit tempLimit = null;
+
+            Line line = network.getLine(equipmentId);
+            if (line != null) {
+                tempLimit = getBranchLimitViolationAboveCurrentValue(line, limitViolation);
+            } else {
+                TwoWindingsTransformer twoWindingsTransformer = network.getTwoWindingsTransformer(equipmentId);
+                if (twoWindingsTransformer != null) {
+                    tempLimit = getBranchLimitViolationAboveCurrentValue(twoWindingsTransformer, limitViolation);
+                }
+            }
+            return (tempLimit != null) ? tempLimit.getAcceptableDuration() : Integer.MAX_VALUE;
+        }
+    }
+
+    protected static Integer calculateUpcomingOverloadDuration(LimitViolation limitViolation) {
+        if (limitViolation.getValue() < limitViolation.getLimit()) {
+            return limitViolation.getAcceptableDuration();
+        }
+        return null;
+    }
+
+    private static LoadingLimits.TemporaryLimit getBranchLimitViolationAboveCurrentValue(Branch<?> branch, LimitViolation limitViolation) {
+        // limits are returned from the store by DESC duration / ASC value
+        Optional<CurrentLimits> currentLimits = limitViolation.getSideAsTwoSides().equals(TwoSides.ONE) ? branch.getCurrentLimits1() : branch.getCurrentLimits2();
+        if (currentLimits.isEmpty() || limitViolation.getValue() < currentLimits.get().getPermanentLimit()) {
+            return null;
+        } else {
+            Optional<LoadingLimits.TemporaryLimit> nextTemporaryLimit = currentLimits.get().getTemporaryLimits().stream()
+                .filter(tl -> limitViolation.getValue() < tl.getValue())
+                .findFirst();
+            if (nextTemporaryLimit.isPresent()) {
+                return nextTemporaryLimit.get();
+            }
+        }
+        return null;
+    }
 }

src/main/java/org/gridsuite/securityanalysis/server/entities/ContingencyLimitViolationEntity.java

@@ -46,7 +46,8 @@ public static ContingencyLimitViolationEntity toEntity(Network network, LimitVio
             .patlLimit(patlLimit)
             .patlLoading(computeLoading(limitViolation, patlLimit))
             .nextLimitName(getNextLimitName(limitViolation, network))
-            .acceptableDuration(limitViolation.getAcceptableDuration())
+            .acceptableDuration(calculateActualOverloadDuration(limitViolation, network))
+            .upcomingAcceptableDuration(calculateUpcomingOverloadDuration(limitViolation))
             .build();
 
         subjectLimitViolation.addContingencyLimitViolation(contingencyLimitViolationEntity);

src/main/resources/db/changelog/changesets/changelog_20250908T143920Z.xml

@@ -0,0 +1,27 @@
+<?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="lesaulnierkev (generated)" id="1757342382341-1">
+        <addColumn tableName="contingency_limit_violation">
+            <column name="upcoming_acceptable_duration" type="integer"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="lesaulnierkev (generated)" id="1757342382341-2">
+        <addColumn tableName="pre_contingency_limit_violation">
+            <column name="upcoming_acceptable_duration" type="integer"/>
+        </addColumn>
+    </changeSet>
+    <changeSet author="lesaulnierkev (generated)" id="1757342382341-3">
+        <modifyDataType
+                tableName="contingency_limit_violation"
+                columnName="acceptable_duration"
+                newDataType="INTEGER"/>
+    </changeSet>
+    <changeSet author="lesaulnierkev (generated)" id="1757342382341-4">
+        <modifyDataType
+                tableName="pre_contingency_limit_violation"
+                columnName="acceptable_duration"
+                newDataType="INTEGER"/>
+        <!-- CHECK CONVERSION ?????-->
+    </changeSet>
+
+</databaseChangeLog>

src/main/resources/db/changelog/db.changelog-master.yaml

@@ -48,3 +48,6 @@ databaseChangeLog:
   - include:
       file: changesets/changelog_20250903T125946Z.xml
       relativeToChangelogFile: true
+  - include:
+      file: changesets/changelog_20250908T143920Z.xml
+      relativeToChangelogFile: true

src/test/java/org/gridsuite/securityanalysis/server/ContingencyLimitViolationTest.java

@@ -25,36 +25,45 @@
 @SpringBootTest
 class ContingencyLimitViolationTest {
 
+
     @Test
     void testContingencyLimitViolationEntityNewFields() {
-        testContingencyLimitViolationMapping("10'", 10 * 60, 1200, 1250, TwoSides.TWO, "1'", 1100);
+        testContingencyLimitViolationMapping("10'", 10 * 60, 1200, 1, 1250, TwoSides.TWO, "1'", 1100, 10 * 60, null);
     }
 
     @Test
     void testContingencyLimitViolationEntityNewFieldsWithPermanentLimitReached() {
-        testContingencyLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 1100, 1150, TwoSides.TWO, "10'", 1100);
+        testContingencyLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 1100, 1, 1150, TwoSides.TWO, "10'", 1100, Integer.MAX_VALUE, null);
     }
 
     @Test
     void testContingencyLimitViolationEntityNewFieldsWithPermanentLimitReachedAndNoTemporaryLimit() {
-        testContingencyLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 500, 1000, TwoSides.ONE, null, 500);
+        testContingencyLimitViolationMapping(LimitViolationUtils.PERMANENT_LIMIT_NAME, Integer.MAX_VALUE, 500, 1, 1000, TwoSides.ONE, null, 500, Integer.MAX_VALUE, null);
     }
 
     @Test
     void testContingencyLimitViolationEntityNewFieldsWithLastLimitReached() {
-        testContingencyLimitViolationMapping("N/A", 0, 1100, 3000, TwoSides.TWO, null, 1100);
+        testContingencyLimitViolationMapping("N/A", 0, 1100, 1, 3000, TwoSides.TWO, null, 1100, 0, null);
+    }
+
+    @Test
+    void testContingencyLimitViolationEntityNewFieldsWithLimitReductionEffective() {
+        // for this test to be relevant, "value" needs to be less that "limit"
+        testContingencyLimitViolationMapping("10'", 60, 1200, 0.8, 1150, TwoSides.TWO, "1'", 1100, 10 * 60, 60);
     }
 
-    private void testContingencyLimitViolationMapping(String limitName, int acceptableDuration, double limit, double value, TwoSides side, String expectedNextLimitName, long expectedPatlLimit) {
+    private void testContingencyLimitViolationMapping(String limitName, int acceptableDuration, double limit, double limitReduction, double value, TwoSides side, String expectedNextLimitName, long expectedPatlLimit, Integer expectedAcceptableDuration, Integer expectedUpcomingAcceptableDuration) {
         Network network = EurostagTutorialExample1Factory.createWithFixedCurrentLimits();
-        LimitViolation limitViolation = new LimitViolation("NHV1_NHV2_1", "NHV1_NHV2_1_name", LimitViolationType.CURRENT, limitName, acceptableDuration, limit, 1, value, side);
+        LimitViolation limitViolation = new LimitViolation("NHV1_NHV2_1", "NHV1_NHV2_1_name", LimitViolationType.CURRENT, limitName, acceptableDuration, limit, limitReduction, value, side);
 
         SubjectLimitViolationEntity subjectLimitViolationEntity = new SubjectLimitViolationEntity("NHV1_NHV2_1", "NHV1_NHV2_1_name");
 
         ContingencyLimitViolationEntity contingencyLimitViolationEntity = ContingencyLimitViolationEntity.toEntity(network, limitViolation, subjectLimitViolationEntity);
 
         assertEquals(expectedNextLimitName, contingencyLimitViolationEntity.getNextLimitName());
         assertEquals(expectedPatlLimit, contingencyLimitViolationEntity.getPatlLimit());
+        assertEquals(expectedAcceptableDuration, contingencyLimitViolationEntity.getAcceptableDuration());
+        assertEquals(expectedUpcomingAcceptableDuration, contingencyLimitViolationEntity.getUpcomingAcceptableDuration());
         assertEquals(100 * limitViolation.getValue() / contingencyLimitViolationEntity.getPatlLimit(), contingencyLimitViolationEntity.getPatlLoading());
     }
 }