Extract Redis key generation to dedicated RedisKeys class

Removed duplicated key helper methods from 6 files and centralized them
in a single RedisKeys class. This makes key generation consistent and
easier to maintain.

- Added src/Support/RedisKeys.php with all key generation methods
- Updated BalancedRedisQueue, Metrics, SmartFairStrategy, and commands
- Removed duplicated code

Author: YanGusik

src/BalancedQueueManager.php

@@ -182,8 +182,7 @@ protected function createSmartFairStrategy(array $config): SmartFairStrategy
             $config['boost_small_queues'] ?? true,
             $config['small_queue_threshold'] ?? 5,
             $config['boost_multiplier'] ?? 1.5,
-            $this->getPrefix(),
-            $config['metrics_key_prefix'] ?? 'balanced-queue:metrics'
+            $this->getPrefix()
         );
     }
 

src/Console/BalancedQueueClearCommand.php

@@ -6,6 +6,7 @@
 
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Redis;
+use YanGusik\BalancedQueue\Support\RedisKeys;
 
 class BalancedQueueClearCommand extends Command
 {
@@ -16,11 +17,11 @@ class BalancedQueueClearCommand extends Command
 
     protected $description = 'Clear balanced queue jobs';
 
-    protected string $prefix;
+    protected RedisKeys $keys;
 
     public function handle(): int
     {
-        $this->prefix = config('balanced-queue.redis.prefix', 'balanced-queue');
+        $this->keys = new RedisKeys(config('balanced-queue.redis.prefix', 'balanced-queue'));
         $queueName = $this->argument('queue');
         $partition = $this->option('partition');
         $force = $this->option('force');
@@ -36,10 +37,10 @@ public function handle(): int
 
     protected function clearPartition($redis, string $queueName, string $partition, bool $force): int
     {
-        $queueListKey = $this->getPartitionQueueKey($queueName, $partition);
-        $activeKey = $this->getActiveKey($queueName, $partition);
-        $metricsKey = $this->getMetricsKey($queueName, $partition);
-        $partitionsKey = $this->getPartitionsKey($queueName);
+        $queueListKey = $this->keys->partitionQueue($queueName, $partition);
+        $activeKey = $this->keys->active($queueName, $partition);
+        $metricsKey = $this->keys->metrics($queueName, $partition);
+        $partitionsKey = $this->keys->partitions($queueName);
 
         $pending = (int) $redis->llen($queueListKey);
         $active = (int) $redis->hlen($activeKey);
@@ -71,7 +72,7 @@ protected function clearPartition($redis, string $queueName, string $partition,
 
     protected function clearAll($redis, string $queueName, bool $force): int
     {
-        $partitionsKey = $this->getPartitionsKey($queueName);
+        $partitionsKey = $this->keys->partitions($queueName);
         $partitions = $redis->smembers($partitionsKey);
 
         if (empty($partitions)) {
@@ -84,8 +85,8 @@ protected function clearAll($redis, string $queueName, bool $force): int
         $partitionStats = [];
 
         foreach ($partitions as $partition) {
-            $queueListKey = $this->getPartitionQueueKey($queueName, $partition);
-            $activeKey = $this->getActiveKey($queueName, $partition);
+            $queueListKey = $this->keys->partitionQueue($queueName, $partition);
+            $activeKey = $this->keys->active($queueName, $partition);
 
             $pending = (int) $redis->llen($queueListKey);
             $active = (int) $redis->hlen($activeKey);
@@ -116,49 +117,19 @@ protected function clearAll($redis, string $queueName, bool $force): int
 
         // Clear all
         foreach ($partitions as $partition) {
-            $redis->del($this->getPartitionQueueKey($queueName, $partition));
-            $redis->del($this->getActiveKey($queueName, $partition));
-            $redis->del($this->getDelayedKey($queueName, $partition));
-            $redis->del($this->getMetricsKey($queueName, $partition));
+            $redis->del($this->keys->partitionQueue($queueName, $partition));
+            $redis->del($this->keys->active($queueName, $partition));
+            $redis->del($this->keys->delayed($queueName, $partition));
+            $redis->del($this->keys->metrics($queueName, $partition));
         }
 
         $redis->del($partitionsKey);
 
-        // Clear round-robin state (uses queueName without 'queues:' prefix)
-        $rrStateKey = "{$this->prefix}:rr-state:{$queueName}";
-        $redis->del($rrStateKey);
+        // Clear round-robin state
+        $redis->del($this->keys->roundRobinState($queueName));
 
         $this->info("✓ Cleared {$totalPending} pending and {$totalActive} active jobs from " . count($partitions) . " partitions.");
 
         return Command::SUCCESS;
     }
-
-    // =========================================================================
-    // Redis Key Helpers (mirrors BalancedRedisQueue)
-    // =========================================================================
-
-    protected function getPartitionsKey(string $queueName): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:partitions";
-    }
-
-    protected function getPartitionQueueKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:{$partition}";
-    }
-
-    protected function getActiveKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:{$partition}:active";
-    }
-
-    protected function getMetricsKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:metrics:{$queueName}:{$partition}";
-    }
-
-    protected function getDelayedKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:{$partition}:delayed";
-    }
 }

