Merge pull request #8594 from ProcessMaker/bugfix/FOUR-27709

FOUR-27709: ABE does not work correctly when a parallel gateway is part of the flow

Author: nolanpro

ProcessMaker/Jobs/CompleteActivity.php

@@ -8,6 +8,7 @@
 use ProcessMaker\Models\Process as Definitions;
 use ProcessMaker\Models\ProcessRequestToken;
 use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
+use ProcessMaker\Nayra\Contracts\Bpmn\CallActivityInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
 use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
 
@@ -42,8 +43,10 @@ public function __construct(Definitions $definitions, ExecutionInstanceInterface
     public function action(ProcessRequestToken $token, ActivityInterface $element, array $data)
     {
         //@todo requires a class to manage the data access and control the updates
-        $manager = new DataManager();
-        $manager->updateData($token, $data);
+        if (!($element instanceof CallActivityInterface)) {
+            $manager = new DataManager();
+            $manager->updateData($token, $data);
+        }
         $this->engine->runToNextState();
         $element->complete($token);
 

ProcessMaker/Jobs/ThrowMessageEvent.php

@@ -48,16 +48,19 @@ public function action(ProcessRequest $instance, CatchEventInterface $element)
         $message->setId($this->messageRef);
         $eventDefinition->setPayload($message);
         $eventDefinition->setProperty('messageRef', $this->messageRef);
+        $eventDefinition->setProperty('target_catch_event_id', $this->elementId);
+        $eventDefinition->setProperty('target_instance_id', $this->instanceId);
 
-        $this->engine->getEventDefinitionBus()->dispatchEventDefinition(
-            null,
-            $eventDefinition,
-            null
-        );
         if ($this->payload) {
             foreach ($this->payload as $key => $value) {
                 $instance->getDataStore()->putData($key, $value);
             }
         }
+
+        $this->engine->getEventDefinitionBus()->dispatchEventDefinition(
+            null,
+            $eventDefinition,
+            null
+        );
     }
 }

ProcessMaker/Models/CallActivity.php

@@ -94,8 +94,26 @@ protected function callSubprocess(TokenInterface $token, $startId)
      */
     protected function completeSubprocess(TokenInterface $token, ExecutionInstanceInterface $closedInstance, ExecutionInstanceInterface $instance)
     {
-        // Copy data from subprocess to main process
-        $data = $closedInstance->getDataStore()->getData();
+        $store = $closedInstance->getDataStore();
+        $allData = $store->getData();
+
+        // Determine which data should be merged back from the subprocess.
+        $updatedKeys = method_exists($store, 'getUpdated')
+            ? $store->getUpdated()
+            : null;
+
+        if ($updatedKeys === null) {
+            // Legacy behavior or no tracking available: copy all data.
+            $data = $allData;
+        } elseif ($updatedKeys === []) {
+            // Nothing was updated in the subprocess: do not merge anything.
+            $data = [];
+        } else {
+            // Merge only the explicitly updated keys.
+            $updatedKeys = array_values((array) $updatedKeys);
+            $data = array_intersect_key($allData, array_flip($updatedKeys));
+        }
+
         $dataManager = new DataManager();
         $dataManager->updateData($token, $data);
         $token->getInstance()->getProcess()->getEngine()->runToNextState();