fix PublishEventsIT

apache · Sep 4, 2024 · 1b8b2a3 · 1b8b2a3
1 parent ce6441b
commit 1b8b2a3
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 13 deletions.
diff --git a/api/kogito-api/src/main/java/org/kie/kogito/usertask/lifecycle/UserTaskState.java b/api/kogito-api/src/main/java/org/kie/kogito/usertask/lifecycle/UserTaskState.java
@@ -78,4 +78,9 @@ public static UserTaskState initalized() {
         return of(null);
     }
 
+    @Override
+    public String toString() {
+        return "UserTaskState [terminate=" + terminate + ", name=" + name + "]";
+    }
+
 }
diff --git a/api/kogito-api/src/main/java/org/kie/kogito/usertask/model/UserTaskModel.java b/api/kogito-api/src/main/java/org/kie/kogito/usertask/model/UserTaskModel.java
@@ -18,6 +18,7 @@
  */
 package org.kie.kogito.usertask.model;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -39,6 +40,12 @@ public class UserTaskModel {
     private Map<String, Object> inputs;
     private Map<String, Object> outputs;
 
+    private Map<String, Object> metadata;
+
+    public UserTaskModel() {
+        this.metadata = new HashMap<>();
+    }
+
     public Map<String, Object> getInputs() {
         return inputs;
     }
@@ -192,5 +199,17 @@ public String getExternalReferenceId() {
     public void setExternalReferenceId(String externalReferenceId) {
         this.externalReferenceId = externalReferenceId;
     }
+
+    public void setMetadata(String key, Object value) {
+        this.metadata.put(key, value);
+    }
+
+    public Map<String, Object> getMetadata() {
+        return metadata;
+    }
+
+    public void setMetadata(Map<String, Object> metadata) {
+        this.metadata = metadata;
+    }
 
 }
diff --git a/...e/src/main/java/org/kie/kogito/event/impl/adapter/UserTaskStateEventDataEventAdapter.java b/...e/src/main/java/org/kie/kogito/event/impl/adapter/UserTaskStateEventDataEventAdapter.java
@@ -61,7 +61,7 @@ public DataEvent<?> adapt(Object payload) {
 
         UserTaskInstanceStateEventBody body = builder.build();
         UserTaskInstanceStateDataEvent utEvent =
-                new UserTaskInstanceStateDataEvent(AdapterHelper.buildSource(getConfig().service(), event.getUserTaskModel().getExternalReferenceId()), getConfig().addons().toString(),
+                new UserTaskInstanceStateDataEvent(AdapterHelper.buildSource(getConfig().service(), (String) event.getUserTaskModel().getMetadata().get("ProcessId")), getConfig().addons().toString(),
                         event.getEventUser(),
                         metadata, body);
 

diff --git a/...ask/src/main/java/org/kie/kogito/jbpm/usertask/handler/UserTaskKogitoWorkItemHandler.java b/...ask/src/main/java/org/kie/kogito/jbpm/usertask/handler/UserTaskKogitoWorkItemHandler.java
@@ -42,6 +42,7 @@
 import org.kie.kogito.usertask.model.UserTaskModel;
 
 import static java.util.Collections.emptyMap;
+import static java.util.Collections.singletonMap;
 import static java.util.Optional.ofNullable;
 
 /**
@@ -130,7 +131,8 @@ static public Optional<WorkItemTransition> userTaskActivateWorkItemHandler(Kogit
         model.setTaskDescription((String) workItem.getParameter(DESCRIPTION));
         model.setTaskPriority(priorityInteger);
         model.setExternalReferenceId(workItem.getStringId());
-
+        model.setMetadata("ProcessId", workItem.getProcessInstance().getProcessId());
+
         ofNullable(workItem.getParameters().get(ACTOR_ID)).map(String.class::cast).map(UserTaskKogitoWorkItemHandler::toSet).ifPresent(model::setPotentialUsers);
         ofNullable(workItem.getParameters().get(GROUP_ID)).map(String.class::cast).map(UserTaskKogitoWorkItemHandler::toSet).ifPresent(model::setPotentialGroups);
         ofNullable(workItem.getParameters().get(BUSINESSADMINISTRATOR_ID)).map(String.class::cast).map(UserTaskKogitoWorkItemHandler::toSet).ifPresent(model::setAdminUsers);
@@ -140,14 +142,13 @@ static public Optional<WorkItemTransition> userTaskActivateWorkItemHandler(Kogit
         UserTaskInstance instance = userTask.createInstance(model);
         if (workItem instanceof InternalKogitoWorkItem ikw) {
             ikw.setExternalReferenceId(instance.id());
-            ikw.setActualOwner(instance.getActualOwner());
         }
 
         instance.transition(instance.createTransitionToken("activate", emptyMap()));
         if (instance.getActualOwner() == null) {
             return Optional.empty();
         } else {
-            return Optional.of(handler.newTransition(TRANSITION_ACTIVATED_CLAIM.id(), workItem.getPhaseStatus(), emptyMap()));
+            return Optional.of(handler.newTransition(TRANSITION_ACTIVATED_CLAIM.id(), workItem.getPhaseStatus(), singletonMap("ACTUAL_OWNER", instance.getActualOwner())));
         }
     }
 
@@ -172,7 +173,6 @@ static public Optional<WorkItemTransition> userTaskClaimWorkItemHandler(KogitoWo
             if (workItem instanceof InternalKogitoWorkItem ikw) {
                 ikw.setActualOwner(ut.getActualOwner());
             }
-            ut.transition(ut.createTransitionToken("claim", data));
         });
         return Optional.empty();
     }
@@ -202,7 +202,7 @@ static public Optional<WorkItemTransition> userTaskAbortWorkItemHandler(KogitoWo
         UserTasks userTasks = handler.getApplication().get(UserTasks.class);
         UserTask userTask = userTasks.userTaskById((String) workItem.getParameter("id"));
         userTask.instances().findById(workItem.getExternalReferenceId()).ifPresent(ut -> {
-            ut.transition(ut.createTransitionToken("fail", emptyMap()));
+            ut.transition(ut.createTransitionToken("skip", emptyMap()));
         });
         return Optional.empty();
     }

diff --git a/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/DefaultUserTaskInstance.java b/jbpm/jbpm-usertask/src/main/java/org/kie/kogito/usertask/impl/DefaultUserTaskInstance.java
@@ -21,6 +21,7 @@
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
 
@@ -126,9 +127,16 @@ public UserTaskTransitionToken createTransitionToken(String transitionId, Map<St
 
     @Override
     public void transition(UserTaskTransitionToken token) {
-        UserTaskTransition transition = token.transition();
-        this.setUserTaskLifeCycle.transition(this, token);
-        userTaskEventSupport.fireOneUserTaskStateChange(this, transition.source().getName(), transition.target().getName());
+        Optional<UserTaskTransitionToken> next = Optional.of(token);
+        while (next.isPresent()) {
+            UserTaskTransition transition = next.get().transition();
+            next = this.setUserTaskLifeCycle.transition(this, token);
+            this.status = transition.target();
+            userTaskEventSupport.fireOneUserTaskStateChange(this, transition.source().getName(), transition.target().getName());
+            if (this.status.isTerminate().isPresent()) {
+                this.instances.remove(this.id);
+            }
+        }
     }
 
     @Override

diff --git a/...ertask/src/main/java/org/kie/kogito/usertask/impl/lifecycle/DefaultUserTaskLifeCycle.java b/...ertask/src/main/java/org/kie/kogito/usertask/impl/lifecycle/DefaultUserTaskLifeCycle.java
@@ -41,8 +41,10 @@ public class DefaultUserTaskLifeCycle implements UserTaskLifeCycle {
     private static final UserTaskTransition T_NEW_ACTIVE = new DefaultUserTransition("activate", INACTIVE, ACTIVE, DefaultUserTaskLifeCycle::activate);
     private static final UserTaskTransition T_ACTIVE_RESERVED = new DefaultUserTransition("claim", ACTIVE, RESERVED, DefaultUserTaskLifeCycle::claim);
     private static final UserTaskTransition T_RESERVED_ACTIVE = new DefaultUserTransition("release", RESERVED, ACTIVE, DefaultUserTaskLifeCycle::release);
+    private static final UserTaskTransition T_ACTIVE_COMPLETED = new DefaultUserTransition("complete", ACTIVE, COMPLETED, DefaultUserTaskLifeCycle::complete);
     private static final UserTaskTransition T_RESERVED_COMPLETED = new DefaultUserTransition("complete", RESERVED, COMPLETED, DefaultUserTaskLifeCycle::complete);
     private static final UserTaskTransition T_RESERVED_SKIPPED = new DefaultUserTransition("skip", RESERVED, OBSOLETE, DefaultUserTaskLifeCycle::skip);
+    private static final UserTaskTransition T_ACTIVE_SKIPPED = new DefaultUserTransition("skip", ACTIVE, OBSOLETE, DefaultUserTaskLifeCycle::complete);
     private static final UserTaskTransition T_RESERVED_ERROR = new DefaultUserTransition("fail", RESERVED, ERROR, DefaultUserTaskLifeCycle::fail);
 
     private List<UserTaskTransition> transitions;
@@ -52,7 +54,9 @@ public DefaultUserTaskLifeCycle() {
                 T_NEW_ACTIVE,
                 T_ACTIVE_RESERVED,
                 T_RESERVED_ACTIVE,
+                T_ACTIVE_COMPLETED,
                 T_RESERVED_COMPLETED,
+                T_ACTIVE_SKIPPED,
                 T_RESERVED_SKIPPED,
                 T_RESERVED_ERROR);
     }

diff --git a/...s-workitems/src/main/java/org/jbpm/process/workitem/builtin/SystemOutWorkItemHandler.java b/...s-workitems/src/main/java/org/jbpm/process/workitem/builtin/SystemOutWorkItemHandler.java
@@ -39,4 +39,9 @@ public Optional<WorkItemTransition> abortWorkItemHandler(KogitoWorkItemManager m
         return Optional.of(this.workItemLifeCycle.newTransition("abort", workItem.getPhaseStatus(), workItem.getResults()));
     }
 
+
+    @Override
+    public String getName() {
+        return "Log";
+    }
 }
diff --git a/...ess-workitems/src/main/java/org/kie/kogito/process/workitems/impl/KogitoWorkItemImpl.java b/...ess-workitems/src/main/java/org/kie/kogito/process/workitems/impl/KogitoWorkItemImpl.java
@@ -543,7 +543,7 @@ public String getExternalReferenceId() {
 
     @Override
     public void setExternalReferenceId(String externalReferenceId) {
-        this.externalReferenceId = id;
+        this.externalReferenceId = externalReferenceId;
     }
 
     @Override

diff --git a/...rocesses-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java b/...rocesses-integration-tests/src/test/java/org/kie/kogito/codegen/tests/PublishEventIT.java
@@ -252,7 +252,7 @@ public void onUserTaskState(UserTaskStateEvent event) {
         left = findNodeInstanceEvents(events, 2);
         assertThat(left).hasSize(2).extractingResultOf("getNodeType").containsOnly("HumanTaskNode", "EndNode");
 
-        assertUserTaskInstanceEvent(events.get(1), "SecondTask", null, "1", "Completed", "UserTasksProcess", "Second Task");
+        assertUserTaskInstanceEvent(events.get(0), "SecondTask", null, "1", "Completed", "UserTasksProcess", "Second Task");
     }
 
     @Test
@@ -299,12 +299,12 @@ public void testBasicUserTaskProcessAbort() throws Exception {
         uow.end();
         assertThat(processInstance.status()).isEqualTo(ProcessInstance.STATE_ABORTED);
         events = publisher.extract();
-        assertThat(events).hasSize(4);
+        assertThat(events).hasSize(3);
 
         triggered = findNodeInstanceEvents(events, ProcessInstanceNodeEventBody.EVENT_TYPE_ABORTED);
         assertThat(triggered).hasSize(1).extractingResultOf("getNodeName").containsOnly("First Task");
 
-        assertProcessInstanceEvent(events.get(3), "UserTasksProcess", "UserTasksProcess", ProcessInstance.STATE_ABORTED);
+        assertProcessInstanceEvent(events.get(2), "UserTasksProcess", "UserTasksProcess", ProcessInstance.STATE_ABORTED);
 
     }