Merge pull request #70 from algolia/index-name-in-get-algolia-records

Fixes #68. Add index name in getAlgoliaRecords method

Author: maxiloc

src/AlgoliaEloquentTrait.php

@@ -37,7 +37,7 @@ public function _reindex($safe = true, $setSettings = true)
 
                 foreach ($models as $model) {
                     if ($modelHelper->indexOnly($model, $index->indexName)) {
-                        $records[] = $model->getAlgoliaRecordDefault();
+                        $records[] = $model->getAlgoliaRecordDefault($index->indexName);
                     }
                 }
 
@@ -234,15 +234,15 @@ public function __call($method, $parameters)
     /**
      * Methods.
      */
-    public function getAlgoliaRecordDefault()
+    public function getAlgoliaRecordDefault($indexName)
     {
         /** @var \AlgoliaSearch\Laravel\ModelHelper $modelHelper */
         $modelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
 
         $record = null;
 
         if (method_exists($this, static::$methodGetName)) {
-            $record = $this->{static::$methodGetName}();
+            $record = $this->{static::$methodGetName}($indexName);
         } else {
             $record = $this->toArray();
         }
@@ -264,7 +264,7 @@ public function pushToIndex()
         /** @var \AlgoliaSearch\Index $index */
         foreach ($indices as $index) {
             if ($modelHelper->indexOnly($this, $index->indexName)) {
-                $index->addObject($this->getAlgoliaRecordDefault());
+                $index->addObject($this->getAlgoliaRecordDefault($index->indexName));
             }
         }
     }

src/EloquentSubscriber.php

@@ -20,7 +20,7 @@ public function saved($model)
         /** @var \AlgoliaSearch\Index $index */
         foreach ($this->modelHelper->getIndices($model) as $index) {
             if ($this->modelHelper->indexOnly($model, $index->indexName)) {
-                $index->addObject($this->modelHelper->getAlgoliaRecord($model), $this->modelHelper->getObjectId($model));
+                $index->addObject($this->modelHelper->getAlgoliaRecord($model, $index->indexName), $this->modelHelper->getObjectId($model));
             }
         }
 

src/ModelHelper.php

@@ -131,8 +131,8 @@ public function getIndicesTmp(Model $model)
         return $indices;
     }
 
-    public function getAlgoliaRecord(Model $model)
+    public function getAlgoliaRecord(Model $model, $indexName)
     {
-        return $model->getAlgoliaRecordDefault();
+        return $model->getAlgoliaRecordDefault($indexName);
     }
 }

tests/AlgoliaEloquentTraitTest.php

@@ -2,6 +2,7 @@
 
 namespace AlgoliaSearch\Tests;
 
+use AlgoliaSearch\Tests\Models\Model11;
 use AlgoliaSearch\Tests\Models\Model2;
 use AlgoliaSearch\Tests\Models\Model4;
 use AlgoliaSearch\Tests\Models\Model6;
@@ -21,8 +22,8 @@ public function setUp()
 
     public function testGetAlgoliaRecordDefault()
     {
-        $this->assertEquals(['id2' => 1, 'objectID' => 1], (new Model2())->getAlgoliaRecordDefault());
-        $this->assertEquals(['id2' => 1, 'objectID' => 1, 'id3' => 1, 'name' => 'test'], (new Model4())->getAlgoliaRecordDefault());
+        $this->assertEquals(['id2' => 1, 'objectID' => 1], (new Model2())->getAlgoliaRecordDefault('test'));
+        $this->assertEquals(['id2' => 1, 'objectID' => 1, 'id3' => 1, 'name' => 'test'], (new Model4())->getAlgoliaRecordDefault('test'));
     }
 
     public function testPushToindex()
@@ -40,7 +41,7 @@ public function testPushToindex()
 
         App::instance('\AlgoliaSearch\Laravel\ModelHelper', $modelHelper);
 
-        $index->shouldReceive('addObject')->times(2)->with((new Model4())->getAlgoliaRecordDefault());
+        $index->shouldReceive('addObject')->times(2)->with((new Model4())->getAlgoliaRecordDefault('test'));
 
         $this->assertEquals(null, (new Model4())->pushToIndex());
     }
@@ -119,6 +120,29 @@ public function testSetSynonyms()
         $this->assertEquals(null, $model10->setSettings());
     }
 
+    function testPustToIndexWithgetAlgoliaRecordAndIndexName() {
+        /** @var \AlgoliaSearch\Laravel\ModelHelper $realModelHelper */
+        $realModelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
+
+        $modelHelper = Mockery::mock('\AlgoliaSearch\Laravel\ModelHelper');
+
+        $realindices = $realModelHelper->getIndices(new Model11());
+        $realindex = $realindices[0];
+        $index = Mockery::mock('\AlgoliaSearch\Index');
+        $index->indexName = $realindex->indexName;
+
+        $modelHelper->shouldReceive('getIndices')->andReturn([$index]);
+        $modelHelper->shouldReceive('getObjectId')->andReturn($realModelHelper->getObjectId(new Model11()));
+        $modelHelper->shouldReceive('indexOnly')->andReturn(true);
+
+        App::instance('\AlgoliaSearch\Laravel\ModelHelper', $modelHelper);
+
+
+        $index->shouldReceive('addObject')->times(1)->with(["is" => "working", "objectID" => null]);
+
+        $this->assertEquals(null, (new Model11())->pushToIndex());
+    }
+
     public function tearDown()
     {
         Mockery::close();

tests/Models/Model11.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace AlgoliaSearch\Tests\Models;
+
+use AlgoliaSearch\Laravel\AlgoliaEloquentTrait;
+use Illuminate\Database\Eloquent\Model;
+
+class Model11 extends Model
+{
+    use AlgoliaEloquentTrait;
+
+    public function getAlgoliaRecord($indexName)
+    {
+        if ($indexName == 'model11s') {
+            return ["is" => "working"];
+        }
+        return ["is not" => "working"];
+    }
+}