From 726892c586949b8cf13ccca7fa7c1f3c3ca43f2d Mon Sep 17 00:00:00 2001
From: Lea Haensenberger <lea.haensenberger@gmail.com>
Date: Thu, 13 Mar 2014 10:43:35 +0100
Subject: [PATCH] Ignore TypeMissingException when resetting a single type.
 This allows to create new types without having to recreate the whole index.

---
 Resetter.php           |  9 ++++++++-
 Tests/ResetterTest.php | 29 +++++++++++++++++++++++++++++
 2 files changed, 37 insertions(+), 1 deletion(-)

diff --git a/Resetter.php b/Resetter.php
index 69620a2..b22f6a1 100644
--- a/Resetter.php
+++ b/Resetter.php
@@ -2,6 +2,7 @@
 
 namespace FOS\ElasticaBundle;
 
+use Elastica\Exception\ResponseException;
 use Elastica\Type\Mapping;
 
 /**
@@ -59,7 +60,13 @@ class Resetter
         }
 
         $type = $indexConfig['index']->getType($typeName);
-        $type->delete();
+        try {
+            $type->delete();
+        } catch (ResponseException $e) {
+            if (strpos($e->getMessage(), 'TypeMissingException') !== 0) {
+                throw $e;
+            }
+        }
         $mapping = $this->createMapping($indexConfig['config']['mappings'][$typeName]);
         $type->setMapping($mapping);
     }
diff --git a/Tests/ResetterTest.php b/Tests/ResetterTest.php
index aa0fbcc..b4e5649 100644
--- a/Tests/ResetterTest.php
+++ b/Tests/ResetterTest.php
@@ -2,6 +2,9 @@
 
 namespace FOS\ElasticaBundle\Tests\Resetter;
 
+use Elastica\Exception\ResponseException;
+use Elastica\Request;
+use Elastica\Response;
 use FOS\ElasticaBundle\Resetter;
 use Elastica\Type\Mapping;
 
@@ -130,6 +133,32 @@ class ResetterTest extends \PHPUnit_Framework_TestCase
         $resetter->resetIndexType('foo', 'c');
     }
 
+    public function testResetIndexTypeIgnoreTypeMissingException()
+    {
+        $type = $this->getMockElasticaType();
+
+        $this->indexConfigsByName['foo']['index']->expects($this->once())
+            ->method('getType')
+            ->with('a')
+            ->will($this->returnValue($type));
+
+        $type->expects($this->once())
+            ->method('delete')
+            ->will($this->throwException(new ResponseException(
+                new Request(''),
+                new Response(array('error' => 'TypeMissingException[[de_20131022] type[bla] missing]', 'status' => 404)))
+            ));
+
+        $mapping = Mapping::create($this->indexConfigsByName['foo']['config']['mappings']['a']['properties']);
+        $mapping->setParam('dynamic_templates', $this->indexConfigsByName['foo']['config']['mappings']['a']['dynamic_templates']);
+        $type->expects($this->once())
+            ->method('setMapping')
+            ->with($mapping);
+
+        $resetter = new Resetter($this->indexConfigsByName);
+        $resetter->resetIndexType('foo', 'a');
+    }
+
     public function testIndexMappingForParent()
     {
         $type = $this->getMockElasticaType();