Merge pull request #1444 from algolia/bugfix/MAGE-797

Duplicate Replica Issue one set is standard and another is virtual

Author: mohitalgolia

Helper/Entity/ProductHelper.php

@@ -463,7 +463,7 @@ public function setSettings($indexName, $indexNameTmp, $storeId, $saveToTmpIndic
 
         // Managing Virtual Replica
         if ($this->configHelper->useVirtualReplica($storeId)) {
-            $replicas = $this->handleVirtualReplica($replicas, $indexName);
+            $replicas = $this->handleVirtualReplica($replicas);
         }
 
         // Merge current replicas with sorting replicas to not delete A/B testing replica indices
@@ -1534,7 +1534,7 @@ public function productIsInStock($product, $storeId)
      * @param $replica
      * @return array
      */
-    public function handleVirtualReplica($replicas, $indexName)
+    public function handleVirtualReplica($replicas)
     {
         $virtualReplicaArray = [];
         foreach ($replicas as $replica) {
@@ -1558,12 +1558,14 @@ 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 = $this->handleVirtualReplica($replicas, $indexName);
+                   $replicas = $replicasFormated;
                 }
                 $currentSettings = $this->algoliaHelper->getSettings($indexName);
                 if (is_array($currentSettings) && array_key_exists('replicas', $currentSettings)) {
-                    $replicasRequired = array_values(array_diff_assoc($currentSettings['replicas'], $replicas));
+                    $replicasRequired = array_values(array_diff($currentSettings['replicas'], $availableReplicaMatch));
                     $this->algoliaHelper->setSettings($indexName, ['replicas' => $replicasRequired]);
                     $setReplicasTaskId = $this->algoliaHelper->getLastTaskId();
                     $this->algoliaHelper->waitLastTask($indexName, $setReplicasTaskId);

Model/Backend/Sorts.php

@@ -74,10 +74,12 @@ public function afterSave()
         if ($this->isValueChanged()) {
             try{
                 $oldValue = $this->serializer->unserialize($this->getOldValue());
+                $updatedValue = $this->serializer->unserialize($this->getValue());
+                $sortingAttributes = array_merge($oldValue, $updatedValue);
                 $storeIds = array_keys($this->storeManager->getStores());
                 foreach ($storeIds as $storeId) {
                     $indexName = $this->helper->getIndexName($this->productHelper->getIndexNameSuffix(), $storeId);
-                    $this->productHelper->handlingReplica($indexName, $storeId, $oldValue);
+                    $this->productHelper->handlingReplica($indexName, $storeId, $sortingAttributes);
                 }
             } catch (AlgoliaException $e) {
                 if ($e->getCode() !== 404) {