FOUR-8177 IT5

ProcessMaker/Facades/WorkflowManager.php

@@ -14,6 +14,8 @@
  * @method static mixed runServiceTask(\ProcessMaker\Nayra\Contracts\Bpmn\ServiceTaskInterface $serviceTask, Token $token)
  * @method static void throwSignalEventDefinition(\ProcessMaker\Nayra\Contracts\Bpmn\EventDefinitionInterface $sourceEventDefinition, \ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface $token)
  * @method static void throwSignalEvent($signalRef, array $data = [], array $exclude = [])
+ * @method static void throwSignalEventProcess($processId, $signalRef, array $data)
+ * @method static void throwSignalEventRequest(\ProcessMaker\Models\ProcessRequest $request, $signalRef, array $data)
  * @method static void throwMessageEvent($instanceId, $elementId, $messageRef, array $payload = [])
  * @method static void onDataValidation(callable $callback)
  * @method static void validateData(array $data, $definitions, $element)

ProcessMaker/Jobs/BoundaryEvent.php

@@ -62,7 +62,7 @@ public function action(BpmnDocumentInterface $definitions, TokenInterface $token
     }
 
     /**
-     * Updata data for a message event
+     * Update data for a message event
      *
      * If variableName is set, then the event payload will be set to that variable name.
      * If the data name exists, then the data is merged.

ProcessMaker/Jobs/CatchSignalEventRequest.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use ProcessMaker\Facades\WorkflowManager;
 use ProcessMaker\Models\ProcessRequest;
 
 class CatchSignalEventRequest implements ShouldQueue
@@ -34,10 +35,10 @@ public function __construct($chunck, $signalRef, $payload)
 
     public function handle()
     {
-        $this->payload = unpackTemporalData($this->payload_uid);
+        $payload = unpackTemporalData($this->payload_uid);
         foreach ($this->chunck as $requestId) {
             $request = ProcessRequest::find($requestId);
-            CatchSignalEventInRequest::dispatchNow($request, $this->payload, $this->signalRef);
+            WorkflowManager::throwSignalEventRequest($request, $this->signalRef, $payload);
         }
         removeTemporalData($this->payload_uid);
     }

ProcessMaker/Jobs/ThrowSignalEvent.php

@@ -6,6 +6,7 @@
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
+use ProcessMaker\Facades\WorkflowManager;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
 
@@ -47,11 +48,11 @@ public function handle()
             ->pluck('id')
             ->toArray();
         foreach ($processes as $process) {
-            CatchSignalEventProcess::dispatch(
+            WorkflowManager::throwSignalEventProcess(
                 $process,
                 $this->signalRef,
                 $this->data
-            )->onQueue('bpmn');
+            );
         }
         $count = ProcessRequest::whereNotIn('id', $this->excludeRequests)
             ->where('status', 'ACTIVE')

ProcessMaker/Models/EnvironmentVariable.php

@@ -2,6 +2,7 @@
 
 namespace ProcessMaker\Models;
 
+use Illuminate\Support\Facades\Log;
 use Illuminate\Validation\Rule;
 use ProcessMaker\Traits\Exportable;
 
@@ -53,7 +54,13 @@ public function setValueAttribute($value)
      */
     public function getValueAttribute()
     {
-        return decrypt($this->attributes['value']);
+        try {
+            return decrypt($this->attributes['value']);
+        } catch (\Exception $e) {
+            Log::error('EnvironmentVariable: ' . $this->attributes['value']. "\n" . $e->getMessage());
+            Log::error($e->getTraceAsString());
+            return null;
+        }
     }
 
     public static function rules($existing = null)

ProcessMaker/Models/Process.php

@@ -27,6 +27,7 @@
 use ProcessMaker\Nayra\Contracts\Bpmn\ServiceTaskInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\StartEventInterface;
 use ProcessMaker\Nayra\Contracts\Storage\BpmnDocumentInterface;
