Added tests and implemented exists functionality for elasticsearch se…

…rvice
spira · Dec 21, 2015 · 3cb4b01 · 3cb4b01
1 parent fe645f4
commit 3cb4b01
Show file tree

Hide file tree

Showing 4 changed files with 148 additions and 7 deletions.
diff --git a/api/app/Services/ElasticSearch.php b/api/app/Services/ElasticSearch.php
@@ -91,6 +91,25 @@ public function deleteIndex(IndexedModel $model = null)
         return $this->getClient()->indices()->delete($config);
     }
 
+    /**
+     * @param IndexedModel|null $model
+     * @return array
+     */
+    public function indexExists(IndexedModel $model = null)
+    {
+        $indexName = self::getDefaultIndexName();
+
+        if ($model) {
+            $indexName = $model->getIndexName();
+        }
+
+        $config = [
+            'index' => $indexName,
+        ];
+
+        return $this->getClient()->indices()->exists($config);
+    }
+
     /**
      * @param $indexName
      * @return array

diff --git a/api/bootstrap/app.php b/api/bootstrap/app.php
@@ -58,12 +58,8 @@
 );
 
 $app->singleton(App\Services\ElasticSearch::class, function ($app) {
-    $config = [];
-    if (config()->has('elasticquent.config')) {
-        $config = config()->get('elasticquent.config');
-    }
 
-    $client = new \Elasticsearch\Client($config);
+    $client = new \Elasticsearch\Client(App\Services\ElasticSearch::getConfig());
 
     return new App\Services\ElasticSearch($client);
 });

diff --git a/api/database/migrations/2014_09_24_074349_create_elastic_search_index.php b/api/database/migrations/2014_09_24_074349_create_elastic_search_index.php
@@ -29,7 +29,9 @@ public function __construct()
      */
     public function up()
     {
-        $this->elasticSearch->createIndex();
+        if (!$this->elasticSearch->indexExists()) {
+            $this->elasticSearch->createIndex();
+        }
     }
 
     /**
@@ -39,6 +41,8 @@ public function up()
      */
     public function down()
     {
-        $this->elasticSearch->deleteIndex();
+        if ($this->elasticSearch->indexExists()){
+            $this->elasticSearch->deleteIndex();
+        }
     }
 }
diff --git a/api/tests/ElasticSearchTest.php b/api/tests/ElasticSearchTest.php
@@ -0,0 +1,122 @@
+<?php
+
+/*
+ * This file is part of the Spira framework.
+ *
+ * @link https://github.com/spira/spira
+ *
+ * For the full copyright and license information, please view the LICENSE file that was distributed with this source code.
+ */
+
+/**
+ * Class ElasticSearchTest.
+ */
+class ElasticSearchTest extends TestCase
+{
+    public function testCreateIndex()
+    {
+        $elasticSearchMock = Mockery::mock(\Elasticsearch\Client::class)->makePartial();
+        $indicesMock = Mockery::mock(\Elasticsearch\Namespaces\IndicesNamespace::class);
+
+        $elasticSearchMock->shouldReceive('indices')->andReturn($indicesMock);
+        $indicesMock->shouldReceive('create')->with(\Mockery::subset(['index' => config()->get('elasticquent.default_index')]));
+
+        $elasticSearchService = new \App\Services\ElasticSearch($elasticSearchMock);
+
+        $elasticSearchService->createIndex();
+    }
+
+    public function testCreateIndexForModel()
+    {
+        $elasticSearchMock = Mockery::mock(\Elasticsearch\Client::class)->makePartial();
+        $indicesMock = Mockery::mock(\Elasticsearch\Namespaces\IndicesNamespace::class);
+
+        $elasticSearchMock->shouldReceive('indices')->andReturn($indicesMock);
+        $indicesMock->shouldReceive('create')->with(\Mockery::subset(['index' => 'foo']));
+
+        $elasticSearchService = new \App\Services\ElasticSearch($elasticSearchMock);
+
+        $elasticSearchService->createIndex(new class extends \Spira\Core\Model\Model\IndexedModel {
+
+            public function getIndexName()
+            {
+                return 'foo';
+            }
+
+        });
+    }
+
+    public function testDeleteIndex()
+    {
+        $elasticSearchMock = Mockery::mock(\Elasticsearch\Client::class)->makePartial();
+        $indicesMock = Mockery::mock(\Elasticsearch\Namespaces\IndicesNamespace::class);
+
+        $elasticSearchMock->shouldReceive('indices')->andReturn($indicesMock);
+        $indicesMock->shouldReceive('delete')->with(\Mockery::subset(['index' => config()->get('elasticquent.default_index')]));
+
+        $elasticSearchService = new \App\Services\ElasticSearch($elasticSearchMock);
+
+        $elasticSearchService->deleteIndex();
+    }
+
+    public function testDeleteIndexForModel()
+    {
+        $elasticSearchMock = Mockery::mock(\Elasticsearch\Client::class)->makePartial();
+        $indicesMock = Mockery::mock(\Elasticsearch\Namespaces\IndicesNamespace::class);
+
+        $elasticSearchMock->shouldReceive('indices')->andReturn($indicesMock);
+        $indicesMock->shouldReceive('delete')->with(\Mockery::subset(['index' => 'foo']));
+
+        $elasticSearchService = new \App\Services\ElasticSearch($elasticSearchMock);
+
+        $elasticSearchService->deleteIndex(new class extends \Spira\Core\Model\Model\IndexedModel {
+
+            public function getIndexName()
+            {
+                return 'foo';
+            }
+
+        });
+    }
+
+    public function testIndexExists()
+    {
+        $elasticSearchMock = Mockery::mock(\Elasticsearch\Client::class)->makePartial();
+        $indicesMock = Mockery::mock(\Elasticsearch\Namespaces\IndicesNamespace::class);
+
+        $elasticSearchMock->shouldReceive('indices')->andReturn($indicesMock);
+        $indicesMock->shouldReceive('exists')->with(\Mockery::subset(['index' => 'foo']));
+
+        $elasticSearchService = new \App\Services\ElasticSearch($elasticSearchMock);
+
+        $elasticSearchService->indexExists(new class extends \Spira\Core\Model\Model\IndexedModel {
+
+            public function getIndexName()
+            {
+                return 'foo';
+            }
+
+        });
+    }
+
+    public function testIndexExistsForModel()
+    {
+        $elasticSearchMock = Mockery::mock(\Elasticsearch\Client::class)->makePartial();
+        $indicesMock = Mockery::mock(\Elasticsearch\Namespaces\IndicesNamespace::class);
+
+        $elasticSearchMock->shouldReceive('indices')->andReturn($indicesMock);
+        $indicesMock->shouldReceive('exists')->with(\Mockery::subset(['index' => 'foo']));
+
+        $elasticSearchService = new \App\Services\ElasticSearch($elasticSearchMock);
+
+        $elasticSearchService->indexExists(new class extends \Spira\Core\Model\Model\IndexedModel {
+
+            public function getIndexName()
+            {
+                return 'foo';
+            }
+
+        });
+    }
+
+}