Add override queue when connections is sqs

Author: gusys

ProcessMaker/Bus/SqsDispatcher.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace ProcessMaker\Bus;
+
+use Illuminate\Bus\Dispatcher as BaseDispatcher;
+
+class SqsDispatcher extends BaseDispatcher
+{
+    public function dispatch($command)
+    {
+        if (config('queue.default') === 'sqs' && property_exists($command, 'queue')) {
+            // Override to the SQS default queue
+            $command->queue = null;
+
+            \Log::info("Forcing queue to default for job: " . get_class($command));
+        }
+
+        return parent::dispatch($command);
+    }
+}

ProcessMaker/Providers/ProcessMakerServiceProvider.php

@@ -241,6 +241,12 @@ public function register(): void
         });
 
         $this->app->instance('tenant-resolved', false);
+
+        $this->app->extend(\Illuminate\Bus\Dispatcher::class, function ($dispatcher, $app) {
+            return new \ProcessMaker\Bus\SqsDispatcher($app, function ($connection) use ($app) {
+                return $app['queue']->connection($connection);
+            });
+        });
     }
 
     /**

tests/Feature/SqsDispatchOverrideTest.php

@@ -0,0 +1,58 @@
+<?php
+
+namespace Tests\Feature;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Bus\Dispatchable;
+use Illuminate\Foundation\Queue\Queueable;
+use Illuminate\Support\Facades\Queue;
+use PHPUnit\Framework\Attributes\Test;
+use Tests\TestCase;
+use Illuminate\Support\Facades\Config;
+use Illuminate\Support\Facades\Bus;
+
+class SqsDispatchOverrideTest extends TestCase
+{
+    #[Test]
+    public function it_forces_default_queue_when_using_sqs()
+    {
+        // Simulate SQS connection
+        Config::set('queue.default', 'sqs');
+
+        Queue::fake();
+
+        // Dispatch a job with a custom queue name
+        FakeJob::dispatch()->onQueue('bpmn');
+
+        // Assert the job was dispatched to the forced queue (default)
+        Queue::assertPushed(FakeJob::class, function ($job) {
+            return $job->queue === null;
+        });
+    }
+
+    #[Test]
+    public function it_respects_original_queue_when_not_using_sqs()
+    {
+        // Simulate Redis connection
+        Config::set('queue.default', 'redis');
+
+        Bus::fake();
+
+        // Dispatch a job with a custom queue name
+        FakeJob::dispatch()->onQueue('bpmn');
+
+        Bus::assertDispatched(FakeJob::class, function ($job) {
+            return $job->queue === 'bpmn';
+        });
+    }
+}
+
+class FakeJob implements ShouldQueue
+{
+    use Dispatchable, Queueable;
+
+    public function handle(): void
+    {
+        \Log::info("TestJob executed successfully.");
+    }
+}