+use ProcessMaker\Nayra\Managers\WorkflowManagerDefault;
 use ProcessMaker\Nayra\Storage\BpmnDocument;
 use ProcessMaker\Package\WebEntry\Models\WebentryRoute;
 use ProcessMaker\Rules\BPMNValidation;
@@ -584,7 +585,7 @@ private function scalateToManagerIfEnabled($user, $activity, $token, $assignment
                 if ($escalateToManager) {
                     $user = WorkflowUserManager::escalateToManager($token, $user);
                 } else {
-                    $res = WorkflowManager::runProcess($assignmentProcess, 'assign', [
+                    $res = (new WorkflowManagerDefault)->runProcess($assignmentProcess, 'assign', [
                         'user_id' => $user,
                         'process_id' => $this->id,
                         'request_id' => $token->getInstance()->getId(),

ProcessMaker/Models/ProcessCollaboration.php

@@ -2,6 +2,8 @@
 
 namespace ProcessMaker\Models;
 
+use ProcessMaker\Traits\HasUuids;
+
 /**
  * Represents an Eloquent model of a Request which is an instance of a Process.
  *
@@ -12,6 +14,8 @@
  */
 class ProcessCollaboration extends ProcessMakerModel
 {
+    use HasUuids;
+
     protected $connection = 'processmaker';
 
     /**

ProcessMaker/Models/ProcessRequest.php

@@ -41,6 +41,7 @@
  * @property string $name
  * @property string $status
  * @property string $data
+ * @property string $collaboration_uuid
  * @property \Carbon\Carbon $initiated_at
  * @property \Carbon\Carbon $completed_at
  * @property \Carbon\Carbon $updated_at

ProcessMaker/Nayra/Managers/WorkflowManagerDefault.php

@@ -10,6 +10,8 @@
 use ProcessMaker\Jobs\BoundaryEvent;
 use ProcessMaker\Jobs\CallProcess;
 use ProcessMaker\Jobs\CatchEvent;
+use ProcessMaker\Jobs\CatchSignalEventInRequest;
+use ProcessMaker\Jobs\CatchSignalEventProcess;
 use ProcessMaker\Jobs\CompleteActivity;
 use ProcessMaker\Jobs\RunScriptTask;
 use ProcessMaker\Jobs\RunServiceTask;
@@ -18,6 +20,7 @@
 use ProcessMaker\Jobs\ThrowSignalEvent;
 use ProcessMaker\Models\FormalExpression;
 use ProcessMaker\Models\Process as Definitions;
+use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken as Token;
 use ProcessMaker\Nayra\Contracts\Bpmn\BoundaryEventInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\EntityInterface;
@@ -29,6 +32,7 @@
 use ProcessMaker\Nayra\Contracts\Bpmn\ThrowEventInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
 use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
+use ProcessMaker\Repositories\DefinitionsRepository;
 
 class WorkflowManagerDefault implements WorkflowManagerInterface
 {
@@ -255,6 +259,38 @@ public function throwSignalEvent($signalRef, array $data = [], array $exclude =
         ThrowSignalEvent::dispatch($signalRef, $data, $exclude)->onQueue('bpmn');
     }
 
+    /**
+     * Throw a signal event by signalRef into a specific process.
+     *
+     * @param int $process
+     * @param string $signalRef
+     * @param array $data
+     */
+    public function throwSignalEventProcess($processId, $signalRef, array $data)
+    {
+        CatchSignalEventProcess::dispatch(
+            $processId,
+            $signalRef,
+            $data
+        )->onQueue('bpmn');
+    }
+
+    /**
+     * Throw a signal event by signalRef into a specific request.
+     *
+     * @param ProcessRequest $request
+     * @param string $signalRef
+     * @param array $data
+     */
+    public function throwSignalEventRequest(ProcessRequest $request, $signalRef, array $data)
+    {
+        CatchSignalEventInRequest::dispatchSync(
+            $request,
+            $data,
+            $signalRef
+        );
+    }
+
     /**
      * Catch a signal event.
      *