[Fix #744] Suspend/resume status and associated event

Workflow suspend and resume event should be sent regardless a task was
in fact suspended or not. Same applies to workflow status.

Signed-off-by: Francisco Javier Tirado Sarti <[email protected]>

Author: fjtirado

impl/core/src/main/java/io/serverlessworkflow/impl/WorkflowMutableInstance.java

@@ -176,6 +176,10 @@ public boolean suspend() {
       statusLock.lock();
       if (TaskExecutorHelper.isActive(status.get())) {
         suspended = new CompletableFuture<TaskContext>();
+        workflowContext.instance().status(WorkflowStatus.SUSPENDED);
+        publishEvent(
+            workflowContext,
+            l -> l.onWorkflowSuspended(new WorkflowSuspendedEvent(workflowContext)));
         return true;
       } else {
         return false;
@@ -197,11 +201,11 @@ public boolean resume() {
           publishEvent(
               workflowContext,
               l -> l.onTaskResumed(new TaskResumedEvent(workflowContext, suspendedTask)));
-          publishEvent(
-              workflowContext, l -> l.onWorkflowResumed(new WorkflowResumedEvent(workflowContext)));
         } else {
           suspended = null;
         }
+        publishEvent(
+            workflowContext, l -> l.onWorkflowResumed(new WorkflowResumedEvent(workflowContext)));
         return true;
       } else {
         return false;
@@ -216,12 +220,8 @@ public CompletableFuture<TaskContext> completedChecks(TaskContext t) {
       statusLock.lock();
       if (suspended != null) {
         suspendedTask = t;
-        workflowContext.instance().status(WorkflowStatus.SUSPENDED);
         publishEvent(
             workflowContext, l -> l.onTaskSuspended(new TaskSuspendedEvent(workflowContext, t)));
-        publishEvent(
-            workflowContext,
-            l -> l.onWorkflowSuspended(new WorkflowSuspendedEvent(workflowContext)));
         return suspended;
       }
       if (cancelled != null) {

impl/test/src/test/java/io/serverlessworkflow/impl/test/LifeCycleEventsTest.java

@@ -115,9 +115,18 @@ void testSuspendResumeNotWait()
             .instance(Map.of());
     CompletableFuture<WorkflowModel> future = instance.start();
     instance.suspend();
+    assertThat(instance.status()).isEqualTo(WorkflowStatus.SUSPENDED);
     instance.resume();
     assertThat(future.get(1, TimeUnit.SECONDS).asMap().orElseThrow())
         .isEqualTo(Map.of("name", "Javierito"));
+    assertThat(instance.status()).isEqualTo(WorkflowStatus.COMPLETED);
+    WorkflowSuspendedCEData workflowSuspendedEvent =
+        assertPojoInCE(
+            "io.serverlessworkflow.workflow.suspended.v1", WorkflowSuspendedCEData.class);
+    WorkflowResumedCEData workflowResumedEvent =
+        assertPojoInCE("io.serverlessworkflow.workflow.resumed.v1", WorkflowResumedCEData.class);
+    assertThat(workflowSuspendedEvent.suspendedAt())
+        .isBeforeOrEqualTo(workflowResumedEvent.resumedAt());
   }
 
   @Test
@@ -127,10 +136,10 @@ void testSuspendResumeWait()
         appl.workflowDefinition(WorkflowReader.readWorkflowFromClasspath("wait-set.yaml"))
             .instance(Map.of());
     CompletableFuture<WorkflowModel> future = instance.start();
-    instance.suspend();
     assertThat(instance.status()).isEqualTo(WorkflowStatus.WAITING);
-    Thread.sleep(550);
+    instance.suspend();
     assertThat(instance.status()).isEqualTo(WorkflowStatus.SUSPENDED);
+    Thread.sleep(550);
     instance.resume();
     assertThat(future.get(1, TimeUnit.SECONDS).asMap().orElseThrow())
         .isEqualTo(Map.of("name", "Javierito"));