Fix sort by rating

app/code/Magento/Catalog/Block/Product/ProductList/Toolbar.php

@@ -199,20 +199,39 @@ class Toolbar extends \Magento\Framework\View\Element\Template
                 )->addAttributeToSort('entity_id', $this->getCurrentDirection());
             }else if($this->getCurrentOrder() == 'rate') {
 
+                if ($this->getCurrentDirection() == 'desc') {
                  $this->_collection->getSelect()->joinLeft(
-                            'rating_option_vote_aggregated',
-                            'e.entity_id = rating_option_vote_aggregated.entity_pk_value',
-                            array('vote_count' => 'SUM(rating_option_vote_aggregated.vote_count)'))
+                            'review_entity_summary',
+                            'e.entity_id = review_entity_summary.entity_pk_value',
+                            array('vote_count' => 'AVG(review_entity_summary.rating_summary)'))
                     ->group('e.entity_id')
                     ->order('vote_count desc');
+                } else {
+                    $this->_collection->getSelect()->joinLeft(
+                            'review_entity_summary',
+                            'e.entity_id = review_entity_summary.entity_pk_value',
+                            array('vote_count' => 'AVG(review_entity_summary.rating_summary)'))
+                    ->group('e.entity_id')
+                    ->order('vote_count asc');
+                }
 
             }else if($this->getCurrentOrder() == 'popular') {
-                $this->_collection->getSelect()->joinLeft( 
-                    'sales_order_item', 
-                    'e.entity_id = sales_order_item.product_id', 
-                    array('qty_ordered'=>'SUM(sales_order_item.qty_ordered)')) 
-                ->group('e.entity_id') 
-                ->order('qty_ordered desc');
+
+                if ($this->getCurrentDirection() == 'desc') {
+                    $this->_collection->getSelect()->joinLeft( 
+                        'sales_order_item', 
+                        'e.entity_id = sales_order_item.product_id', 
+                        array('qty_ordered'=>'SUM(sales_order_item.qty_ordered)')) 
+                    ->group('e.entity_id') 
+                    ->order('qty_ordered desc');
+                } else {
+                    $this->_collection->getSelect()->joinLeft( 
+                        'sales_order_item', 
+                        'e.entity_id = sales_order_item.product_id', 
+                        array('qty_ordered'=>'SUM(sales_order_item.qty_ordered)')) 
+                    ->group('e.entity_id') 
+                    ->order('qty_ordered asc');
+                }
 
             }else{
                 $this->_collection->setOrder($this->getCurrentOrder(), $this->getCurrentDirection());