Fix no env for slaves. Start of #35

Author: maxiloc

src/AlgoliaEloquentTrait.php

@@ -142,16 +142,21 @@ public function _setSettings()
         $modelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
 
         $settings = $modelHelper->getSettings($this);
-        $slaves_settings = $modelHelper->getSlavesSettings($this);
-
         $indices = $modelHelper->getIndices($this);
 
+        $slaves_settings = $modelHelper->getSlavesSettings($this);
         $slaves = isset($settings['slaves']) ? $settings['slaves'] : [];
 
         $b = true;
 
         /** @var \AlgoliaSearch\Index $index */
         foreach ($indices as $index) {
+            if ($b) {
+                $settings['slaves'] = array_map(function ($indexName) use ($modelHelper) {
+                    return $modelHelper->getFinalIndexName($this, $indexName);
+                }, $settings['slaves']);
+            }
+
             $index->setSettings($settings);
 
             if ($b) {
@@ -160,15 +165,13 @@ public function _setSettings()
             }
         }
 
-        if (count($slaves) > 0) {
-            foreach ($slaves as $slave) {
-                if (isset($slaves_settings[$slave])) {
-                    $index = $modelHelper->algolia->initIndex($slave);
+        foreach ($slaves as $slave) {
+            if (isset($slaves_settings[$slave])) {
+                $index = $modelHelper->getIndices($this, $slave)[0];
 
-                    $s = array_merge($settings, $slaves_settings[$slave]);
+                $s = array_merge($settings, $slaves_settings[$slave]);
 
-                    $index->setSettings($s);
-                }
+                $index->setSettings($s);
             }
         }
     }

src/ModelHelper.php

@@ -64,6 +64,13 @@ public function getSlavesSettings(Model $model)
         return property_exists($model, 'slavesSettings') ? $model->slavesSettings : [];
     }
 
+    public function getFinalIndexName(Model $model, $indexName)
+    {
+        $env_suffix = property_exists($model, 'perEnvironment') && $model::$perEnvironment === true ? '_'.\App::environment() : '';
+
+        return $indexName.$env_suffix;
+    }
+
     /**
      * @return \AlgoliaSearch\Index
      */
@@ -79,10 +86,8 @@ public function getIndices(Model $model, $indexName = null)
             $indicesName[] = $this->getIndexName($model);
         }
 
-        $env_suffix = property_exists($model, 'perEnvironment') && $model::$perEnvironment === true ? '_'.\App::environment() : '';
-
-        $indices = array_map(function ($index_name) use ($env_suffix) {
-            return $this->algolia->initIndex($index_name.$env_suffix);
+        $indices = array_map(function ($index_name) use ($model) {
+            return $this->algolia->initIndex($this->getFinalIndexName($model, $index_name));
         }, $indicesName);
 
         return $indices;
@@ -98,10 +103,8 @@ public function getIndicesTmp(Model $model)
             $indicesName[] = $this->getIndexName($model);
         }
 
-        $env_suffix = property_exists($model, 'perEnvironment') && $model::$perEnvironment === true ? '_'.\App::environment() : '';
-
-        $indices = array_map(function ($index_name) use ($env_suffix) {
-            return $this->algolia->initIndex($index_name.$env_suffix.'_tmp');
+        $indices = array_map(function ($index_name) use ($model) {
+            return $this->algolia->initIndex($this->getFinalIndexName($index_name).'_tmp');
         }, $indicesName);
 
         return $indices;

tests/AlgoliaEloquentTraitTest.php

@@ -4,6 +4,7 @@
 
 use AlgoliaSearch\Tests\Models\Model2;
 use AlgoliaSearch\Tests\Models\Model4;
+use AlgoliaSearch\Tests\Models\Model6;
 use Illuminate\Support\Facades\App;
 use Mockery;
 use Orchestra\Testbench\TestCase;
@@ -62,6 +63,29 @@ public function testRemoveFromIndex()
         $this->assertEquals(null, (new Model4())->removeFromIndex());
     }
 
+    public function testSetSettings()
+    {
+        $index = Mockery::mock('\AlgoliaSearch\Index');
+        $index->shouldReceive('setSettings')->with(['slaves' => ['model_6_desc_testing']]);
+        $index->shouldReceive('setSettings')->with(['ranking' => ['desc(name)']]);
+
+        /** @var \AlgoliaSearch\Laravel\ModelHelper $realModelHelper */
+        $realModelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
+        $modelHelper = Mockery::mock('\AlgoliaSearch\Laravel\ModelHelper');
+
+        App::instance('\AlgoliaSearch\Laravel\ModelHelper', $modelHelper);
+
+        $model6 = new Model6();
+        $modelHelper->shouldReceive('getSettings')->andReturn($realModelHelper->getSettings($model6));
+        $modelHelper->shouldReceive('getIndices')->andReturn([$index]);
+        $modelHelper->shouldReceive('getFinalIndexName')->andReturn($realModelHelper->getFinalIndexName($model6, 'model_6_desc'));
+        $modelHelper->shouldReceive('getSlavesSettings')->andReturn($realModelHelper->getSlavesSettings($model6));
+
+        $this->assertEquals($modelHelper->getFinalIndexName($model6, $realModelHelper->getSettings($model6)['slaves'][0]), 'model_6_desc_testing');
+
+        $model6->setSettings();
+    }
+
     public function tearDown()
     {
         Mockery::close();

tests/Models/Model6.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace AlgoliaSearch\Tests\Models;
+
+use AlgoliaSearch\Laravel\AlgoliaEloquentTrait;
+use Illuminate\Database\Eloquent\Model;
+
+class Model6 extends Model
+{
+    use AlgoliaEloquentTrait;
+
+    public static $perEnvironment = true;
+
+    public $algoliaSettings = [
+        'slaves' => [
+            'model_6_desc',
+        ],
+    ];
+
+    public $slavesSettings = [
+        'model_6_desc' => [
+            'ranking' => [
+                'desc(name)'
+            ]
+        ]
+    ];
+}