src/Console/BalancedQueueTableCommand.php

@@ -7,6 +7,7 @@
 use Illuminate\Console\Command;
 use Illuminate\Support\Facades\Redis;
 use YanGusik\BalancedQueue\Support\Metrics;
+use YanGusik\BalancedQueue\Support\RedisKeys;
 
 class BalancedQueueTableCommand extends Command
 {
@@ -18,11 +19,11 @@ class BalancedQueueTableCommand extends Command
 
     protected $description = 'Display balanced queue statistics';
 
-    protected string $prefix;
+    protected RedisKeys $keys;
 
     public function handle(): int
     {
-        $this->prefix = config('balanced-queue.redis.prefix', 'balanced-queue');
+        $this->keys = new RedisKeys(config('balanced-queue.redis.prefix', 'balanced-queue'));
         $showAll = $this->option('all');
         $watch = $this->option('watch');
         $interval = (int) $this->option('interval');
@@ -53,7 +54,7 @@ public function handle(): int
      */
     protected function getAllQueues(): array
     {
-        $metrics = new Metrics(Redis::connection(config('balanced-queue.redis.connection')), $this->prefix);
+        $metrics = new Metrics(Redis::connection(config('balanced-queue.redis.connection')), $this->keys->getPrefix());
 
         return $metrics->getAllQueues();
     }
@@ -118,7 +119,7 @@ protected function displayTable(string $queueName): void
         $redis = Redis::connection(config('balanced-queue.redis.connection'));
 
         // Get all partitions
-        $partitionsKey = $this->getPartitionsKey($queueName);
+        $partitionsKey = $this->keys->partitions($queueName);
         $partitions = $redis->smembers($partitionsKey);
 
         if (empty($partitions)) {
@@ -131,9 +132,9 @@ protected function displayTable(string $queueName): void
         $rows = [];
 
         foreach ($partitions as $partition) {
-            $queueListKey = $this->getPartitionQueueKey($queueName, $partition);
-            $activeKey = $this->getActiveKey($queueName, $partition);
-            $metricsKey = $this->getMetricsKey($queueName, $partition);
+            $queueListKey = $this->keys->partitionQueue($queueName, $partition);
+            $activeKey = $this->keys->active($queueName, $partition);
+            $metricsKey = $this->keys->metrics($queueName, $partition);
 
             $pending = (int) $redis->llen($queueListKey);
             $active = (int) $redis->hlen($activeKey);
@@ -208,28 +209,4 @@ protected function formatActive(int $num): string
 
         return "<fg=green>{$num}</>";
     }
-
-    // =========================================================================
-    // Redis Key Helpers (mirrors BalancedRedisQueue)
-    // =========================================================================
-
-    protected function getPartitionsKey(string $queueName): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:partitions";
-    }
-
-    protected function getPartitionQueueKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:{$partition}";
-    }
-
-    protected function getActiveKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:queues:{$queueName}:{$partition}:active";
-    }
-
-    protected function getMetricsKey(string $queueName, string $partition): string
-    {
-        return "{$this->prefix}:metrics:{$queueName}:{$partition}";
-    }
 }