Merge remote-tracking branch 'refs/remotes/origin/main'

Tristan-WorkGH · Tristan-WorkGH · commit b19a4ac76ba3 · 2024-05-28T11:35:08.000+02:00
Conflicts:
	src/test/java/org/gridsuite/study/server/ShortCircuitTest.java
diff --git a/pom.xml b/pom.xml
@@ -47,6 +47,8 @@
         <testcontainers.version>1.18.3</testcontainers.version>
         <liquibase-hibernate-package>org.gridsuite.study.server</liquibase-hibernate-package>
         <apache.httpclient.version>5.3</apache.httpclient.version>
+        <!-- FIXME: powsybl-network-store modules'version is overloaded in the dependencies section.The overloads and this property below have to be removed at next powsybl-ws-dependencies.version upgrade -->
+        <powsybl-network-store.version>1.11.1</powsybl-network-store.version>
     </properties>
 
     <build>
@@ -82,6 +84,24 @@
     <dependencyManagement>
         <dependencies>
             <!-- overrides of imports -->
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-iidm-impl</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-client</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
+            <!-- FIXME: to be removed at next powsybl-ws-dependencies upgrade  -->
+            <dependency>
+                <groupId>com.powsybl</groupId>
+                <artifactId>powsybl-network-store-model</artifactId>
+                <version>${powsybl-network-store.version}</version>
+            </dependency>
 
             <!-- imports -->
             <dependency>
diff --git a/src/main/java/org/gridsuite/study/server/StudyController.java b/src/main/java/org/gridsuite/study/server/StudyController.java
@@ -422,17 +422,16 @@ public ResponseEntity<String> getSubstationGraphics(
         return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getSubstationsGraphics(networkStoreService.getNetworkUuid(studyUuid), nodeUuid, substationsIds));
     }
 
-    @GetMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/network-map/equipments-ids")
+    @PostMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/network-map/equipments-ids")
     @Operation(summary = "Get equipment ids ")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The list of equipment ids")})
     public ResponseEntity<String> getNetworkElementsIds(
             @PathVariable("studyUuid") UUID studyUuid,
             @PathVariable("nodeUuid") UUID nodeUuid,
-            @Parameter(description = "Substations id") @RequestParam(name = "substationsIds", required = false) List<String> substationsIds,
-            @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode,
-            @Parameter(description = "equipment type") @RequestParam(name = "equipmentType") String equipmentType) {
+            @RequestBody String equipmentInfos,
+            @Parameter(description = "Should get in upstream built node ?") @RequestParam(value = "inUpstreamBuiltParentNode", required = false, defaultValue = "false") boolean inUpstreamBuiltParentNode) {
 
-        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementsIds(studyUuid, nodeUuid, substationsIds, inUpstreamBuiltParentNode, equipmentType));
+        return ResponseEntity.ok().contentType(MediaType.APPLICATION_JSON).body(studyService.getNetworkElementsIds(studyUuid, nodeUuid, inUpstreamBuiltParentNode, equipmentInfos));
     }
 
     @GetMapping(value = "/studies/{studyUuid}/nodes/{nodeUuid}/network-map/substations/{substationId}")
diff --git a/src/main/java/org/gridsuite/study/server/dto/ShortCircuitPredefinedConfiguration.java b/src/main/java/org/gridsuite/study/server/dto/ShortCircuitPredefinedConfiguration.java
@@ -12,5 +12,6 @@
 @Deprecated(forRemoval = true, since = "1.7.0")
 public enum ShortCircuitPredefinedConfiguration {
     ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP,
-    ICC_MAX_WITH_CEI909
+    ICC_MAX_WITH_CEI909,
+    ICC_MIN_WITH_NOMINAL_VOLTAGE_MAP
 }
diff --git a/src/main/java/org/gridsuite/study/server/service/NetworkMapService.java b/src/main/java/org/gridsuite/study/server/service/NetworkMapService.java
@@ -18,8 +18,11 @@
 import org.gridsuite.study.server.dto.InfoTypeParameters;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.ParameterizedTypeReference;
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpMethod;
 import org.springframework.http.HttpStatus;
