Add short circuit parameter (#559)

* Add shortcircuit parameter
---------

Signed-off-by: maissa SOUISSI <[email protected]>

Author: souissimai

src/main/java/org/gridsuite/study/server/dto/ShortCircuitPredefinedConfiguration.java

@@ -11,5 +11,6 @@
  */
 public enum ShortCircuitPredefinedConfiguration {
     ICC_MAX_WITH_NOMINAL_VOLTAGE_MAP,
-    ICC_MAX_WITH_CEI909
+    ICC_MAX_WITH_CEI909,
+    ICC_MIN_WITH_NOMINAL_VOLTAGE_MAP
 }

src/test/java/org/gridsuite/study/server/ShortCircuitTest.java

@@ -287,22 +287,42 @@ public void testShortCircuitAnalysisParameters() throws Exception {
                 content().string(TestUtils.resourceToString("/short-circuit-parameters.json")));
 
         // change some short circuit parameters
-        ShortCircuitParameters shortCircuitParameters = ShortCircuitService.newShortCircuitParameters(StudyType.TRANSIENT, 20, true, true, false, false, true, true, true, true, InitialVoltageProfileMode.NOMINAL, null);
-        ShortCircuitParametersInfos shortCircuitParametersInfos = new ShortCircuitParametersInfos();
-        shortCircuitParametersInfos.setParameters(shortCircuitParameters);
-        shortCircuitParametersInfos.setPredefinedParameters(ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_CEI909);
+        ShortCircuitParameters shortCircuitParametersWithIccMax = ShortCircuitService.newShortCircuitParameters(StudyType.TRANSIENT, 20, true, true, false, false, true, true, true, true, InitialVoltageProfileMode.NOMINAL, null);
+        ShortCircuitParametersInfos shortCircuitParametersWithIccMaxInfos = new ShortCircuitParametersInfos();
+        shortCircuitParametersWithIccMaxInfos.setParameters(shortCircuitParametersWithIccMax);
+        shortCircuitParametersWithIccMaxInfos.setPredefinedParameters(ShortCircuitPredefinedConfiguration.ICC_MAX_WITH_CEI909);
 
         mockMvc.perform(
                 post("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)
                         .header(HEADER_USER_ID, "testUserId")
                         .contentType(MediaType.APPLICATION_JSON)
-                        .content(objectWriter.writeValueAsString(shortCircuitParametersInfos))).andExpect(
+                        .content(objectWriter.writeValueAsString(shortCircuitParametersWithIccMaxInfos))).andExpect(
                 status().isOk());
 
         //getting set values
         mockMvc.perform(get("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)).andExpectAll(
                 status().isOk(),
                 content().string(TestUtils.resourceToString("/short-circuit-updated-parameters.json")));
+
+        // change some short circuit parameters
+        ShortCircuitParameters shortCircuitParametersWithIccMin = ShortCircuitService.newShortCircuitParameters(StudyType.TRANSIENT, 20, true, true, false, false, false, false, false, true, InitialVoltageProfileMode.NOMINAL, null);
+        ShortCircuitParametersInfos shortCircuitParametersWithIccMinInfos = new ShortCircuitParametersInfos();
+        shortCircuitParametersWithIccMinInfos.setParameters(shortCircuitParametersWithIccMin);
+
+        //change predefined params
+        shortCircuitParametersWithIccMinInfos.setPredefinedParameters(ShortCircuitPredefinedConfiguration.ICC_MIN_WITH_NOMINAL_VOLTAGE_MAP);
+
+        mockMvc.perform(
+                post("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)
+                        .header(HEADER_USER_ID, "testUserId")
+                        .contentType(MediaType.APPLICATION_JSON)
+                        .content(objectWriter.writeValueAsString(shortCircuitParametersWithIccMinInfos))).andExpect(
+                status().isOk());
+
+        //getting set values
+        mockMvc.perform(get("/v1/studies/{studyUuid}/short-circuit-analysis/parameters", studyNameUserIdUuid)).andExpectAll(
+                status().isOk(),
+                content().string(TestUtils.resourceToString("/short-circuit-updated-predefined-parameters.json")));
     }
 
     @Test
@@ -682,7 +702,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());
     }
 

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
+    }
+  ]
+}