MAGETWO-60246: [Backport] - [Github]Magento 2.1.1 Problem with change currency #6746 - for 2.1.x

Author: dhorytskyi

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Aggregation/DataProvider.php

@@ -96,8 +96,7 @@ public function getDataSet(
             $currencyRate = $store->getCurrentCurrencyRate() ? : 1;
             $valueExpr = new \Zend_Db_Expr('main_table.min_price * ' . $currencyRate);
             $table = $this->resource->getTableName('catalog_product_index_price');
-            $select->from(['main_table' => $table], null)
-                ->columns([BucketInterface::FIELD_VALUE => $valueExpr])
+            $select->from(['main_table' => $table], [BucketInterface::FIELD_VALUE => $valueExpr])
                 ->where('main_table.customer_group_id = ?', $this->customerSession->getCustomerGroupId())
                 ->where('main_table.website_id = ?', $store->getWebsiteId());
         } else {
@@ -118,7 +117,7 @@ public function getDataSet(
                 ->where('stock_index.stock_status = ?', Stock::STOCK_IN_STOCK)
                 ->group(['main_table.entity_id', 'main_table.value']);
             $parentSelect = $this->getSelect();
-            $parentSelect->from(['main_table' => $subSelect], ['main_table.value']);
+            $parentSelect->from(['main_table' => $subSelect], [BucketInterface::FIELD_VALUE => 'main_table.value']);
             $select = $parentSelect;
         }
 

app/code/Magento/CatalogSearch/Model/Adapter/Mysql/Dynamic/DataProvider.php

@@ -133,7 +133,7 @@ public function getAggregation(
     ) {
         $select = $this->dataProvider->getDataSet($bucket, $dimensions, $entityStorage->getSource());
         $columns = array_column($select->getPart(Select::COLUMNS), 1, 2);
-        $valueColumn = (string) $columns['value'];
+        $valueColumn = (string) $columns[BucketInterface::FIELD_VALUE];
         $select->reset(Select::COLUMNS);
         $rangeExpr = new \Zend_Db_Expr(
             $this->connection->getIfNullSql(

app/code/Magento/CatalogSearch/Model/Layer/Filter/Price.php

@@ -158,8 +158,7 @@ public function getCurrencyRate()
     {
         $rate = $this->_getData('currency_rate');
         if ($rate === null) {
-            $rate = $this->_storeManager->getStore($this->getStoreId())
-                ->getCurrentCurrencyRate();
+            $rate = $this->_storeManager->getStore()->getCurrentCurrencyRate();
         }
         if (!$rate) {
             $rate = 1;

app/code/Magento/CatalogSearch/Test/Unit/Model/Layer/Filter/PriceTest.php

@@ -129,6 +129,18 @@ protected function setUp()
             ->method('escapeHtml')
             ->will($this->returnArgument(0));
 
+        $storeMock = $this->getMockBuilder(\Magento\Store\Api\Data\StoreInterface::class)
+            ->setMethods(['getCurrentCurrencyRate'])
+            ->getMockForAbstractClass();
+        $storeMock->expects($this->any())
+            ->method('getCurrentCurrencyRate')
+            ->willReturn(1);
+        $storeManagerMock = $this->getMockBuilder(\Magento\Store\Model\StoreManagerInterface::class)
+            ->getMockForAbstractClass();
+        $storeManagerMock->expects($this->any())
+            ->method('getStore')
+            ->willReturn($storeMock);
+
         $this->attribute = $this->getMockBuilder('\Magento\Eav\Model\Entity\Attribute')
             ->disableOriginalConstructor()
             ->setMethods(['getAttributeCode', 'getFrontend', 'getIsFilterable'])
@@ -142,6 +154,7 @@ protected function setUp()
                 'itemDataBuilder' => $this->itemDataBuilder,
                 'filterItemFactory' => $this->filterItemFactory,
                 'escaper' => $escaper,
+                'storeManager' => $storeManagerMock,
             ]
         );
     }