MAGETWO-42676: Catalog Price Rules are not applied to product after edit the product

Author: Michael Logvin

app/code/Magento/CatalogRule/Model/Indexer/IndexBuilder.php

@@ -213,14 +213,16 @@ protected function cleanByIds($productIds)
     {
         $this->connection->deleteFromSelect(
             $this->connection
-                ->select($this->resource->getTableName('catalogrule_product'), 'product_id')
+                ->select()
+                ->from($this->resource->getTableName('catalogrule_product'), 'product_id')
                 ->distinct()
                 ->where('product_id IN (?)', $productIds),
             $this->resource->getTableName('catalogrule_product')
         );
 
         $this->connection->deleteFromSelect(
-            $this->connection->select($this->resource->getTableName('catalogrule_product_price'), 'product_id')
+            $this->connection->select()
+                ->from($this->resource->getTableName('catalogrule_product_price'), 'product_id')
                 ->distinct()
                 ->where('product_id IN (?)', $productIds),
             $this->resource->getTableName('catalogrule_product_price')
@@ -240,6 +242,10 @@ protected function applyRule(Rule $rule, $product)
         $productId = $product->getId();
         $websiteIds = array_intersect($product->getWebsiteIds(), $rule->getWebsiteIds());
 
+        if (!$rule->validate($product)) {
+            return $this;
+        }
+
         $this->connection->delete(
             $this->resource->getTableName('catalogrule_product'),
             [
@@ -248,14 +254,6 @@ protected function applyRule(Rule $rule, $product)
             ]
         );
 
-        if (!$rule->validate($product)) {
-            $this->connection->delete(
-                $this->resource->getTableName('catalogrule_product_price'),
-                [$this->connection->quoteInto('product_id = ?', $productId)]
-            );
-            return $this;
-        }
-
         $customerGroupIds = $rule->getCustomerGroupIds();
         $fromTime = strtotime($rule->getFromDate());
         $toTime = strtotime($rule->getToDate());