- An index isn't updated if model data is empty

- Fixed the problem when model observer was registered twice

Author: babenkoivan

src/Console/ElasticUpdateMappingCommand.php

@@ -16,7 +16,9 @@ class ElasticUpdateMappingCommand extends Command
     protected $description = 'Update a model mapping';
 
     public function handle() {
-        $model = $this->getModel();
+        if (!$model = $this->getModel()) {
+            return;
+        }
 
         $configurator = $model->getIndexConfigurator();
 

src/Console/Features/requiresModelArgument.php

@@ -16,7 +16,7 @@ protected function getModel()
 
         $modelInstance = new $modelClass;
 
-        if (!($modelInstance instanceof Model) || !method_exists($modelInstance, 'getIndexConfigurator')) {
+        if (!($modelInstance instanceof Model) || !in_array(Searchable::class, class_uses_recursive($modelClass))) {
             $this->error(sprintf(
                 'The %s class must extend %s and use the %s trait.',
                 $modelClass,

src/ElasticEngine.php

@@ -24,16 +24,22 @@ public function __construct()
 
     public function update($models)
     {
-        $models->map(function ($model) {
+        $models->each(function ($model) {
             if ($this->updateMapping) {
                 Artisan::call(
                     'elastic:update-mapping',
                     ['model' => get_class($model)]
                 );
             }
 
+            $array = $model->toSearchableArray();
+
+            if (empty($array)) {
+                return true;
+            }
+
             $payload = (new DocumentPayload($model))
-                ->setIfNotEmpty('body', $model->toSearchableArray())
+                ->set('body', $array)
                 ->get();
 
             ElasticClient::index($payload);
@@ -44,7 +50,7 @@ public function update($models)
 
     public function delete($models)
     {
-        $models->map(function ($model) {
+        $models->each(function ($model) {
             $payload = (new DocumentPayload($model))
                 ->get();
 

src/Payloads/TypePayload.php

@@ -15,7 +15,7 @@ class TypePayload extends IndexPayload
 
     public function __construct(Model $model)
     {
-        if (!method_exists($model, 'getIndexConfigurator')) {
+        if (!in_array(Searchable::class, class_uses_recursive($model))) {
             throw new Exception(sprintf(
                 'The %s model must use the %s trait.',
                 get_class($model),

src/Searchable.php

@@ -8,7 +8,22 @@
 use \Exception;
 
 trait Searchable {
-    use ScoutSearchable;
+    use ScoutSearchable {
+        ScoutSearchable::bootSearchable as bootScoutSearchable;
+    }
+
+    private static $isSearchableTraitBooted = false;
+
+    public static function bootSearchable()
+    {
+        if (self::$isSearchableTraitBooted) {
+            return;
+        }
+
+        self::bootScoutSearchable();
+
+        self::$isSearchableTraitBooted = true;
+    }
 
     /**
      * @return IndexConfigurator