Skip to content
This repository was archived by the owner on Jul 31, 2018. It is now read-only.

Commit aa8ddf2

Browse files
author
Jan Petr
committed
Merge pull request #64 from algolia/set_settings_on_reindex
Fix setSettings on reindex
2 parents abb3fdb + a7b11eb commit aa8ddf2

File tree

1 file changed

+15
-3
lines changed

1 file changed

+15
-3
lines changed

src/AlgoliaEloquentTrait.php

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,21 @@ trait AlgoliaEloquentTrait
1515
* Static calls.
1616
*
1717
* @param bool $safe
18+
* @param bool $setSettings
1819
*/
19-
public function _reindex($safe = true)
20+
public function _reindex($safe = true, $setSettings = true)
2021
{
2122
/** @var \AlgoliaSearch\Laravel\ModelHelper $modelHelper */
2223
$modelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
2324

2425
$indices = $modelHelper->getIndices($this);
2526
$indicesTmp = $safe ? $modelHelper->getIndicesTmp($this) : $indices;
2627

28+
if ($setSettings === true) {
29+
$setToTmpIndices = ($safe === true);
30+
$this->_setSettings($setToTmpIndices);
31+
}
32+
2733
static::chunk(100, function ($models) use ($indicesTmp, $modelHelper) {
2834
/** @var \AlgoliaSearch\Index $index */
2935
foreach ($indicesTmp as $index) {
@@ -136,13 +142,19 @@ public function _search($query, $parameters = [])
136142
return $result;
137143
}
138144

139-
public function _setSettings()
145+
public function _setSettings($setToTmpIndices = false)
140146
{
141147
/** @var \AlgoliaSearch\Laravel\ModelHelper $modelHelper */
142148
$modelHelper = App::make('\AlgoliaSearch\Laravel\ModelHelper');
143149

144150
$settings = $modelHelper->getSettings($this);
145-
$indices = $modelHelper->getIndices($this);
151+
152+
if ($setToTmpIndices === false) {
153+
$indices = $modelHelper->getIndices($this);
154+
}
155+
else {
156+
$indices = $modelHelper->getIndicesTmp($this);
157+
}
146158

147159
$slaves_settings = $modelHelper->getSlavesSettings($this);
148160
$slaves = isset($settings['slaves']) ? $settings['slaves'] : [];

0 commit comments

Comments
 (0)