+import org.springframework.http.MediaType;
+import org.springframework.http.HttpEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.web.client.HttpStatusCodeException;
 import org.springframework.web.client.RestTemplate;
@@ -158,20 +161,19 @@ public String getEquipmentsMapData(UUID networkUuid, String variantId, List<Stri
         return restTemplate.getForObject(networkMapServerBaseUri + url, String.class);
     }
 
-    public String getElementsIds(UUID networkUuid, String variantId, List<String> substationsIds, String elementType) {
+    public String getElementsIds(UUID networkUuid, String variantId, String equipmentInfos) {
         String path = DELIMITER + NETWORK_MAP_API_VERSION + "/networks/{networkUuid}/elements-ids";
 
         UriComponentsBuilder builder = UriComponentsBuilder
                 .fromPath(path);
-        if (substationsIds != null) {
-            builder = builder.queryParam(QUERY_PARAM_SUBSTATIONS_IDS, substationsIds);
-        }
         if (!StringUtils.isBlank(variantId)) {
             builder = builder.queryParam(QUERY_PARAM_VARIANT_ID, variantId);
         }
-        builder = builder.queryParam(QUERY_PARAM_ELEMENT_TYPE, elementType);
         String url = builder.buildAndExpand(networkUuid).toUriString();
-        return restTemplate.getForObject(networkMapServerBaseUri + url, String.class);
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        HttpEntity<String> httpEntity = new HttpEntity<>(equipmentInfos, headers);
+        return restTemplate.postForObject(networkMapServerBaseUri + url, httpEntity, String.class);
     }
 
     public String getEquipmentMapData(UUID networkUuid, String variantId, String equipmentPath, String equipmentId) {
diff --git a/src/main/java/org/gridsuite/study/server/service/StudyService.java b/src/main/java/org/gridsuite/study/server/service/StudyService.java
@@ -1902,10 +1902,10 @@ public DynamicSimulationStatus getDynamicSimulationStatus(UUID nodeUuid) {
 
     // --- Dynamic Simulation service methods END --- //
 
-    public String getNetworkElementsIds(UUID studyUuid, UUID nodeUuid, List<String> substationsIds, boolean inUpstreamBuiltParentNode, String equipmentType) {
+    public String getNetworkElementsIds(UUID studyUuid, UUID nodeUuid, boolean inUpstreamBuiltParentNode, String equipmentInfos) {
         UUID nodeUuidToSearchIn = getNodeUuidToSearchIn(nodeUuid, inUpstreamBuiltParentNode);
         return networkMapService.getElementsIds(networkStoreService.getNetworkUuid(studyUuid), networkModificationTreeService.getVariantId(nodeUuidToSearchIn),
-                substationsIds, equipmentType);
+                equipmentInfos);
     }
 
     @Transactional(readOnly = true)
diff --git a/src/test/java/org/gridsuite/study/server/NetworkMapTest.java b/src/test/java/org/gridsuite/study/server/NetworkMapTest.java
@@ -51,10 +51,7 @@
 import org.springframework.test.web.servlet.request.MockHttpServletRequestBuilder;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-import java.util.UUID;
+import java.util.*;
 
 import static com.github.tomakehurst.wiremock.core.WireMockConfiguration.wireMockConfig;
 import static org.gridsuite.study.server.StudyConstants.*;
@@ -63,6 +60,7 @@
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.get;
+import static org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.content;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
 
@@ -259,8 +257,8 @@ public void testGetHvdcLinesMapServer() throws Exception {
 
         //get the hvdc lines ids of a network
         String hvdcLineIdsAsString = List.of("hvdc-line1", "hvdc-line2", "hvdc-line3").toString();
-        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, "HVDC_LINE", List.of(), hvdcLineIdsAsString);
-        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, "HVDC_LINE", List.of("S1"), hvdcLineIdsAsString);
+        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, hvdcLineIdsAsString, mapper.writeValueAsString(createRequestBody("HVDC_LINE", List.of())));
+        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, hvdcLineIdsAsString, mapper.writeValueAsString(createRequestBody("HVDC_LINE", List.of("S1"))));
     }
 
     @Test
