Fixed migration command

Author: babenkoivan

src/Console/ElasticMigrateCommand.php

@@ -177,17 +177,25 @@ protected function isAliasExists($name)
     }
 
     /**
-     * @param string $name
+     * @param $name
+     * @return array
      */
-    protected function deleteAlias($name)
+    protected function getAlias($name)
     {
-        $indices = ElasticClient::indices();
-
         $getPayload = (new RawPayload())
             ->set('name', $name)
             ->get();
 
-        $aliases = $indices->getAlias($getPayload);
+        return ElasticClient::indices()
+            ->getAlias($getPayload);
+    }
+
+    /**
+     * @param string $name
+     */
+    protected function deleteAlias($name)
+    {
+        $aliases = $this->getAlias($name);
 
         if (empty($aliases)) {
             return;
@@ -199,7 +207,8 @@ protected function deleteAlias($name)
                 ->set('name', $name)
                 ->get();
 
-            $indices->deleteAlias($deletePayload);
+            ElasticClient::indices()
+                ->deleteAlias($deletePayload);
 
             $this->info(sprintf(
                 'The %s alias for the %s index was deleted.',
@@ -247,19 +256,38 @@ protected function importDocumentsToTargetIndex()
 
     protected function deleteSourceIndex()
     {
-        $sourceIndexConfigurator = $this->getModel()
+        $sourceIndexConfigurator = $this
+            ->getModel()
             ->getIndexConfigurator();
 
-        $payload = (new IndexPayload($sourceIndexConfigurator))
-            ->get();
+        if ($this->isAliasExists($sourceIndexConfigurator->getName())) {
+            $aliases = $this->getAlias($sourceIndexConfigurator->getName());
 
-        ElasticClient::indices()
-            ->delete($payload);
+            foreach ($aliases as $index => $alias) {
+                $payload = (new RawPayload())
+                    ->set('index', $index)
+                    ->get();
 
-        $this->info(sprintf(
-            'The %s index was removed.',
-            $sourceIndexConfigurator->getName()
-        ));
+                ElasticClient::indices()
+                    ->delete($payload);
+
+                $this->info(sprintf(
+                    'The %s index was removed.',
+                    $index
+                ));
+            }
+        } else {
+            $payload = (new IndexPayload($sourceIndexConfigurator))
+                ->get();
+
+            ElasticClient::indices()
+                ->delete($payload);
+
+            $this->info(sprintf(
+                'The %s index was removed.',
+                $sourceIndexConfigurator->getName()
+            ));
+        }
     }
 
     public function handle()

src/Console/ElasticUpdateMappingCommand.php

@@ -6,6 +6,7 @@
 use Illuminate\Console\Command;
 use ScoutElastic\Console\Features\RequiresModelArgument;
 use ScoutElastic\Facades\ElasticClient;
+use ScoutElastic\Migratable;
 use ScoutElastic\Payloads\TypePayload;
 
 class ElasticUpdateMappingCommand extends Command
@@ -39,12 +40,16 @@ public function handle()
             throw new LogicException('Nothing to update: the mapping is not specified.');
         }
 
-        $payload = (new TypePayload($model))
-            ->set('body.' . $model->searchableAs(), $mapping)
-            ->get();
+        $payload = new TypePayload($model);
+
+        if (in_array(Migratable::class, class_uses_recursive($configurator))) {
+            $payload->useAlias('write');
+        }
+
+        $payload->set('body.' . $model->searchableAs(), $mapping);
 
         ElasticClient::indices()
-            ->putMapping($payload);
+            ->putMapping($payload->get());
 
         $this->info(sprintf(
             'The %s mapping was updated!',