Feature/four 26166 b

.gitignore

@@ -52,3 +52,4 @@ devhub/pm-font/dist
 test-db-snapshot.db
 snapshot_*.db
 storage/transitions
+.envrc

ProcessMaker/Application.php

@@ -3,6 +3,7 @@
 namespace ProcessMaker;
 
 use Igaster\LaravelTheme\Facades\Theme;
+use Illuminate\Container\Container;
 use Illuminate\Filesystem\Filesystem;
 use Illuminate\Foundation\Application as IlluminateApplication;
 use Illuminate\Foundation\Bootstrap\LoadEnvironmentVariables;
@@ -12,8 +13,8 @@
 use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Support\Facades\Config;
+use ProcessMaker\Console\Kernel;
 use ProcessMaker\Multitenancy\Tenant;
-use ProcessMaker\Multitenancy\TenantBootstrapper;
 
 /**
  * Class Application.
@@ -101,15 +102,4 @@ public function registerConfiguredProviders()
 
         parent::registerConfiguredProviders();
     }
-
-    public function bootstrapWith(array $bootstrappers)
-    {
-        // Insert TenantBootstrapper after LoadEnvironmentVariables
-        if ($bootstrappers[0] !== LoadEnvironmentVariables::class) {
-            throw new \Exception('LoadEnvironmentVariables is not the first bootstrapper. Did a laravel upgrade change this?');
-        }
-        array_splice($bootstrappers, 1, 0, [TenantBootstrapper::class]);
-
-        return parent::bootstrapWith($bootstrappers);
-    }
 }

ProcessMaker/AssignmentRules/ProcessManagerAssigned.php

@@ -6,6 +6,8 @@
 use ProcessMaker\Exception\ThereIsNoProcessManagerAssignedException;
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
+use ProcessMaker\Models\ProcessRequestToken;
+use ProcessMaker\Models\User;
 use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
 use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;
 
@@ -24,16 +26,62 @@ class ProcessManagerAssigned implements AssignmentRuleInterface
      * @param TokenInterface $token
      * @param Process $process
      * @param ProcessRequest $request
-     * @return int
+     * @return int|null
      * @throws ThereIsNoProcessManagerAssignedException
      */
     public function getNextUser(ActivityInterface $task, TokenInterface $token, Process $process, ProcessRequest $request)
     {
-        $user_id = $request->processVersion->manager_id;
+        // review for multiple managers
+        $managers = $request->processVersion->manager_id;
+        $user_id = $this->getNextManagerAssigned($managers, $task, $request);
         if (!$user_id) {
             throw new ThereIsNoProcessManagerAssignedException($task);
         }
 
         return $user_id;
     }
+
+    /**
+     * Get the round robin manager using a true round robin algorithm
+     *
+     * @param array $managers
+     * @param ActivityInterface $task
+     * @param ProcessRequest $request
+     * @return int|null
+     */
+    private function getNextManagerAssigned($managers, $task, $request)
+    {
+        // Validate input
+        if (empty($managers) || !is_array($managers)) {
+            return null;
+        }
+
+        // If only one manager, return it
+        if (count($managers) === 1) {
+            return $managers[0];
+        }
+
+        // get the last manager assigned to the task across all requests
+        $last = ProcessRequestToken::where('process_id', $request->process_id)
+            ->where('element_id', $task->getId())
+            ->whereIn('user_id', $managers)
+            ->orderBy('created_at', 'desc')
+            ->first();
+
+        $user_id = $last ? $last->user_id : null;
+
+        sort($managers);
+
+        $key = array_search($user_id, $managers);
+        if ($key === false) {
+            // If no previous manager found, start with the first manager
+            $key = 0;
+        } else {
+            // Move to the next manager in the round-robin
+            $key = ($key + 1) % count($managers);
+        }
+        $user_id = $managers[$key];
+
+        return $user_id;
+    }
 }

ProcessMaker/Console/Commands/BuildScriptExecutors.php

@@ -18,7 +18,11 @@ class BuildScriptExecutors extends Command
      *
      * @var string
      */
