Add ability to enter custom range via --min and --max options

Author: stevebauman

src/Console/QueueCommand.php

@@ -16,6 +16,8 @@ class QueueCommand extends Command
      */
     protected $signature = 'scout:queue
             {model : Class name of model to bulk queue}
+            {--min= : The minimum ID to start queuing from}
+            {--max= : The maximum ID to queue up to}
             {--c|chunk= : The number of records to queue in a single job (Defaults to configuration value: `scout.chunk.searchable`)}';
 
     /**
@@ -38,8 +40,10 @@ public function handle()
 
         $query = $model::makeAllSearchableQuery();
 
-        $min = $query->min($model->getScoutKeyName());
-        $max = $query->max($model->getScoutKeyName());
+        $min = $this->option('min') ?? $query->min($model->getScoutKeyName());
+        $max = $this->option('max') ?? $query->max($model->getScoutKeyName());
+
+        $chunk = max(1, (int) ($this->option('chunk') ?? config('scout.chunk.searchable', 500)));
 
         if (! $min || ! $max) {
             $this->info('No records found for ['.$class.']');
@@ -53,12 +57,8 @@ public function handle()
             return;
         }
 
-        $chunkSize = $this->option('chunk') ?? config('scout.chunk.searchable', 500);
-
-        $chunkSize = max(1, (int) $chunkSize);
-
-        for ($start = $min; $start <= $max; $start += $chunkSize) {
-            $end = min($start + $chunkSize - 1, $max);
+        for ($start = $min; $start <= $max; $start += $chunk) {
+            $end = min($start + $chunk - 1, $max);
 
             dispatch(new MakeRangeSearchable($model, $start, $end))
                 ->onQueue($model->syncWithSearchUsingQueue())

tests/Feature/Commands/QueueCommandTest.php

@@ -51,7 +51,6 @@ public function test_it_uses_custom_chunk_size()
     {
         Queue::fake();
 
-        // Create test users
         SearchableUserFactory::new()->count(10)->create();
 
         $parameters = [
@@ -190,7 +189,6 @@ public function test_it_handles_chunk_size_larger_than_dataset()
     {
         Queue::fake();
 
-        // Create 3 users but use chunk size of 10
         SearchableUserFactory::new()->count(3)->create();
 
         $parameters = [
@@ -211,7 +209,6 @@ public function test_it_handles_chunk_size_of_one()
     {
         Queue::fake();
 
-        // Create 3 users with chunk size of 1
         SearchableUserFactory::new()->count(3)->create();
 
         $parameters = [
@@ -279,4 +276,148 @@ public function test_it_handles_zero_chunk_size()
         // Should still dispatch jobs (using default chunk size)
         Queue::assertPushed(MakeRangeSearchable::class);
     }
+
+    public function test_it_accepts_custom_min_option()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(10)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--min' => 5
+        ])
+            ->expectsOutputToContain('models up to ID: 10')
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should dispatch one job for range 5-10
+        Queue::assertPushed(MakeRangeSearchable::class, function ($job) {
+            return $job->start === 5 && $job->end === 10;
+        });
+    }
+
+    public function test_it_accepts_custom_max_option()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(10)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--max' => 5
+        ])
+            ->expectsOutputToContain('models up to ID: 5')
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should dispatch one job for range 1-5
+        Queue::assertPushed(MakeRangeSearchable::class, function ($job) {
+            return $job->start === 1 && $job->end === 5;
+        });
+    }
+
+    public function test_it_accepts_both_min_and_max_options()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(10)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--min' => 3,
+            '--max' => 7
+        ])
+            ->expectsOutputToContain('models up to ID: 7')
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should dispatch one job for range 3-7
+        Queue::assertPushed(MakeRangeSearchable::class, function ($job) {
+            return $job->start === 3 && $job->end === 7;
+        });
+    }
+
+    public function test_it_chunks_custom_range_correctly()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(10)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--min' => 2,
+            '--max' => 8,
+            '--chunk' => 3
+        ])
+            ->expectsOutputToContain('models up to ID: 4')
+            ->expectsOutputToContain('models up to ID: 7')
+            ->expectsOutputToContain('models up to ID: 8')
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should dispatch 3 jobs: [2-4], [5-7], [8]
+        Queue::assertPushed(MakeRangeSearchable::class, 3);
+    }
+
+    public function test_it_handles_min_greater_than_max()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(5)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--min' => 5,
+            '--max' => 2
+        ])
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should not dispatch any jobs since the range is invalid (start > end in loop)
+        Queue::assertNothingPushed();
+    }
+
+    public function test_it_handles_negative_min_option()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(3)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--min' => -5,
+            '--max' => 2
+        ])
+            ->expectsOutputToContain('models up to ID: 2')
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should dispatch one job for range -5 to 2
+        Queue::assertPushed(MakeRangeSearchable::class, function ($job) {
+            return $job->start === -5 && $job->end === 2;
+        });
+    }
+
+    public function test_it_can_accept_all_options()
+    {
+        Queue::fake();
+
+        SearchableUserFactory::new()->count(20)->create();
+
+        $this->artisan('scout:queue', [
+            'model' => SearchableUser::class,
+            '--min' => 5,
+            '--max' => 15,
+            '--chunk' => 4
+        ])
+            ->expectsOutputToContain('models up to ID: 8')
+            ->expectsOutputToContain('models up to ID: 12')
+            ->expectsOutputToContain('models up to ID: 15')
+            ->expectsOutputToContain('records have been queued')
+            ->assertSuccessful();
+
+        // Should dispatch 3 jobs: [5-8], [9-12], [13-15]
+        Queue::assertPushed(MakeRangeSearchable::class, 3);
+    }
 }