FOUR-8177 IT4

ProcessMaker/Http/Controllers/Api/ProcessRequestController.php

@@ -135,20 +135,20 @@ public function index(Request $request, $getTotal = false, User $user = null)
         if (!empty($filter)) {
             $query->filter($filter);
         }
-
+
+        $query->nonSystem();
+
         $pmql = $request->input('pmql', '');
         if (!empty($pmql)) {
             try {
+                $query->getModel()->useDataStoreTable($query, $request->input('data_store_table', ''), $request->input('data_store_columns', []));
                 $query->pmql($pmql);
             } catch (SyntaxError $e) {
                 return response(['message' => __('Your PMQL contains invalid syntax.')], 400);
             } catch (PmqlMethodException $e) {
                 return response(['message' => $e->getMessage(), 'field' => $e->getField()], 400);
             }
         }
-
-        $query->nonSystem();
-
         try {
             if ($getTotal === true) {
                 return $query->count();

ProcessMaker/Http/Kernel.php

@@ -45,6 +45,12 @@ class Kernel extends HttpKernel
             // API Middleware is defined with routeMiddleware below.
             // See routes/api.php
         ],
+        'engine' => [
+            'auth:api',
+            'setlocale',
+            'bindings',
+            'sanitize',
+        ],
     ];
 
     /**

ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

@@ -4,10 +4,15 @@
 
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Log;
 use ProcessMaker\Contracts\WorkflowManagerInterface;
 use ProcessMaker\Facades\MessageBrokerService;
+use ProcessMaker\GenerateAccessToken;
+use ProcessMaker\Models\EnvironmentVariable;
 use ProcessMaker\Models\Process as Definitions;
 use ProcessMaker\Models\ProcessRequest;
+use ProcessMaker\Models\User;
+use ProcessMaker\Nayra\Contracts\Bpmn\ScriptTaskInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\StartEventInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
 use ProcessMaker\Nayra\Contracts\Engine\ExecutionInstanceInterface;
@@ -17,6 +22,8 @@ class WorkflowManagerRabbitMq extends WorkflowManagerDefault implements Workflow
     const ACTION_START_PROCESS = 'START_PROCESS';
 
     const ACTION_COMPLETE_TASK = 'COMPLETE_TASK';
+    const ACTION_TRIGGER_INTERMEDIATE_EVENT = 'TRIGGER_INTERMEDIATE_EVENT';
+    const ACTION_RUN_SCRIPT = 'RUN_SCRIPT';
 
     /**
      * Trigger a start event and return the process request instance.
@@ -49,8 +56,8 @@ public function triggerStartEvent(Definitions $definitions, StartEventInterface
             'signal_events' => [],
         ]);
 
-        // Create triggered
-        // TO DO:
+        // Serialize instance
+        $state = $this->serializeState($request);
 
         // Dispatch start process action
         $this->dispatchAction([
@@ -60,25 +67,20 @@ public function triggerStartEvent(Definitions $definitions, StartEventInterface
                 'instance_id' => $request->uuid,
                 'request_id' => $request->getKey(),
                 'element_id' => $event->getId(),
-                'data'=> $data,
+                'data' => $data,
                 'extra_properties' => [
                     'user_id' => $userId,
                     'process_id' => $definitions->id,
                     'request_id' => $request->getKey(),
                 ],
             ],
-            'state' => [
-                'requests' => [
-                    $request->uuid => [
-                        'id' => $request->uuid,
-                        'callable_id' => $request->callable_id,
-                        'data' => $request->data,
-                        'tokens' => [],
-                    ],
-                ],
+            'state' => $state,
+            'session' => [
+                'user_id' => $userId,
             ],
         ]);
 
+        //Return the instance created
         return $request;
     }
 
@@ -100,10 +102,109 @@ public function completeTask(Definitions $definitions, ExecutionInstanceInterfac
 
         // Get complementary information
         $version = $definitions->getLatestVersion();
+        $userId = $this->getCurrentUserId();
+        $state = $this->serializeState($instance);
+
+        // Dispatch complete task action
+        $this->dispatchAction([
+            'bpmn' => $version->getKey(),
+            'action' => self::ACTION_COMPLETE_TASK,
+            'params' => [
+                'request_id' => $token->process_request_id,
+                'token_id' => $token->uuid,
+                'element_id' => $token->element_id,
+                'data' => $data,
+            ],
+            'state' => $state,
+            'session' => [
+                'user_id' => $userId,
+            ],
+        ]);
+    }
+
+    /**
+     * Complete a catch event.
+     *
+     * @param Definitions $definitions
+     * @param ExecutionInstanceInterface $instance
+     * @param TokenInterface $token
+     * @param array $data
+     *
+     * @return void
+     */
+    public function completeCatchEvent(Definitions $definitions, ExecutionInstanceInterface $instance, TokenInterface $token, array $data)
+    {
+        // Validate data
+        $element = $token->getDefinition(true);
+        $this->validateData($data, $definitions, $element);
+
+        // Get complementary information
+        $version = $definitions->getLatestVersion();
+        $userId = $this->getCurrentUserId();
+        $state = $this->serializeState($instance);
+
+        // Dispatch complete task action
+        $this->dispatchAction([
+            'bpmn' => $version->getKey(),
+            'action' => self::ACTION_TRIGGER_INTERMEDIATE_EVENT,
+            'params' => [
+                'request_id' => $token->process_request_id,
+                'token_id' => $token->uuid,
+                'element_id' => $token->element_id,
+                'data' => $data,
+            ],
+            'state' => $state,
+            'session' => [
+                'user_id' => $userId,
+            ],
+        ]);
+    }
+
+    /**
+     * Run a script task.
+     *
+     * @param ScriptTaskInterface $scriptTask
+     * @param TokenInterface $token
+     */
+    public function runScripTask(ScriptTaskInterface $scriptTask, TokenInterface $token)
+    {
+        // Log execution
+        Log::info('Dispatch a script task: ' . $scriptTask->getId() . ' #' . $token->getId());
+
+        // Get complementary information
+        $instance = $token->processRequest;
+        $version = $instance->process->getLatestVersion();
+        $userId = $this->getCurrentUserId();
+        $state = $this->serializeState($instance);
 
+        // Dispatch complete task action
+        $this->dispatchAction([
+            'bpmn' => $version->getKey(),
+            'action' => self::ACTION_RUN_SCRIPT,
+            'params' => [
+                'request_id' => $token->process_request_id,
+                'token_id' => $token->uuid,
+                'element_id' => $token->element_id,
+                'data' => [],
+            ],
+            'state' => $state,
+            'session' => [
+                'user_id' => $userId,
+            ],
+        ]);
+    }
+
+    /**
+     * Build a state object.
+     *
+     * @param ProcessRequest $instance
+     * @return array
+     */
+    private function serializeState(ProcessRequest $instance)
+    {
         // Get open tokens
         $tokensRows = [];
-        $tokens = $instance->tokens()->where('status', '!=', 'CLOSED')->get();
+        $tokens = $instance->tokens()->where('status', '!=', 'CLOSED')->where('status', '!=', 'TRIGGERED')->get();
         foreach ($tokens as $token) {
             $tokensRows[] = array_merge($token->token_properties ?: [], [
                 'id' => $token->uuid,
@@ -113,27 +214,16 @@ public function completeTask(Definitions $definitions, ExecutionInstanceInterfac
             ]);
         }
 
-        // Dispatch complete task action
-        $this->dispatchAction([
-            'bpmn' => $version->getKey(),
-            'action' => self::ACTION_COMPLETE_TASK,
-            'params' => [
-                'request_id' => $token->process_request_id,
-                'token_id' => $token->uuid,
-                'element_id' => $token->element_id,
-                'data'=> $data,
-            ],
-            'state' => [
-                'requests' => [
-                    [
-                        'id' => $instance->uuid,
-                        'callable_id' => $instance->callable_id,
-                        'data' => $instance->data,
-                        'tokens' => $tokensRows,
-                    ],
+        return [
+            'requests' => [
+                [
+                    'id' => $instance->uuid,
+                    'callable_id' => $instance->callable_id,
+                    'data' => $instance->data,
+                    'tokens' => $tokensRows,
                 ],
             ],
-        ]);
+        ];
     }
 
     /**
@@ -150,15 +240,61 @@ private function getCurrentUserId(): ? int
         return $webGuardId ?? $apiGuardId;
     }
 
+    /**
+     * Get the ID of the currently authenticated user.
+     *
+     * @return int|null
+     */
+    private function getCurrentUser(): ? User
+    {
+        // Get the id from the current user
+        $webGuard = Auth::user();
+        $apiGuard = Auth::guard('api')->user();
+
+        return $webGuard ?: $apiGuard;
+    }
+
     /**
      * Send payload
      *
      * @param array $action
      */
     private function dispatchAction(array $action): void
     {
+        // add environment variables to session
+        $environmentVariables = $this->getEnvironmentVariables();
+        $action['session']['env'] = $environmentVariables;
         $subject = 'requests';
         $thread = $action['collaboration_id'] ?? 0;
         MessageBrokerService::sendMessage($subject, $thread, $action);
     }
+
+    /**
+     * Get the environment variables.
+     *
+     * @return array
+     */
+    private function getEnvironmentVariables()
+    {
+        $variablesParameter = [];
+        EnvironmentVariable::chunk(50, function ($variables) use (&$variablesParameter) {
+            foreach ($variables as $variable) {
+                $variablesParameter[$variable['name']] = $variable['value'];
+            }
+        });
+
+        // Add the url to the host
+        $variablesParameter['HOST_URL'] = config('app.docker_host_url');
+
+        $user = $this->getCurrentUser();
+        if ($user) {
+            $token = new GenerateAccessToken($user);
+            $environmentVariables['API_TOKEN'] = $token->getToken();
+            $environmentVariables['API_HOST'] = config('app.url') . '/api/1.0';
+            $environmentVariables['APP_URL'] = config('app.url');
+            $environmentVariables['API_SSL_VERIFY'] = (config('app.api_ssl_verify') ? '1' : '0');
+        }
+
+        return $variablesParameter;
+    }
 }

ProcessMaker/Nayra/MessageBrokers/ServiceKafka.php

@@ -3,8 +3,8 @@
 namespace ProcessMaker\Nayra\MessageBrokers;
 
 use Junges\Kafka\Contracts\KafkaConsumerMessage;
+use ProcessMaker\Nayra\Repositories\PersistenceHandler;
 use Junges\Kafka\Facades\Kafka;
-use ProcessMaker\Nayra\Repositories\EntityRepositoryFactory;
 
 class ServiceKafka
 {
@@ -65,11 +65,11 @@ public function worker()
             // Get transactions
             $transactions = $message->getBody();
 
-            // Store transsactions
+            // Store transactions
             $this->storeData($transactions);
         })->build();
 
-        // Consume incomming messages
+        // Consume incoming messages
         $consumer->consume();
     }
 
@@ -80,8 +80,9 @@ public function worker()
      */
     private function storeData(array $transactions)
     {
+        $handler = new PersistenceHandler();
         foreach ($transactions as $transaction) {
-            EntityRepositoryFactory::createRepository($transaction['entity'])->save($transaction);
+            $handler->save($transaction);
         }
     }
 }

ProcessMaker/Nayra/MessageBrokers/ServiceRabbitMq.php

@@ -4,7 +4,7 @@
 
 use PhpAmqpLib\Connection\AMQPStreamConnection;
 use PhpAmqpLib\Message\AMQPMessage;
-use ProcessMaker\Nayra\Repositories\EntityRepositoryFactory;
+use ProcessMaker\Nayra\Repositories\PersistenceHandler;
 
 class ServiceRabbitMq
 {
@@ -124,8 +124,9 @@ public function worker(): void
      */
     private function storeData(array $transactions): void
     {
+        $handler = new PersistenceHandler();
         foreach ($transactions as $transaction) {
-            EntityRepositoryFactory::createRepository($transaction['entity'])->save($transaction);
+            $handler->save($transaction);
         }
     }
 }