add option to queue in update command

vormkracht10 · May 18, 2024 · bbaba45 · bbaba45
1 parent 034d895
commit bbaba45
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 12 deletions.
diff --git a/src/CachesValue.php b/src/CachesValue.php
@@ -127,9 +127,7 @@ final public static function update($parameters = [])
     {
         $instance = app()->make(static::class, $parameters);
 
-        dispatch(
-            $instance
-        );
+        dispatch($instance);
     }
 
     /**
@@ -139,9 +137,7 @@ final public static function updateAndGet($parameters = [])
     {
         $instance = app()->make(static::class, $parameters);
 
-        dispatch(
-            $instance
-        )->onConnection('sync');
+        dispatch($instance)->onConnection('sync');
 
         return static::get($parameters);
     }

diff --git a/src/Commands/UpdatePermanentCachesCommand.php b/src/Commands/UpdatePermanentCachesCommand.php
@@ -7,6 +7,7 @@
 use Spatie\Emoji\Emoji;
 use SplObjectStorage;
 use Symfony\Component\Console\Helper\ProgressBar;
+use Vormkracht10\PermanentCache\CachesValue;
 use Vormkracht10\PermanentCache\Facades\PermanentCache;
 
 class UpdatePermanentCachesCommand extends Command
@@ -16,7 +17,7 @@ class UpdatePermanentCachesCommand extends Command
      *
      * @var string
      */
-    protected $signature = 'permanent-cache:update {--filter=}';
+    protected $signature = 'permanent-cache:update {--filter=} {--connection=} {--queue=}';
 
     /**
      * The console command description.
@@ -57,17 +58,23 @@ public function handle()
         $progressBar->start();
 
         foreach ($caches as $c) {
+            /** @var CachesValue $cache */
             $cache = $caches->current();
-            $parameters = $caches->getInfo();
 
             $currentTask = $cache->getName();
             $emoji = ($progressBar->getProgress() % 2 ? Emoji::hourglassNotDone() : Emoji::hourglassDone());
 
             $progressBar->setMessage('Updating: '.$currentTask.' '.$emoji);
 
+            $connection = $this->option('connection') ?? 'sync';
+
+            $queue = $connection === 'sync' ? null : $this->option('queue');
+
             try {
-                $cache->update($parameters);
-            } catch (Exception $exception) {
+                dispatch($cache)
+                    ->onConnection($connection)
+                    ->onQueue($queue);
+            } catch (Exception) {
                 $progressBar->setMessage('Error: '.$currentTask.' '.Emoji::warning());
 
                 sleep(2);

diff --git a/src/PermanentCache.php b/src/PermanentCache.php
@@ -45,7 +45,7 @@ public function caches($registeredCaches): self
                 $cacheInstance = $this->app->make($cache, $parameters);
 
                 if ([] !== $events = $cacheInstance->getListenerEvents()) {
-                    foreach($events as $event) {
+                    foreach ($events as $event) {
                         Event::listen($event, fn ($e) => $cacheInstance->handle($e));
                     }
                 }

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -2,7 +2,6 @@
 
 namespace Vormkracht10\PermanentCache\Tests;
 
-use Illuminate\Database\Eloquent\Factories\Factory;
 use Orchestra\Testbench\TestCase as Orchestra;
 use Vormkracht10\PermanentCache\PermanentCacheServiceProvider;