From 30ed366e1f7ec07b0b9db75714b26cd828bb758e Mon Sep 17 00:00:00 2001
From: Guillaume Dubost <dubost_g@etna-alternance.net>
Date: Tue, 6 Dec 2016 10:12:26 +0100
Subject: [PATCH] [FIX#40258] Changement de l'ordre des actions
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Lors qu'on reset l'index on change un peu l'ordre des choses pour regagner en cohérence :
	1. Suppression de l'alias si il existe
	2. Suppression de l'index si il existe
	3. Création de l'index
	4. Création de l'alias sur l'index fraichement crée
---
 src/Elasticsearch.php | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/Elasticsearch.php b/src/Elasticsearch.php
index b5ecf05..f27b1c1 100644
--- a/src/Elasticsearch.php
+++ b/src/Elasticsearch.php
@@ -98,6 +98,16 @@ public function createIndex($name, $reset = false)
             echo "\nCreating elasticsearch index... {$app["elasticsearch.$name.index"]}\n";
             $this->unlock($name);
 
+            $alias = [
+                "index" => "{$app["elasticsearch.$name.index"]}-{$app["version"]}",
+                "name"  => $app["elasticsearch.{$name}.index"]
+            ];
+            try {
+                $app["elasticsearch.{$name}"]->indices()->deleteAlias($alias);
+            } catch (\Exception $e) {
+                echo "Alias doesn't exist... \n";
+            }
+
             // On supprime l'index
             try {
                 $app["elasticsearch.{$name}"]->indices()->delete(
@@ -119,18 +129,7 @@ public function createIndex($name, $reset = false)
             $app["elasticsearch.$name"]->indices()->create($index_params);
 
             // Rajout de l'alias
-            $alias = [
-                "index" => "{$app["elasticsearch.$name.index"]}-{$app["version"]}",
-                "name"  => $app["elasticsearch.{$name}.index"]
-            ];
-
-            try {
-                $app["elasticsearch.{$name}"]->indices()->deleteAlias($alias);
-            } catch (\Exception $e) {
-                echo "Alias doesn't exist... \n";
-            }
             $app["elasticsearch.{$name}"]->indices()->putAlias($alias);
-
             echo "Index {$app["elasticsearch.$name.index"]} created successfully!\n\n";
 
             foreach ($app["elasticsearch.{$name}.types"] as $type) {