Merge pull request #195 from ProcessMaker/testing/add_mi_data_tests

Fix MultiInstance loop evaluation
ProcessMaker · Apr 27, 2021 · b6f9855 · b6f9855
2 parents 5950cfe + 1db0f18
commit b6f9855
Show file tree

Hide file tree

Showing 12 changed files with 542 additions and 12 deletions.
diff --git a/src/ProcessMaker/Nayra/Bpmn/Models/MultiInstanceLoopCharacteristics.php b/src/ProcessMaker/Nayra/Bpmn/Models/MultiInstanceLoopCharacteristics.php
@@ -119,8 +119,11 @@ public function iterateNextState(StateInterface $nextState, ExecutionInstanceInt
             // The number of instances are calculated once, when entering the activity.
             $numberOfInstances = $this->calcNumberOfInstances($instance);
             if ($this->getIsSequential()) {
+                // LoopInstance Counter
                 $loopCounter = $this->getLoopInstanceProperty($token, 'loopCounter', 0);
-                if ($loopCounter < $numberOfInstances) {
+                // Token loopCounter
+                $tokenLoopCounter = $token->getProperty('data', [])['loopCounter'] ?? 0;
+                if ($loopCounter === $tokenLoopCounter && $loopCounter < $numberOfInstances) {
                     $loopCounter++;
                     $numberOfActiveInstances = 1;
                     $this->createInstance(
@@ -181,10 +184,11 @@ private function createInstance(
             $properties['data'] = array_merge($properties['data'], (array) $item);
         }
         $properties['data']['loopCounter'] = $loopCounter;
-        $newToken = $nextState->addNewToken($instance, $properties, $source);
+        $newToken = $nextState->createToken($instance, $properties, $source);
         $this->setLoopInstanceProperty($newToken, 'numberOfActiveInstances', $numberOfActiveInstances);
         $this->setLoopInstanceProperty($newToken, 'numberOfInstances', $numberOfInstances);
         $this->setLoopInstanceProperty($newToken, 'loopCounter', $loopCounter);
+        $nextState->addToken($instance, $newToken, false, $source);
     }
 
     /**

diff --git a/src/ProcessMaker/Nayra/Bpmn/StateTrait.php b/src/ProcessMaker/Nayra/Bpmn/StateTrait.php
@@ -103,6 +103,27 @@ public function addNewToken(ExecutionInstanceInterface $instance = null, array $
         return $token;
     }
 
+    /**
+     * Create token for the current state.
+     *
+     * @param \ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface|null $instance
+     * @param array $properties
+     * @param \ProcessMaker\Nayra\Contracts\Bpmn\TransitionInterface|null $source
+     *
+     * @return TokenInterface
+     */
+    public function createToken(ExecutionInstanceInterface $instance = null, array $properties = [])
+    {
+        $token = $this->getRepository()->getTokenRepository()->createTokenInstance();
+        $token->setOwner($this);
+        $token->setProperties($properties);
+        $token->setOwner($this);
+        $token->setInstance($instance);
+        $this->getName() ? $token->setStatus($this->getName()) : '';
+        $token->setIndex($this->getIndex());
+        return $token;
+    }
+
     /**
      * Add a new token instance to the state.
      *

diff --git a/src/ProcessMaker/Nayra/Contracts/Bpmn/StateInterface.php b/src/ProcessMaker/Nayra/Contracts/Bpmn/StateInterface.php
@@ -34,6 +34,16 @@ public function consumeToken(TokenInterface $token);
      */
     public function addNewToken(ExecutionInstanceInterface $instance = null, array $properties = [], TransitionInterface $source = null);
 
+    /**
+     * Create token for the current state.
+     *
+     * @param \ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface|null $instance
+     * @param array $properties
+     *
+     * @return TokenInterface
+     */
+    public function createToken(ExecutionInstanceInterface $instance = null, array $properties = []);
+
     /**
      * Add a new token to the current state.
      *