Merge branch 'develop' of github.com:ProcessMaker/processmaker into epic/FOUR-26391

Author: gustavobascope

ProcessMaker/Application.php

@@ -3,16 +3,28 @@
 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;
+use Illuminate\Foundation\Bootstrap\RegisterProviders;
 use Illuminate\Foundation\PackageManifest;
+use Illuminate\Support\Env;
+use Illuminate\Support\Facades\App;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Config;
+use ProcessMaker\Console\Kernel;
+use ProcessMaker\Multitenancy\Tenant;
 
 /**
  * Class Application.
  */
 class Application extends IlluminateApplication
 {
+    public $overrideTenantId = null;
+
+    public $skipCacheEvents = false;
+
     /**
      * Sets the timezone for the application and for php with the specified timezone.
      *

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/ProcessMakerLicenseRemove.php

@@ -34,9 +34,9 @@ class ProcessMakerLicenseRemove extends Command
      */
     public function handle()
     {
-        if (Storage::disk('root')->exists('license.json')) {
+        if (Storage::disk('local')->exists('license.json')) {
             if ($this->option('force') || $this->confirm('Are you sure you want to remove the license.json file?')) {
-                Storage::disk('root')->delete('license.json');
+                Storage::disk('local')->delete('license.json');
                 $this->info('license.json removed successfully!');
 
                 $this->info('Calling package:discover to update the package cache with enabled packages');

ProcessMaker/Console/Commands/ProcessMakerLicenseUpdate.php

@@ -40,7 +40,7 @@ public function handle()
                 return 1;
             }
 
-            Storage::disk('root')->put('license.json', $content);
+            Storage::disk('local')->put('license.json', $content);
 
             $this->info('Calling package:discover to update the package cache with enabled packages');
             Artisan::call('package:discover');

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;