Fires event models imported in aggregators

src/Console/Commands/ImportCommand.php

@@ -16,7 +16,10 @@
 use Laravel\Scout\Searchable;
 use Illuminate\Console\Command;
 use Algolia\ScoutExtended\Algolia;
+use Laravel\Scout\Events\ModelsImported;
+use Illuminate\Contracts\Events\Dispatcher;
 use Algolia\ScoutExtended\Helpers\SearchableFinder;
+use Algolia\ScoutExtended\Searchable\ObjectIdEncrypter;
 
 final class ImportCommand extends Command
 {
@@ -33,13 +36,21 @@ final class ImportCommand extends Command
     /**
      * {@inheritdoc}
      */
-    public function handle(SearchableFinder $searchableFinder): void
+    public function handle(Dispatcher $events, SearchableFinder $searchableFinder): void
     {
         foreach ($searchableFinder->fromCommand($this) as $searchable) {
             $this->call('scout:flush', ['searchable' => $searchable]);
 
+            $events->listen(ModelsImported::class, function ($event) use ($searchable) {
+                $last = ObjectIdEncrypter::encrypt($event->models->last());
+
+                $this->line('<comment>Imported ['.$searchable.'] models up to ID:</comment> '.$last);
+            });
+
             $searchable::makeAllSearchable();
 
+            $events->forget(ModelsImported::class);
+
             $this->output->success('All ['.$searchable.'] records have been imported.');
         }
     }

src/Searchable/Aggregator.php

@@ -17,6 +17,7 @@
 use Illuminate\Support\Str;
 use Laravel\Scout\Searchable;
 use Illuminate\Database\Eloquent\Model;
+use Laravel\Scout\Events\ModelsImported;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use Algolia\ScoutExtended\Contracts\SearchableCountableContract;
 use Algolia\ScoutExtended\Exceptions\ModelNotDefinedInAggregatorException;
@@ -169,9 +170,13 @@ public static function makeAllSearchable()
             $instance->newQuery()->when($softDeletes, function ($query) {
                 $query->withTrashed();
             })->orderBy($instance->getKeyName())->chunk(config('scout.chunk.searchable', 500), function ($models) {
-                $models->map(function ($model) {
+                $models = $models->map(function ($model) {
                     return static::create($model);
-                })->filter->shouldBeSearchable()->searchable();
+                })->filter->shouldBeSearchable();
+
+                $models->searchable();
+
+                event(new ModelsImported($models));
             });
         }
     }