@@ -280,7 +278,7 @@ public void testGet2wtMapServer() throws Exception {
 
         //get the 2wt ids of a network
         String twtIdsAsString = List.of("twt1", "twt2", "twt3").toString();
-        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, "TWO_WINDINGS_TRANSFORMER", List.of(), twtIdsAsString);
+        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, twtIdsAsString, mapper.writeValueAsString(createRequestBody("TWO_WINDINGS_TRANSFORMER", List.of())));
         assertTrue(TestUtils.getRequestsDone(3, server).stream().anyMatch(r -> r.matches("/v1/parameters/" + LOADFLOW_PARAMETERS_UUID_STRING)));
     }
 
@@ -313,7 +311,7 @@ public void testGetSubstationMapServer() throws Exception {
 
         //get the substation ids of a network
         String substationIdsAsString = List.of("substation1", "substation2", "substation3").toString();
-        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, "SUBSTATION", List.of(), substationIdsAsString);
+        getNetworkElementsIds(studyNameUserIdUuid, rootNodeUuid, substationIdsAsString, mapper.writeValueAsString(createRequestBody("SUBSTATION", List.of())));
         assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.matches("/v1/parameters/" + LOADFLOW_PARAMETERS_UUID_STRING)));
     }
 
@@ -516,17 +514,15 @@ private RootNode getRootNode(UUID study) throws Exception {
     }
 
     @SneakyThrows
