Add optional index name to use when performing Elasticsearch operatio…

…ns (#27)
spatie · Dec 18, 2017 · f35b3c5 · f35b3c5
1 parent aac4ee5
commit f35b3c5
Showing 1 changed file with 26 additions and 9 deletions.
diff --git a/src/SearchIndexHandlers/Elasticsearch.php b/src/SearchIndexHandlers/Elasticsearch.php
@@ -43,8 +43,10 @@ public function setIndexName($indexName)
      *
      * @param Searchable|array|Traversable $subject
      */
-    public function upsertToIndex($subject)
+    public function upsertToIndex($subject, $indexName = null)
     {
+        $indexName = $this->resolveIndexName($indexName);
+
         if ($subject instanceof Searchable) {
             $subject = [$subject];
         }
@@ -56,13 +58,13 @@ public function upsertToIndex($subject)
                         throw new InvalidArgumentException();
                     }
                 })
-                ->flatMap(function ($item) {
+                ->flatMap(function ($item) use($indexName) {
                     return
                         [
                             [
                                 'index' => [
                                     '_id'    => $item->getSearchableId(),
-                                    '_index' => $this->indexName,
+                                    '_index' => $indexName,
                                     '_type'  => $item->getSearchableType(),
                                 ],
                             ],
@@ -87,11 +89,13 @@ public function upsertToIndex($subject)
      *
      * @param Searchable $subject
      */
-    public function removeFromIndex(Searchable $subject)
+    public function removeFromIndex(Searchable $subject, $indexName = null)
     {
+        $indexName = $this->resolveIndexName($indexName);
+
         $this->elasticsearch->delete(
             [
-                'index' => $this->indexName,
+                'index' => $indexName,
                 'type'  => $subject->getSearchableType(),
                 'id'    => $subject->getSearchableId(),
             ]
@@ -104,11 +108,13 @@ public function removeFromIndex(Searchable $subject)
      * @param string $type
      * @param int    $id
      */
-    public function removeFromIndexByTypeAndId($type, $id)
+    public function removeFromIndexByTypeAndId($type, $id, $indexName = null)
     {
+        $indexName = $this->resolveIndexName($indexName);
+
         $this->elasticsearch->delete(
             [
-                'index' => $this->indexName,
+                'index' => $indexName,
                 'type'  => $type,
                 'id'    => $id,
             ]
@@ -120,9 +126,11 @@ public function removeFromIndexByTypeAndId($type, $id)
      *
      * @return mixed
      */
-    public function clearIndex()
+    public function clearIndex($indexName = null)
     {
-        $this->elasticsearch->indices()->delete(['index' => $this->indexName]);
+        $indexName = $this->resolveIndexName($indexName);
+
+        $this->elasticsearch->indices()->delete(['index' => $indexName]);
     }
 
     /**
@@ -146,4 +154,13 @@ public function getClient()
     {
         return $this->elasticsearch;
     }
+
+    protected function resolveIndexName($indexName = null)
+    {
+        if (!$indexName) {
+            $indexName = $this->indexName;
+        }
+
+        return $indexName;
+    }
 }