workflowApi - PUT requests return http 500 if ID is unknown

modules/api/src/main/java/org/eclipse/xpanse/api/exceptions/handler/DeploymentExceptionHandler.java

@@ -9,6 +9,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.eclipse.xpanse.modules.models.response.Response;
 import org.eclipse.xpanse.modules.models.response.ResultType;
+import org.eclipse.xpanse.modules.models.service.deploy.exceptions.ActivitiTaskNotFoundException;
 import org.eclipse.xpanse.modules.models.service.deploy.exceptions.DeployerNotFoundException;
 import org.eclipse.xpanse.modules.models.service.deploy.exceptions.FlavorInvalidException;
 import org.eclipse.xpanse.modules.models.service.deploy.exceptions.InvalidDeploymentVariableException;
@@ -170,4 +171,16 @@ public Response handleServiceDetailsNotAccessible(
         return Response.errorResponse(ResultType.SERVICE_DETAILS_NOT_ACCESSIBLE,
                 Collections.singletonList(ex.getMessage()));
     }
+
+    /**
+     * Exception handler for ActivitiTaskNotFoundException.
+     */
+    @ExceptionHandler({ActivitiTaskNotFoundException.class})
+    @ResponseStatus(HttpStatus.BAD_REQUEST)
+    @ResponseBody
+    public Response handleActivitiTaskNotFoundException(
+            ActivitiTaskNotFoundException ex) {
+        return Response.errorResponse(ResultType.ACTIVITI_TASK_NOT_FOUND,
+                Collections.singletonList(ex.getMessage()));
+    }
 }

modules/models/src/main/java/org/eclipse/xpanse/modules/models/response/ResultType.java

@@ -54,7 +54,8 @@ public enum ResultType {
     POLICY_VALIDATION_FAILED("Policy Validation Failed"),
     POLICY_EVALUATION_FAILED("Policy Evaluation Failed"),
     USER_NO_LOGIN_EXCEPTION("Current Login User No Found"),
-    SERVICE_DETAILS_NOT_ACCESSIBLE("Service Details No Accessible");
+    SERVICE_DETAILS_NOT_ACCESSIBLE("Service Details No Accessible"),
+    ACTIVITI_TASK_NOT_FOUND("Migrating activiti Task Not Found");
 
     private final String value;
 

modules/models/src/main/java/org/eclipse/xpanse/modules/models/service/deploy/exceptions/ActivitiTaskNotFoundException.java

@@ -0,0 +1,16 @@
+/*
+ * SPDX-License-Identifier: Apache-2.0
+ * SPDX-FileCopyrightText: Huawei Inc.
+ */
+
+package org.eclipse.xpanse.modules.models.service.deploy.exceptions;
+
+
+/**
+ * Exception thrown when the during migration, the migration task was not found.
+ */
+public class ActivitiTaskNotFoundException extends RuntimeException {
+    public ActivitiTaskNotFoundException(String message) {
+        super(message);
+    }
+}

modules/workflow/src/main/java/org/eclipse/xpanse/modules/workflow/utils/WorkflowProcessUtils.java

@@ -18,6 +18,7 @@
 import org.activiti.engine.runtime.ProcessInstance;
 import org.activiti.engine.task.Task;
 import org.activiti.engine.task.TaskInfo;
+import org.eclipse.xpanse.modules.models.service.deploy.exceptions.ServiceNotDeployedException;
 import org.eclipse.xpanse.modules.models.workflow.WorkFlowTask;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Component;
@@ -93,6 +94,7 @@ public List<WorkFlowTask> doneTasks(String userId) {
      * @param variables global process variables.
      */
     public void completeTask(String taskId, Map<String, Object> variables) {
+        vaildateTaskId(taskId);
         taskService.complete(taskId, variables);
     }
 
@@ -120,4 +122,12 @@ private List<WorkFlowTask> transHistoricTaskInstanceToWorkFlowTask(
             List<HistoricTaskInstance> list) {
         return list.stream().map(this::getWorkFlow).collect(Collectors.toList());
     }
+
+    private void vaildateTaskId(String taskId) {
+        Task task = taskService.createTaskQuery().taskId(taskId).singleResult();
+        if (task == null) {
+            throw new ServiceNotDeployedException("The migrated activiti task was not found, "
+                    + "taskId: " + taskId);
+        }
+    }
 }