register modules in queue

app/Providers/Queue.php

@@ -3,12 +3,15 @@
 namespace App\Providers;
 
 use App\Notifications\Common\ImportFailed;
+use App\Traits\Modules;
 use Illuminate\Queue\Events\JobFailed;
 use Illuminate\Queue\Events\JobProcessing;
 use Illuminate\Support\ServiceProvider as Provider;
 
 class Queue extends Provider
 {
+    use Modules;
+
     /**
      * Register any application services.
      *
@@ -52,6 +55,8 @@ public function boot()
             }
 
             $company->makeCurrent();
+
+            $this->registerModules();
         });
 
         app('events')->listen(JobFailed::class, function ($event) {

app/Traits/Modules.php

@@ -560,4 +560,9 @@ public function getDataKeyOfModules($data = [])
 
         return $result;
     }
+
+    public function registerModules(): void
+    {
+        app(\Akaunting\Module\Contracts\ActivatorInterface::class)->register();
+    }
 }

app/Utilities/ModuleActivator.php

@@ -27,7 +27,8 @@ public function __construct(Container $app)
     {
         $this->cache = $app['cache'];
         $this->config = $app['config'];
-        $this->statuses = $this->getStatuses();
+
+        $this->load();
     }
 
     public function is(Module $module, bool $active): bool
@@ -99,7 +100,19 @@ public function delete(Module $module): void
         $this->flushCache();
     }
 
-    public function getStatuses(): array
+    public function reset(): void
+    {
+        $this->statuses = [];
+
+        $this->flushCache();
+    }
+
+    public function load(): void
+    {
+        $this->statuses = $this->getStatusesByCompany();
+    }
+
+    public function getStatusesByCompany(): array
     {
         if (! $this->config->get('module.cache.enabled')) {
             return $this->readDatabase();
@@ -146,17 +159,17 @@ public function readDatabase(): array
         return $modules;
     }
 
-    public function reset(): void
+    public function flushCache(): void
     {
-        $this->statuses = [];
+        $key = $this->config->get('module.cache.key') . '.statuses';
 
-        $this->flushCache();
+        $this->cache->forget($key);
     }
 
-    public function flushCache(): void
+    public function register(): void
     {
-        $key = $this->config->get('module.cache.key') . '.statuses';
+        $this->load();
 
-        $this->cache->forget($key);
+        app()->register(\Akaunting\Module\Providers\Bootstrap::class, true);
     }
 }

app/Utilities/helpers.php

@@ -179,6 +179,16 @@ function running_in_queue(): bool
     }
 }
 
+if (! function_exists('running_in_test')) {
+    /**
+     * Detect if application is running in test.
+     */
+    function running_in_test(): bool
+    {
+        return env_is_testing() && app()->runningInConsole();
+    }
+}
+
 if (! function_exists('simple_icons')) {
     /**
      * Get the simple icon content