Merge branch 'add-locationId-to-sa-result' of https://github.com/gridsuite/security-analysis-server into add-locationId-to-sa-result

Author: AAJELLAL

.github/workflows/build.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   build:
-    uses: powsybl/github-ci/.github/workflows/build-generic.yml@07ff8aa16a298b7d735d50883f6f723d84d87a55
+    uses: powsybl/github-ci/.github/workflows/build-backend-app-generic.yml@8e3547c7f6d98c23095896b6097294f22100b122
     with:
       sonarOrganization: gridsuite
       sonarProjectKey: org.gridsuite:security-analysis-server

.github/workflows/patch.yml

@@ -9,7 +9,7 @@ on:
 
 jobs:
   run-patch:
-    uses: powsybl/github-ci/.github/workflows/patch-generic.yml@07ff8aa16a298b7d735d50883f6f723d84d87a55
+    uses: powsybl/github-ci/.github/workflows/patch-backend-app-generic.yml@8e3547c7f6d98c23095896b6097294f22100b122
     with:
       githubappId: ${{ vars.GRIDSUITE_ACTIONS_APPID }}
       sonarOrganization: gridsuite

.github/workflows/release.yml

@@ -12,7 +12,7 @@ on:
 
 jobs:
   run-release:
-    uses: powsybl/github-ci/.github/workflows/release-generic.yml@07ff8aa16a298b7d735d50883f6f723d84d87a55
+    uses: powsybl/github-ci/.github/workflows/release-backend-app-generic.yml@8e3547c7f6d98c23095896b6097294f22100b122
     with:
       githubappId: ${{ vars.GRIDSUITE_ACTIONS_APPID }}
       sonarOrganization: gridsuite

pom.xml

@@ -86,11 +86,6 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
-            <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
-                <groupId>com.powsybl</groupId>
-                <artifactId>powsybl-ws-commons</artifactId>
-                <version>1.19.0</version>
-            </dependency>
             <dependency><!-- To remove when integrate in next release of gridsuite-dependencies or powsybl-ws-dependencies -->
                 <groupId>com.squareup.okhttp3</groupId>
                 <artifactId>okhttp-bom</artifactId>

src/main/java/org/gridsuite/securityanalysis/server/SecurityAnalysisParametersController.java

@@ -11,12 +11,14 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
+import org.gridsuite.securityanalysis.server.dto.LimitReductionsByVoltageLevel;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersValues;
 import org.gridsuite.securityanalysis.server.service.SecurityAnalysisParametersService;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
 import java.util.UUID;
 
 /**
@@ -103,4 +105,13 @@ public ResponseEntity<Void> updateProvider(
         parametersService.updateProvider(parametersUuid, provider);
         return ResponseEntity.ok().build();
     }
+
+    @GetMapping(value = "/default-limit-reductions", produces = MediaType.APPLICATION_JSON_VALUE)
+    @Operation(summary = "Get default limit reductions")
+    @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The default limit reductions")})
+    public ResponseEntity<List<LimitReductionsByVoltageLevel>> getDefaultLimitReductions() {
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON)
+                .body(parametersService.getDefaultLimitReductions());
+    }
+
 }

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

@@ -63,7 +63,7 @@ public abstract class AbstractLimitViolationEntity {
 
     public static Double computeLoading(LimitViolation limitViolation) {
         return LimitViolationType.CURRENT.equals(limitViolation.getLimitType())
-                ? (100 * limitViolation.getValue()) / (limitViolation.getLimit() * limitViolation.getLimitReduction())
+                ? 100 * limitViolation.getValue() / limitViolation.getLimit()
                 : null;
     }
 }

src/main/java/org/gridsuite/securityanalysis/server/service/SecurityAnalysisParametersService.java

@@ -176,4 +176,8 @@ public void updateProvider(UUID parametersUuid, String provider) {
             .orElseThrow()
             .updateProvider(provider != null ? provider : defaultProvider);
     }
+
+    public List<LimitReductionsByVoltageLevel> getDefaultLimitReductions() {
+        return limitReductionService.createDefaultLimitReductions();
+    }
 }

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

@@ -6,6 +6,7 @@
  */
 package org.gridsuite.securityanalysis.server;
 
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import org.gridsuite.securityanalysis.server.dto.LimitReductionsByVoltageLevel;
 import org.gridsuite.securityanalysis.server.dto.SecurityAnalysisParametersValues;
@@ -341,6 +342,20 @@ void testRemoveParameters() throws Exception {
         assertNull(securityAnalysisParametersRepository.findById(createdParametersUuid).orElse(null));
     }
 
+    @Test
+    void testGetDefaultLimitReductions() throws Exception {
+        MvcResult mvcResult = mockMvc.perform(get("/v1/parameters/default-limit-reductions")
+                .contentType(MediaType.APPLICATION_JSON))
+            .andExpect(status().isOk())
+            .andReturn();
+
+        String responseContent = mvcResult.getResponse().getContentAsString();
+        List<LimitReductionsByVoltageLevel> limitReductions = objectMapper.readValue(responseContent, new TypeReference<>() { });
+
+        assertNotNull(limitReductions);
+        assertFalse(limitReductions.isEmpty());
+    }
+
     private void assertSecurityAnalysisParametersEntityAreEquals(UUID parametersUuid, double lowVoltageAbsoluteThreshold, double lowVoltageProportionalThreshold, double highVoltageAbsoluteThreshold, double highVoltageProportionalThreshold, double flowProportionalThreshold) {
         SecurityAnalysisParametersEntity securityAnalysisParametersEntity = securityAnalysisParametersRepository.findById(parametersUuid).orElseThrow();
         assertEquals(lowVoltageAbsoluteThreshold, securityAnalysisParametersEntity.getLowVoltageAbsoluteThreshold(), 0.001);