move unfinished children check code to state execution

NitorCreations · Feb 18, 2021 · 8ac5678 · 8ac5678
1 parent daf0a69
commit 8ac5678
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 2 deletions.
diff --git a/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StateExecutionImpl.java b/nflow-engine/src/main/java/io/nflow/engine/internal/workflow/StateExecutionImpl.java
@@ -1,11 +1,13 @@
 package io.nflow.engine.internal.workflow;
 
 import static java.util.Collections.unmodifiableList;
+import static java.util.EnumSet.complementOf;
 import static org.joda.time.DateTime.now;
 import static org.slf4j.LoggerFactory.getLogger;
 import static org.springframework.util.Assert.notNull;
 
 import java.util.Arrays;
+import java.util.EnumSet;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Optional;
@@ -22,11 +24,14 @@
 import io.nflow.engine.workflow.definition.WorkflowState;
 import io.nflow.engine.workflow.instance.QueryWorkflowInstances;
 import io.nflow.engine.workflow.instance.WorkflowInstance;
+import io.nflow.engine.workflow.instance.WorkflowInstance.WorkflowInstanceStatus;
 import io.nflow.engine.workflow.instance.WorkflowInstanceAction.WorkflowActionType;
 
 public class StateExecutionImpl extends ModelObject implements StateExecution {
 
   private static final Logger LOG = getLogger(StateExecutionImpl.class);
+  private static final WorkflowInstanceStatus[] UNFINISHED_STATUSES = complementOf(EnumSet.of(WorkflowInstanceStatus.finished))
+      .toArray(new WorkflowInstanceStatus[0]);
   private final WorkflowInstance instance;
   private final ObjectStringMapper objectMapper;
   private final WorkflowInstanceDao workflowDao;
@@ -309,4 +314,10 @@ public void handleFailure(AbstractWorkflowDefinition<?> definition, String failu
     }
   }
 
+  @Override
+  public boolean hasUnfinishedChildren() {
+    QueryWorkflowInstances unfinishedChildren = new QueryWorkflowInstances.Builder().addStatuses(UNFINISHED_STATUSES)
+        .setParentActionId(instance.id).build();
+    return !workflowDao.queryWorkflowInstances(unfinishedChildren).isEmpty();
+  }
 }
diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/curated/CronWorkflow.java
@@ -29,7 +29,6 @@
 import io.nflow.engine.workflow.definition.WorkflowSettings;
 import io.nflow.engine.workflow.definition.WorkflowSettings.Builder;
 import io.nflow.engine.workflow.definition.WorkflowStateType;
-import io.nflow.engine.workflow.instance.WorkflowInstance.WorkflowInstanceStatus;
 
 /**
  * Workflow that wakes up periodically to execute a task.
@@ -194,7 +193,7 @@ public NextAction waitForWorkToFinish(StateExecution execution) {
    * @return Time when check should be retried. Null to go to schedule state immediately.
    */
   protected DateTime waitForWorkToFinishImpl(StateExecution execution) {
-    if (execution.getAllChildWorkflows().stream().anyMatch(child -> child.status != WorkflowInstanceStatus.finished)) {
+    if (execution.hasUnfinishedChildren()) {
       logger.info("Unfinished child workflow found, waiting before scheduling next work.");
       return now().plusHours(1);
     }

diff --git a/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/StateExecution.java b/nflow-engine/src/main/java/io/nflow/engine/workflow/definition/StateExecution.java
@@ -184,4 +184,10 @@ public interface StateExecution {
    */
   Optional<Long> getParentId();
 
+  /**
+   * Return true if this workflow instance has unfinished child workflow instances.
+   *
+   * @return True if unfinished child workflow instances are found, false otherwise.
+   */
+  boolean hasUnfinishedChildren();
 }