-    private MvcResult getNetworkElementsIds(UUID studyUuid, UUID rootNodeUuid, String elementType, List<String> substationsIds, String responseBody) {
-        UUID stubUuid = wireMockUtils.stubNetworkElementsIdsGet(NETWORK_UUID_STRING, elementType, responseBody);
-        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/network-map/equipments-ids", studyUuid, rootNodeUuid)
-                .queryParam(QUERY_PARAM_EQUIPMENT_TYPE, elementType);
-        if (!substationsIds.isEmpty()) {
-            mockHttpServletRequestBuilder.queryParam(QUERY_PARAM_SUBSTATIONS_IDS, substationsIds.stream().toArray(String[]::new));
-        }
+    private MvcResult getNetworkElementsIds(UUID studyUuid, UUID rootNodeUuid, String responseBody, String requestBody) {
+        UUID stubUuid = wireMockUtils.stubNetworkElementsIdsPost(NETWORK_UUID_STRING, responseBody);
+
+        MockHttpServletRequestBuilder mockHttpServletRequestBuilder = post("/v1/studies/{studyUuid}/nodes/{nodeUuid}/network-map/equipments-ids", studyUuid, rootNodeUuid)
+                .content(requestBody);
         MvcResult mvcResult = mockMvc.perform(mockHttpServletRequestBuilder)
                 .andExpect(status().isOk())
                 .andReturn();
-        wireMockUtils.verifyNetworkElementsIdsGet(stubUuid, NETWORK_UUID_STRING, elementType);
+        wireMockUtils.verifyNetworkElementsIdsPost(stubUuid, NETWORK_UUID_STRING, requestBody);
 
         return mvcResult;
     }
@@ -713,6 +709,13 @@ public void testGetNominalVoltagesError() throws Exception {
         wireMockUtils.verifyNominalVoltagesGet(stubUuid, NETWORK_UUID_STRING);
     }
 
+    private Map<String, Object> createRequestBody(String elementType, List<String> substationsIds) {
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("elementType", elementType);
+        requestBody.put("substationsIds", substationsIds);
+        return requestBody;
+    }
+
     private void cleanDB() {
         studyRepository.findAll().forEach(s -> networkModificationTreeService.doDeleteTree(s.getId()));
         studyRepository.deleteAll();
diff --git a/src/test/java/org/gridsuite/study/server/ShortCircuitTest.java b/src/test/java/org/gridsuite/study/server/ShortCircuitTest.java
@@ -266,18 +266,15 @@ public void testShortCircuitAnalysisParameters() throws Exception {
         UUID studyNameUserIdUuid = studyEntity.getId();
 
         //get default ShortCircuitParameters
-        mockMvc.perform(get("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)).andExpectAll(
-                status().isOk(),
-                content().string(TestUtils.resourceToString("/short-circuit-parameters.json")));
+        mockMvc.perform(get("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid))
+               .andExpectAll(status().isOk(), content().string(TestUtils.resourceToString("/short-circuit-parameters.json")));
         assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.equals("/v1/parameters")));
         assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.equals("/v1/parameters/" + SHORT_CIRCUIT_ANALYSIS_PARAMETERS_UUID)));
 
-        mockMvc.perform(
-                post("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)
+        mockMvc.perform(post("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)
                         .header(HEADER_USER_ID, "testUserId")
-                        .contentType(MediaType.APPLICATION_JSON)
-                        .content("{\"dumb\": \"json\"}")).andExpect(
-                status().isOk());
+                        .content("{\"dumb\": \"json\"}").contentType(MediaType.APPLICATION_JSON))
+                .andExpect(status().isOk());
         assertTrue(TestUtils.getRequestsDone(1, server).stream().anyMatch(r -> r.equals("/v1/parameters")));
     }
 
@@ -657,7 +654,7 @@ public void testNoResult() throws Exception {
         mockMvc.perform(get("/v1/studies/{studyUuid}/nodes/{nodeUuid}/shortcircuit/status", studyNameUserIdUuid, modificationNode1Uuid)).andExpectAll(
                 status().isNoContent());
 
-        // stop non existing short circuit analysis
+        // stop non-existing short circuit analysis
         mockMvc.perform(put("/v1/studies/{studyUuid}/nodes/{nodeUuid}/shortcircuit/stop", studyNameUserIdUuid, modificationNode1Uuid)).andExpect(status().isOk());
     }
 
diff --git a/src/test/java/org/gridsuite/study/server/utils/WireMockUtils.java b/src/test/java/org/gridsuite/study/server/utils/WireMockUtils.java
@@ -13,7 +13,6 @@
 import com.github.tomakehurst.wiremock.matching.RequestPatternBuilder;
 import com.github.tomakehurst.wiremock.matching.StringValuePattern;
 import com.github.tomakehurst.wiremock.stubbing.ServeEvent;
-import lombok.NonNull;
 
 import java.util.List;
 import java.util.Map;
@@ -88,15 +87,15 @@ public void verifyNetworkElementsInfosGet(UUID stubUuid, String networkUuid, Str
                    QUERY_PARAM_INFO_TYPE, WireMock.equalTo(infoType)));
     }
 
-    public UUID stubNetworkElementsIdsGet(String networkUuid, String elementType, String responseBody) {
-        return wireMock.stubFor(WireMock.get(WireMock.urlPathEqualTo(URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + "elements-ids"))
-                .withQueryParam(QUERY_PARAM_ELEMENT_TYPE, WireMock.equalTo(elementType))
+    public UUID stubNetworkElementsIdsPost(String networkUuid, String responseBody) {
+        return wireMock.stubFor(WireMock.post(WireMock.urlPathEqualTo(URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + "elements-ids"))
                 .willReturn(WireMock.ok().withBody(responseBody))
         ).getId();
     }
 
-    public void verifyNetworkElementsIdsGet(UUID stubUuid, String networkUuid, String elementType) {
-        verifyGetRequest(stubUuid, URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + "elements-ids", Map.of(QUERY_PARAM_ELEMENT_TYPE, WireMock.equalTo(elementType)));
+    public void verifyNetworkElementsIdsPost(UUID stubUuid, String networkUuid, String requestBody) {
+        verifyPostRequest(stubUuid, URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + "elements-ids", false,
+                Map.of(), requestBody);
     }
 
     public UUID stubNetworkEquipmentsInfosGet(String networkUuid, String equipmentPath, String responseBody) {
@@ -109,17 +108,6 @@ public void verifyNetworkEquipmentsInfosGet(UUID stubUuid, String networkUuid, S
         verifyGetRequest(stubUuid, URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + equipmentPath, Map.of());
     }
 
-    public UUID stubNetworkEquipmentsInfosGet(String networkUuid, String infoTypePath, String equipmentType, String responseBody) {
-        return wireMock.stubFor(WireMock.get(WireMock.urlPathEqualTo(URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + infoTypePath))
-                .withQueryParam(QUERY_PARAM_EQUIPMENT_TYPE, WireMock.equalTo(equipmentType))
-                .willReturn(WireMock.ok().withBody(responseBody))
-        ).getId();
-    }
-
-    public void verifyNetworkEquipmentsInfosGet(UUID stubUuid, String networkUuid, String infoTypePath, String equipmentType) {
-        verifyGetRequest(stubUuid, URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + infoTypePath, Map.of(QUERY_PARAM_EQUIPMENT_TYPE, WireMock.equalTo(equipmentType)));
-    }
-
     public UUID stubNetworkEquipmentInfosGet(String networkUuid, String infoTypePath, String equipmentId, String responseBody) {
         return wireMock.stubFor(WireMock.get(WireMock.urlPathEqualTo(URI_NETWORK_DATA + DELIMITER + networkUuid + DELIMITER + infoTypePath + DELIMITER + equipmentId))
                 .willReturn(WireMock.ok().withBody(responseBody))
@@ -353,12 +341,6 @@ public void verifyDisableCaseExpiration(UUID stubUuid, String caseUuid) {
         verifyPutRequest(stubUuid, "/v1/cases/" + caseUuid + "/disableExpiration", false, Map.of(), null);
     }
 
-    public void verifyActuatorHealth(@NonNull final String serviceName, final UUID stubUuid, final int nbServer) {
-        RequestPatternBuilder requestBuilder = WireMock.getRequestedFor(WireMock.urlPathEqualTo("/" + serviceName + "/actuator/health"));
-        wireMock.verify(nbServer, requestBuilder);
-        removeRequestForStub(stubUuid, nbServer);
-    }
-
     public UUID stubCountriesGet(String networkUuid, String responseBody) {
         return wireMock.stubFor(WireMock.get(WireMock.urlPathEqualTo("/v1/networks/" + networkUuid + "/countries"))
                 .willReturn(WireMock.ok().withBody(responseBody))
diff --git a/src/test/resources/short-circuit-updated-predefined-parameters.json b/src/test/resources/short-circuit-updated-predefined-parameters.json
@@ -0,0 +1,35 @@
+{
+  "predefinedParameters":"ICC_MIN_WITH_NOMINAL_VOLTAGE_MAP",
+  "parameters":{
+    "version":"1.3",
+    "withLimitViolations":true,
+    "withVoltageResult":false,
+    "withFeederResult":true,
+    "studyType":"TRANSIENT",
+    "minVoltageDropProportionalThreshold":20.0,
+    "withFortescueResult":false,
+    "withLoads":false,
+    "withShuntCompensators":false,
+    "withVSCConverterStations":false,
+    "withNeutralPosition":true,
+    "initialVoltageProfileMode":"NOMINAL",
+    "detailedReport":true
+  },
+  "cei909VoltageRanges":[
+    {
+      "minimumNominalVoltage":10.0,
+      "maximumNominalVoltage":199.99,
+      "voltageRangeCoefficient":1.1
+    },
+    {
+      "minimumNominalVoltage":200.0,
+      "maximumNominalVoltage":299.99,
+      "voltageRangeCoefficient":1.09
+    },
+    {
+      "minimumNominalVoltage":300.0,
+      "maximumNominalVoltage":500.0,
+      "voltageRangeCoefficient":1.05
+    }
+  ]
+}

Original file line number	Diff line number	Diff line change
`@@ -12,5 +12,6 @@`
`12`	`12`	`@Deprecated(forRemoval = true, since = "1.7.0")`
`13`	`13`	`public enum ShortCircuitPredefinedConfiguration {`
`14`	`14`	`ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP,`
`15`		`- ICC_MAX_WITH_CEI909`
	`15`	`+ ICC_MAX_WITH_CEI909,`
	`16`	`+ ICC_MIN_WITH_NOMINAL_VOLTAGE_MAP`
`16`	`17`	`}`