Bug #15626 - [Operations Management] – Fix: cancellation of an operation in a non-cancellable step.

Author: Salim Terres

api/api-referential/referential/src/main/java/fr/gouv/vitamui/referential/server/rest/LogbookManagementOperationController.java

@@ -90,7 +90,8 @@ public VitamUIProcessDetailResponseDto cancelOperationProcessExecution(
             request.getReason()
         );
         ProcessDetailDto processDetailDto = logbookManagementOperationService.cancelOperationProcessExecution(
-            operationId
+            operationId,
+            request.isStepCancellable()
         );
         if (processDetailDto != null) {
             operationResponseDto = processDetailDto.getOperations();

api/api-referential/referential/src/main/java/fr/gouv/vitamui/referential/server/service/logbookmanagement/LogbookManagementOperationService.java

@@ -111,11 +111,14 @@ public ProcessDetailDto updateOperationActionProcess(
         return operation;
     }
 
-    public ProcessDetailDto cancelOperationProcessExecution(VitamContext vitamContext, String operationId)
-        throws VitamClientException, JsonProcessingException {
+    public ProcessDetailDto cancelOperationProcessExecution(
+        VitamContext vitamContext,
+        String operationId,
+        boolean stepCancellable
+    ) throws VitamClientException, JsonProcessingException {
         ProcessDetailDto operation;
         LOGGER.info("Cancel the operation Id=  {}", operationId);
-        vitamOperationCommonService.cancelOperationProcessExecution(vitamContext, operationId);
+        vitamOperationCommonService.cancelOperationProcessExecution(vitamContext, operationId, stepCancellable);
         ProcessQuery processQuery = new ProcessQuery();
         processQuery.setId(operationId);
         operation = searchOperationsDetails(vitamContext, processQuery);
@@ -141,10 +144,10 @@ public ProcessDetailDto updateOperationActionProcess(String actionId, String ope
         }
     }
 
-    public ProcessDetailDto cancelOperationProcessExecution(String operationId) {
+    public ProcessDetailDto cancelOperationProcessExecution(String operationId, boolean stepCancellable) {
         VitamContext vitamContext = buildVitamContext();
         try {
-            return this.cancelOperationProcessExecution(vitamContext, operationId);
+            return this.cancelOperationProcessExecution(vitamContext, operationId, stepCancellable);
         } catch (VitamClientException | JsonProcessingException e) {
             throw new InternalServerException("Unable to cancel operation process execution", e);
         }

api/api-referential/referential/src/test/java/fr/gouv/vitamui/referential/server/service/LogbookManagementOperationInternalServiceTest.java

@@ -144,12 +144,16 @@ public void cancelOperationProcessExecution_should_throw_VitamClientException_wh
         String identifier = "identifier";
 
         when(
-            vitamOperationCommonService.cancelOperationProcessExecution(any(VitamContext.class), any(String.class))
+            vitamOperationCommonService.cancelOperationProcessExecution(
+                any(VitamContext.class),
+                any(String.class),
+                any(Boolean.class)
+            )
         ).thenThrow(new VitamClientException("Exception thrown by vitam"));
 
         //When //Then
         assertThatCode(() -> {
-            logbookManagementOperationService.cancelOperationProcessExecution(vitamContext, identifier);
+            logbookManagementOperationService.cancelOperationProcessExecution(vitamContext, identifier, false);
         }).isInstanceOf(VitamClientException.class);
     }
 

commons/commons-vitam/src/main/java/fr/gouv/vitamui/commons/vitam/api/administration/VitamOperationCommonService.java

@@ -72,8 +72,13 @@ public RequestResponse<ItemStatus> updateOperationActionProcess(
         return adminExternalClient.updateOperationActionProcess(vitamContext, actionId, operationId);
     }
 
-    public RequestResponse<ItemStatus> cancelOperationProcessExecution(VitamContext vitamContext, String operationId)
-        throws VitamClientException, IllegalArgumentException {
-        return adminExternalClient.cancelOperationProcessExecution(vitamContext, operationId);
+    public RequestResponse<ItemStatus> cancelOperationProcessExecution(
+        VitamContext vitamContext,
+        String operationId,
+        boolean stepCancellable
+    ) throws VitamClientException, IllegalArgumentException {
+        return stepCancellable
+            ? adminExternalClient.cancelOperationProcessExecution(vitamContext, operationId)
+            : adminExternalClient.cancelOperationProcessExecution(vitamContext, operationId, true);
     }
 }