feat: manage specific connection in config

Author: giraz82

config/one-time-operations.php

@@ -11,4 +11,8 @@
     // Database Connection Name - Change the model connection, support for Multitenancy
     // Only change when you want to deviate from your system default repository
     'connection' => null,
+
+    // Queue Connection Name
+    // Only change when you want to use a specific queue connection different from default
+    'queue_connection' => env('ONE_TIME_OPERATIONS_QUEUE_CONNECTION', env('QUEUE_CONNECTION', 'sync')),
 ];

phpunit.xml

@@ -16,5 +16,6 @@
     </coverage>
     <php>
         <env name="DB_CONNECTION" value="testing"/>
+        <env name="QUEUE_CONNECTION" value="default"/>
     </php>
 </phpunit>

src/Commands/OneTimeOperationsProcessCommand.php

@@ -39,13 +39,13 @@ public function handle(): int
         $this->queue = $this->option('queue');
         $this->tags = $this->option('tag');
 
-        if (! $this->tagOptionsAreValid()) {
+        if (!$this->tagOptionsAreValid()) {
             $this->components->error('Abort! Do not provide empty tags!');
 
             return self::FAILURE;
         }
 
-        if (! $this->syncOptionsAreValid()) {
+        if (!$this->syncOptionsAreValid()) {
             $this->components->error('Abort! Process either with --sync or --async.');
 
             return self::FAILURE;
@@ -92,7 +92,7 @@ protected function processOperationFile(OneTimeOperationFile $operationFile): in
 
     protected function processOperationModel(Operation $operationModel): int
     {
-        if (! $this->components->confirm('Operation was processed before. Process it again?')) {
+        if (!$this->components->confirm('Operation was processed before. Process it again?')) {
             $this->components->info('Operation aborted');
 
             return self::SUCCESS;
@@ -161,7 +161,9 @@ protected function storeOperation(OneTimeOperationFile $operationFile): void
     protected function dispatchOperationJob(OneTimeOperationFile $operationFile)
     {
         if ($this->isAsyncMode($operationFile)) {
-            OneTimeOperationProcessJob::dispatch($operationFile->getOperationName())->onQueue($this->getQueue($operationFile));
+            OneTimeOperationProcessJob::dispatch($operationFile->getOperationName())
+                                      ->onQueue($this->getQueue($operationFile))
+                                      ->onConnection(OneTimeOperationManager::getConnectionName());
 
             return;
         }
@@ -228,6 +230,6 @@ protected function tagOptionsAreValid(): bool
     protected function syncOptionsAreValid(): bool
     {
         // do not use both options at the same time
-        return ! ($this->forceAsync && $this->forceSync);
+        return !($this->forceAsync && $this->forceSync);
     }
 }

src/OneTimeOperationManager.php

@@ -108,6 +108,11 @@ public static function getDirectoryName(): string
         return Config::get('one-time-operations.directory');
     }
 
+    public static function getConnectionName(): string
+    {
+        return Config::get('one-time-operations.queue_connection');
+    }
+
     public static function getDirectoryPath(): string
     {
         return App::basePath(Str::of(self::getDirectoryName())->rtrim('/')).DIRECTORY_SEPARATOR;

tests/Feature/OneTimeOperationCase.php

@@ -3,6 +3,7 @@
 namespace TimoKoerber\LaravelOneTimeOperations\Tests\Feature;
 
 use Illuminate\Support\Carbon;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Queue;
 use Orchestra\Testbench\TestCase;
@@ -24,6 +25,9 @@ protected function setUp(): void
 
         Queue::fake();
         Carbon::setTestNow(self::TEST_DATETIME);
+
+        Config::set('queue.default', 'default');
+
     }
 
     protected function getPackageProviders($app): array

tests/Feature/OneTimeOperationCommandTest.php

@@ -3,6 +3,7 @@
 namespace TimoKoerber\LaravelOneTimeOperations\Tests\Feature;
 
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Illuminate\Support\Facades\Config;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Queue;
 use Illuminate\Support\Str;
@@ -113,7 +114,7 @@ public function test_the_whole_command_process()
         // operation was exectued - database entry and job was created
         $this->assertEquals(1, Operation::count());
         Queue::assertPushed(OneTimeOperationProcessJob::class, function (OneTimeOperationProcessJob $job) {
-            return $job->connection === null; // async
+            return $job->connection ===  Config::get('one-time-operations.queue_connection'); // async
         });
 
         // entry was created successfully
@@ -221,7 +222,7 @@ public function test_sync_processing_with_file_attribute()
         // Job was executed asynchronously
         Queue::assertPushed(OneTimeOperationProcessJob::class, function (OneTimeOperationProcessJob $job) {
             return $job->operationName === '2015_10_21_072800_foo_bar_operation'
-                && $job->connection === null // async
+                && $job->connection ===  Config::get('one-time-operations.queue_connection') // async
                 && $job->queue === 'default'; // default queue
         });
 
@@ -237,7 +238,7 @@ public function test_sync_processing_with_file_attribute()
         // Job was executed asynchronously on queue "foobar"
         Queue::assertPushed(OneTimeOperationProcessJob::class, function (OneTimeOperationProcessJob $job) {
             return $job->operationName === '2015_10_21_072800_foo_bar_operation'
-                && $job->connection === null // async
+                && $job->connection ===  Config::get('one-time-operations.queue_connection') // async
                 && $job->queue === 'foobar'; // default queue
         });
     }
@@ -258,7 +259,7 @@ public function test_processing_with_queue()
         // Job was executed synchronously
         Queue::assertPushed(OneTimeOperationProcessJob::class, function (OneTimeOperationProcessJob $job) {
             return $job->operationName === '2015_10_21_072800_foo_bar_operation'
-                && $job->connection === null // async
+                && $job->connection === Config::get('one-time-operations.queue_connection') // async
                 && $job->queue === 'narfpuit'; // queue narfpuit
         });
 
@@ -270,7 +271,7 @@ public function test_processing_with_queue()
         // Job was executed asynchronously on queue "foobar"
         Queue::assertPushed(OneTimeOperationProcessJob::class, function (OneTimeOperationProcessJob $job) {
             return $job->operationName === '2015_10_21_072800_foo_bar_operation'
-                && $job->connection === null // async
+                && $job->connection === Config::get('one-time-operations.queue_connection') // async
                 && $job->queue === 'foobar'; // queue foobar
         });
     }