Bump gridsuite dependencies to 32 (#141)

Signed-off-by: Seddik Yengui <[email protected]>

Author: YenguiSeddik

pom.xml

@@ -43,7 +43,7 @@
 
     <properties>
         <jib.from.image>powsybl/java-dynawo:2.1.0</jib.from.image>
-        <gridsuite-dependencies.version>31</gridsuite-dependencies.version>
+        <gridsuite-dependencies.version>32</gridsuite-dependencies.version>
         <liquibase-hibernate-package>org.gridsuite.securityanalysis.server</liquibase-hibernate-package>
         <db-util.version>1.0.5</db-util.version>
         <powsybl-network-store.version>1.16.0</powsybl-network-store.version>

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

@@ -229,8 +229,9 @@ public ResponseEntity<Void> invalidateStatus(@Parameter(description = "Result uu
     @Operation(summary = "Stop a security analysis computation")
     @ApiResponses(value = {@ApiResponse(responseCode = "200", description = "The security analysis has been stopped")})
     public ResponseEntity<Void> stop(@Parameter(description = "Result UUID") @PathVariable("resultUuid") UUID resultUuid,
-                                           @Parameter(description = "Result receiver") @RequestParam(name = "receiver", required = false) String receiver) {
-        securityAnalysisService.stop(resultUuid, receiver);
+                                     @Parameter(description = "Result receiver") @RequestParam(name = "receiver", required = false) String receiver,
+                                     @RequestHeader(HEADER_USER_ID) String userId) {
+        securityAnalysisService.stop(resultUuid, receiver, userId);
         return ResponseEntity.ok().build();
     }
 

src/main/resources/config/application.yaml

@@ -32,7 +32,9 @@ spring:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.stopped
         publishFailed-out-0:
           destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.failed
-      output-bindings: publishRun-out-0;publishResult-out-0;publishCancel-out-0;publishStopped-out-0;publishFailed-out-0
+        publishCancelFailed-out-0:
+          destination: ${powsybl-ws.rabbitmq.destination.prefix:}sa.cancelfailed
+      output-bindings: publishRun-out-0;publishResult-out-0;publishCancel-out-0;publishStopped-out-0;publishFailed-out-;publishCancelFailed-out-0
 
 powsybl-ws:
   database:

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

@@ -648,8 +648,8 @@ public void stopTest() throws Exception {
         // wait for security analysis to actually run before trying to stop it
         countDownLatch.await();
 
-        mockMvc.perform(put("/" + VERSION + "/results/" + RESULT_UUID + "/stop"
-            + "?receiver=me"))
+        mockMvc.perform(put("/" + VERSION + "/results/" + RESULT_UUID + "/stop" + "?receiver=me")
+                        .header(HEADER_USER_ID, "testUserId"))
                 .andExpect(status().isOk());
 
         Message<byte[]> message = output.receive(TIMEOUT * 3, "sa.stopped");
@@ -658,6 +658,19 @@ public void stopTest() throws Exception {
         assertEquals(getCancelMessage(COMPUTATION_TYPE), message.getHeaders().get("message"));
     }
 
+    @Test
+    public void testStopAndFail() throws Exception {
+        UUID randomUuid = UUID.randomUUID();
+        mockMvc.perform(put("/" + VERSION + "/results/" + randomUuid + "/stop" + "?receiver=me")
+                        .header(HEADER_USER_ID, "testUserId"))
+                .andExpect(status().isOk());
+
+        Message<byte[]> message = output.receive(TIMEOUT * 3, "sa.cancelfailed");
+        assertEquals(randomUuid.toString(), message.getHeaders().get("resultUuid"));
+        assertEquals("me", message.getHeaders().get("receiver"));
+        assertEquals(getCancelFailedMessage(COMPUTATION_TYPE), message.getHeaders().get("message"));
+    }
+
     @Test
     public void runTestWithError() throws Exception {
         MvcResult mvcResult;