Update Conflicts

Author: mohitalgolia

Helper/Entity/ProductHelper.php

@@ -456,12 +456,14 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
 
         if ($this->configHelper->isInstantEnabled($storeId)) {
             $replicas = array_values(array_map(function ($sortingIndex) {
-                return [$sortingIndex['name'],$sortingIndex['virtualReplica']];
+                rreturn $sortingIndex['name'];
             }, $sortingIndices));
         }
 
         // Managing Virtual Replica
-        $replicas = $this->handleVirtualReplica($replicas, $indexName, $storeId);
+        if ($this->configHelper->useVirtualReplica($storeId)) {
+            $replicas = $this->handleVirtualReplica($replicas, $indexName);
+        }
 
         // Merge current replicas with sorting replicas to not delete A/B testing replica indices
         try {
@@ -480,23 +482,24 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
             $this->logger->log('Setting replicas to "' . $indexName . '" index.');
             $this->logger->log('Replicas: ' . json_encode($replicas));
             $setReplicasTaskId = $this->algoliaHelper->getLastTaskId();
-            foreach ($sortingIndices as $values) {
-                if ($values['virtualReplica']) {
+            if (!$this->configHelper->useVirtualReplica($storeId)) {
+                foreach ($sortingIndices as $values) {
+                    $replicaName = $values['name'];
+                    $indexSettings['ranking'] = $values['ranking'];
+                    $this->algoliaHelper->setSettings($replicaName, $indexSettings, false, true);
+                    $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
+                    $this->logger->log('Settings: ' . json_encode($indexSettings));
+                }
+            } else {
+                foreach ($sortingIndices as $values) {
                     $replicaName = $values['name'];
                     array_unshift($customRanking, $values['ranking'][0]);
                     $replicaSetting['customRanking'] = $customRanking;
                     $this->algoliaHelper->setSettings($replicaName, $replicaSetting, false, false);
                     $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
                     $this->logger->log('Settings: ' . json_encode($replicaSetting));
-                } else {
-                    $replicaName = $values['name'];
-                    $indexSettings['ranking'] = $values['ranking'];
-                    $this->algoliaHelper->setSettings($replicaName, $indexSettings, false, true);
-                    $this->logger->log('Setting settings to "' . $replicaName . '" replica.');
-                    $this->logger->log('Settings: ' . json_encode($indexSettings));
                 }
             }
-
         } else {
             $this->algoliaHelper->setSettings($indexName, ['replicas' => []]);
             $this->logger->log('Removing replicas from "' . $indexName . '" index');
@@ -1525,17 +1528,13 @@ public function productIsInStock($product, $storeId)
      * @param $replica
      * @return array
      */
-    public function handleVirtualReplica($replicas, $indexName, $storeId)
+    public function handleVirtualReplica($replicas, $indexName)
     {
         $virtualReplicaArray = [];
         foreach ($replicas as $replica) {
-            if ($replica[1]) {
-                $replicaArray[] = 'virtual(' . $replica[0] . ')';
-            } else {
-                $replicaArray[] = $replica[0];
-            }
+            $virtualReplicaArray[] = 'virtual(' . $replica . ')';
         }
-        return $replicaArray;
+        return $virtualReplicaArray;
     }
 
     /**
@@ -1553,14 +1552,12 @@ public function handlingReplica($indexName, $storeId, $sortingAttribute = false)
                 return $sortingIndex['name'];
             }, $sortingIndices));
             try {
-                $replicasFormated = $this->handleVirtualReplica($replicas);
-                $availableReplicaMatch = array_merge($replicasFormated, $replicas);
                 if ($this->configHelper->useVirtualReplica($storeId)) {
-                   $replicas = $replicasFormated;
+                   $replicas = $this->handleVirtualReplica($replicas, $indexName);
                 }
                 $currentSettings = $this->algoliaHelper->getSettings($indexName);
                 if (is_array($currentSettings) && array_key_exists('replicas', $currentSettings)) {
-                    $replicasRequired = array_values(array_diff($currentSettings['replicas'], $availableReplicaMatch));
+                    $replicasRequired = array_values(array_diff_assoc($currentSettings['replicas'], $replicas));
                     $this->algoliaHelper->setSettings($indexName, ['replicas' => $replicasRequired]);
                     $setReplicasTaskId = $this->algoliaHelper->getLastTaskId();
                     $this->algoliaHelper->waitLastTask($indexName, $setReplicasTaskId);
@@ -1579,4 +1576,4 @@ public function handlingReplica($indexName, $storeId, $sortingAttribute = false)
         }
         return true;
     }
-}
+}