Merge pull request #7 from sebestenyb/sebestenyb-patch-2

Global Partition Resolver is ignored

Author: YanGusik

src/Jobs/BalancedDispatchable.php

@@ -39,7 +39,7 @@ trait BalancedDispatchable
     /**
      * The partition key for this job.
      */
-    protected ?string $partitionKey = null;
+    public ?string $partitionKey = null;
 
     /**
      * Set the partition key for this job.
@@ -50,37 +50,4 @@ public function onPartition(string|int $partition): static
 
         return $this;
     }
-
-    /**
-     * Get the partition key for this job.
-     *
-     * Override this method to provide custom partition logic,
-     * or use onPartition() when dispatching.
-     */
-    public function getPartitionKey(): string
-    {
-        // If explicitly set via onPartition()
-        if ($this->partitionKey !== null) {
-            return $this->partitionKey;
-        }
-
-        // Try common property names
-        if (property_exists($this, 'userId')) {
-            return (string) $this->userId;
-        }
-
-        if (property_exists($this, 'user_id')) {
-            return (string) $this->user_id;
-        }
-
-        if (property_exists($this, 'tenantId')) {
-            return (string) $this->tenantId;
-        }
-
-        if (property_exists($this, 'tenant_id')) {
-            return (string) $this->tenant_id;
-        }
-
-        return 'default';
-    }
 }

src/Queue/BalancedRedisQueue.php

@@ -263,14 +263,28 @@ public function deletePartitionJob(string $queue, string $partition, string $job
      */
     protected function resolvePartition($job): string
     {
+        // 1. Explicitly set via onPartition()
+        if (isset($job->partitionKey)) {
+            return (string) $job->partitionKey;
+        }
+    
+        // 2. Overridden in job class (now works correctly without trait method!)
         if (method_exists($job, 'getPartitionKey')) {
             return (string) $job->getPartitionKey();
         }
-
+    
+        // 3. Global resolver from config
         if (isset($this->partitionResolver)) {
             return (string) ($this->partitionResolver)($job);
         }
-
+    
+        // 4. Auto-detect from common properties
+        foreach (['userId', 'user_id', 'tenantId', 'tenant_id'] as $prop) {
+            if (property_exists($job, $prop) && $job->$prop !== null) {
+                return (string) $job->$prop;
+            }
+        }
+    
         return 'default';
     }
 

tests/Feature/BalancedDispatchableTest.php

@@ -5,7 +5,10 @@
 namespace YanGusik\BalancedQueue\Tests\Feature;
 
 use Illuminate\Contracts\Queue\ShouldQueue;
+use ReflectionClass;
+use ReflectionException;
 use YanGusik\BalancedQueue\Jobs\BalancedDispatchable;
+use YanGusik\BalancedQueue\Queue\BalancedRedisQueue;
 use YanGusik\BalancedQueue\Tests\TestCase;
 
 class TestJobWithUserId implements ShouldQueue
@@ -54,36 +57,51 @@ public function handle(): void
 
 class BalancedDispatchableTest extends TestCase
 {
+    /**
+     * @throws ReflectionException
+     */
     public function test_partition_key_from_user_id_property(): void
     {
         $job = new TestJobWithUserId(userId: 42);
 
-        $this->assertEquals('42', $job->getPartitionKey());
+        $this->assertEquals('42', $this->resolvePartition($job));
     }
 
+    /**
+     * @throws ReflectionException
+     */
     public function test_partition_key_from_custom_method(): void
     {
         $job = new TestJobWithCustomPartition(customKey: 'abc123');
 
-        $this->assertEquals('custom:abc123', $job->getPartitionKey());
+        $this->assertEquals('custom:abc123', $this->resolvePartition($job));
     }
 
+    /**
+     * @throws ReflectionException
+     */
     public function test_partition_key_default_when_no_property(): void
     {
         $job = new TestJobWithoutPartition(data: 'test');
 
-        $this->assertEquals('default', $job->getPartitionKey());
+        $this->assertEquals('default', $this->resolvePartition($job));
     }
 
+    /**
+     * @throws ReflectionException
+     */
     public function test_on_partition_sets_explicit_key(): void
     {
         $job = new TestJobWithUserId(userId: 42);
         $job->onPartition('explicit-key');
 
         // Explicit key takes precedence over userId property
-        $this->assertEquals('explicit-key', $job->getPartitionKey());
+        $this->assertEquals('explicit-key', $this->resolvePartition($job));
     }
 
+    /**
+     * @throws ReflectionException
+     */
     public function test_on_partition_returns_self(): void
     {
         $job = new TestJobWithUserId(userId: 1);
@@ -92,11 +110,25 @@ public function test_on_partition_returns_self(): void
         $this->assertSame($job, $result);
     }
 
+    /**
+     * @throws ReflectionException
+     */
     public function test_on_partition_accepts_integer(): void
     {
         $job = new TestJobWithUserId(userId: 1);
         $job->onPartition(999);
 
-        $this->assertEquals('999', $job->getPartitionKey());
+        $this->assertEquals('999', $this->resolvePartition($job));
+    }
+
+    /**
+     * @throws ReflectionException
+     */
+    private function resolvePartition($job): string
+    {
+        $queue = resolve(BalancedRedisQueue::class);
+        $class = new ReflectionClass($queue);
+        $method = $class->getMethod('resolvePartition');
+        return $method->invokeArgs($queue, [$job]);
     }
 }