-    protected $signature = 'processmaker:build-script-executor {lang} {user?} {--rebuild}';
+    protected $signature = 'processmaker:build-script-executor
+                            {lang : The ID or language of the script executor}
+                            {user? : The user ID to send the broadcast event to}
+                            {--rebuild : Rebuild the docker image}
+                            {--build-args= : The build arguments for the docker build command}';
 
     /**
      * The console command description.
@@ -156,9 +160,17 @@ public function buildExecutor()
         $this->info('Building the docker executor');
 
         $image = $scriptExecutor->dockerImageName();
+        $cacheArg = $this->option('rebuild') ? '--no-cache ' : '';
         $command = Docker::command() .
-            " build --build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
+            " build {$cacheArg}--build-arg SDK_DIR=./sdk -t {$image} -f {$packagePath}/Dockerfile.custom {$packagePath}";
 
+        $buildArgs = $this->getBuildArgs();
+
+        foreach ($buildArgs as $buildArg) {
+            $command .= ' ' . $buildArg;
+        }
+
+        $this->info("Running command: $command");
         $this->execCommand($command);
 
         $isNayra = $scriptExecutor->language === Base::NAYRA_LANG;
@@ -167,6 +179,29 @@ public function buildExecutor()
         }
     }
 
+    /**
+     * Get the build arguments for the docker build command.
+     *
+     * @return array
+     *   - '--build-arg <key>=<value>'
+     */
+    public function getBuildArgs(): array
+    {
+        $args = $this->option('build-args');
+
+        if ($args) {
+            $buildArgs = [];
+
+            foreach (explode(',', $args) as $arg) {
+                $buildArgs[] = '--build-arg ' . $arg;
+            }
+
+            return $buildArgs;
+        }
+
+        return [];
+    }
+
     public function getDockerfileContent(ScriptExecutor $scriptExecutor): string
     {
         $lang = $scriptExecutor->language;

ProcessMaker/Console/Commands/CreateDataLakeViews.php

@@ -181,9 +181,10 @@ protected function getTableColumns(string $tableName): array
      */
     protected function getTables(): array
     {
+        $database = \DB::connection()->getDatabaseName();
         $tables = array_map(function ($item) {
             return $item['name'];
-        }, Schema::getTables());
+        }, Schema::getTables($database));
 
         return $tables;
     }
@@ -193,9 +194,10 @@ protected function getTables(): array
      */
     protected function getViews(): array
     {
+        $database = \DB::connection()->getDatabaseName();
         $views = array_map(function ($item) {
             return $item['name'];
-        }, Schema::getViews());
+        }, Schema::getViews($database));
 
         return $views;
     }

ProcessMaker/Console/Commands/IndexedSearchEnable.php

@@ -123,9 +123,8 @@ private function setConfig($driver, $url = null, $prefix = null)
                 $env .= "\n\nSCOUT_DRIVER={$driver}";
                 $env .= "\nELASTIC_HOST={$url}";
                 break;
-            case 'sqlite':
-                $driver = 'tntsearch';
-                $env .= "\n\nSCOUT_DRIVER={$driver}";
+            default:
+                throw new \Exception('Only Elasticsearch is supported for indexed search.');
                 break;
         }
 

ProcessMaker/Console/Commands/Install.php

@@ -52,7 +52,7 @@ class Install extends Command
             {--data-username=                   : The data database username}
             {--data-password=                   : The data database password}
             {--data-schema=                     : The data database schema (if pgsql)}
-            {--redis-client=predis              : The Redis client (predis or phpredis)}
+            {--redis-client=phpredis            : The Redis client (predis or phpredis)}
             {--redis-host=                      : The Redis host, default is 127.0.0.1}
             {--redis-prefix=                    : The prefix to be appended to Redis entries}
             {--horizon-prefix=horizon:          : The prefix to be appended to Horizon queue entries}

ProcessMaker/Console/Commands/TenantsCreate.php

@@ -198,7 +198,9 @@ public function handle()
             $this->line('- Run migrations and seed the database');
             $this->line('- Run the install command for each package');
             $this->line('- Run artisan upgrade');
-            $this->line('- Install passport by calling passport:install');
+            $this->line('- Install passport by calling passport:install (create the default clients');
+            $this->line('- Reset the admin password with auth:set-password');
+            $this->line('- Run processmaker:initialize-script-microservice');
             $this->info("For example, `TENANT={$tenant->id} php artisan migrate:fresh --seed`");
         }
     }

ProcessMaker/Console/Commands/TenantsList.php

@@ -15,7 +15,7 @@ class TenantsList extends Command
      *
      * @var string
      */
-    protected $signature = 'tenants:list {--ids : Only output the ids}';
+    protected $signature = 'tenants:list {--ids : Only output the ids} {--json : Output the tenants as JSON}';
 
     /**
      * The console command description.
@@ -40,6 +40,12 @@ public function handle()
             return;
         }
 
+        if ($this->option('json')) {
+            $this->line(json_encode($tenants->toArray(), JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES));
+
+            return;
+        }
+
         $formattedTenants = $tenants->map(function ($tenant) {
             $config = $tenant->config;