Fix autocompleteAction bug, address CR feedback

Fix bug in search autocompleteAction which was showing duplicate results
for actors under repositories. Also address some of the CR feedback and
update/add methods for add, update, and deleteById in the
arElasticSearchMultiIndexWrapper.

Author: anvit

apps/qubit/modules/search/actions/autocompleteAction.class.php

@@ -39,7 +39,6 @@ public function execute($request)
         $culture = $this->context->user->getCulture();
 
         $client = QubitSearch::getInstance()->client;
-        $indices = QubitSearch::getInstance()->index->getIndices();
 
         // Multisearch object
         $mSearch = new \Elastica\Multi\Search($client);
@@ -76,12 +75,8 @@ public function execute($request)
 
         foreach ($items as $item) {
             $search = new \Elastica\Search($client);
-            foreach ($indices as $type => $index) {
-                $elasticSearchTypeName = QubitSearch::getInstance()::ES_TYPE;
-
-                // This can be updated in ES 7.x when type params are optional
-                $search->addIndex($index)->addType($index->getType($elasticSearchTypeName));
-            }
+            $indexWrapper = QubitSearch::getInstance()->index;
+            $search->addIndex($indexWrapper->getIndex($item['type']));
 
             $query = new \Elastica\Query();
             $query->setSize(3)->setSource($item['fields']);

lib/QubitLftSyncer.class.php

@@ -92,7 +92,7 @@ private function repairEsChildrenLftValues()
         $results = QubitPdo::fetchAll($sql, $params, ['fetchMode' => PDO::FETCH_ASSOC]);
 
         $bulk = new Elastica\Bulk(QubitSearch::getInstance()->client);
-        $bulk->setIndex(QubitSearch::getInstance()->index->getIndex('QubitInformationObject')->getName());
+        $bulk->setIndex(QubitSearch::getInstance()->index->getIndex('QubitInformationObject'));
         $bulk->setType(QubitSearch::getInstance()::ES_TYPE);
 
         foreach ($results as $row) {

plugins/arElasticSearchPlugin/lib/arElasticSearchMultiIndexWrapper.class.php

@@ -22,6 +22,9 @@
  * and has methods that match signatures of pre ES 6.x methods that used a
  * single index with multiple types instead of multiple index with a single
  * type or no type.
+ * This class has an indices property which is an array of ElasticSearch
+ * indices in order to keep arElasticSearchPlugin's index property backwards
+ * compatible with custom themes.
  */
 class arElasticSearchMultiIndexWrapper
 {
@@ -54,6 +57,16 @@ public function deleteDocuments($name, $documents)
         $this->indices[$name]->deleteDocuments($documents);
     }
 
+    public function updateDocuments($name, $documents)
+    {
+        $this->indices[$name]->updateDocuments($documents);
+    }
+
+    public function deleteById($name, $documentId)
+    {
+        $this->indices[$name]->deleteById($documentId);
+    }
+
     public function refresh()
     {
         foreach ($this->indices as $index) {

plugins/arElasticSearchPlugin/lib/arElasticSearchPlugin.class.php

@@ -385,7 +385,7 @@ public function addDocument($data, $indexName)
                 $this->index->refresh();
             }
         } else {
-            $this->index->getIndex($indexName)->addDocuments([$document]);
+            $this->index->addDocuments($indexName, [$document]);
         }
     }
 
@@ -418,7 +418,7 @@ public function partialUpdate($object, $data)
         $document->setType(self::ES_TYPE);
 
         try {
-            $this->index->getIndex($indexName)->updateDocuments([$document]);
+            $this->index->updateDocuments($indexName, [$document]);
         } catch (\Elastica\Exception\NotFoundException $e) {
             // Create document if it's not found
             $this->update($object);
@@ -438,7 +438,7 @@ public function partialUpdateById(string $className, int $id, array $data)
         $document = new \Elastica\Document($id, $data);
 
         try {
-            $this->index->getIndex($className)->updateDocuments([$document]);
+            $this->index->updateDocuments($className, [$document]);
         } catch (\Elastica\Exception\ResponseException $e) {
             // Create document if none exists
             $modelPdoClassName = self::modelClassFromQubitObjectClass($className).'Pdo';
@@ -462,9 +462,8 @@ public function delete($object)
             return;
         }
 
+        $indexName = get_class($object);
         if ($this->batchMode) {
-            $indexName = get_class($object);
-
             if (!$this->currentBatchIndexName) {
                 $this->currentBatchIndexName = $indexName;
             }
@@ -491,7 +490,7 @@ public function delete($object)
             }
         } else {
             try {
-                $this->index->getIndex($indexName)->deleteById($object->id);
+                $this->index->deleteById($indexName, $object->id);
             } catch (\Elastica\Exception\NotFoundException $e) {
                 // Ignore
             }