Merge branch 'MAGETWO-63350' of github.com:magento-troll/magento2ce into MAGETWO-58456

Author: slopukhov

app/code/Magento/SalesRule/Model/ResourceModel/Rule.php

@@ -11,6 +11,8 @@
 use Magento\Rule\Model\ResourceModel\AbstractResource;
 use Magento\Framework\EntityManager\EntityManager;
 use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Framework\EntityManager\MetadataPool;
+use Magento\SalesRule\Api\Data\RuleInterface;
 
 /**
  * Sales Rule resource model
@@ -51,29 +53,37 @@ class Rule extends AbstractResource
      */
     protected $entityManager;
 
+    /**
+     * @var MetadataPool
+     */
+    private $metadataPool;
+
     /**
      * @param \Magento\Framework\Model\ResourceModel\Db\Context $context
      * @param \Magento\Framework\Stdlib\StringUtils $string
      * @param \Magento\SalesRule\Model\ResourceModel\Coupon $resourceCoupon
      * @param string $connectionName
      * @param \Magento\Framework\DataObject|null $associatedEntityMapInstance
      * @param Json $serializer Optional parameter for backward compatibility
+     * @param MetadataPool $metadataPool Optional parameter for backward compatibility
      */
     public function __construct(
         \Magento\Framework\Model\ResourceModel\Db\Context $context,
         \Magento\Framework\Stdlib\StringUtils $string,
         \Magento\SalesRule\Model\ResourceModel\Coupon $resourceCoupon,
         $connectionName = null,
         \Magento\Framework\DataObject $associatedEntityMapInstance = null,
-        Json $serializer = null
+        Json $serializer = null,
+        MetadataPool $metadataPool = null
     ) {
         $this->string = $string;
         $this->_resourceCoupon = $resourceCoupon;
         $associatedEntitiesMapInstance = $associatedEntityMapInstance ?: ObjectManager::getInstance()->get(
             \Magento\SalesRule\Model\ResourceModel\Rule\AssociatedEntityMap::class
         );
         $this->_associatedEntitiesMap = $associatedEntitiesMapInstance->getData();
-        $this->serializer = $serializer ?: \Magento\Framework\App\ObjectManager::getInstance()->get(Json::class);
+        $this->serializer = $serializer ?: ObjectManager::getInstance()->get(Json::class);
+        $this->metadataPool = $metadataPool ?: ObjectManager::getInstance()->get(MetadataPool::class);
         parent::__construct($context, $connectionName);
     }
 
@@ -305,7 +315,11 @@ public function getActiveAttributes()
     public function setActualProductAttributes($rule, $attributes)
     {
         $connection = $this->getConnection();
-        $connection->delete($this->getTable('salesrule_product_attribute'), ['rule_id=?' => $rule->getId()]);
+        $metadata = $this->metadataPool->getMetadata(RuleInterface::class);
+        $connection->delete(
+            $this->getTable('salesrule_product_attribute'),
+            [$metadata->getLinkField() . '=?' => $rule->getData($metadata->getLinkField())]
+        );
 
         //Getting attribute IDs for attribute codes
         $attributeIds = [];
@@ -327,7 +341,7 @@ public function setActualProductAttributes($rule, $attributes)
                 foreach ($rule->getWebsiteIds() as $websiteId) {
                     foreach ($attributeIds as $attribute) {
                         $data[] = [
-                            'rule_id' => $rule->getId(),
+                            $metadata->getLinkField() => $rule->getData($metadata->getLinkField()),
                             'website_id' => $websiteId,
                             'customer_group_id' => $customerGroupId,
                             'attribute_id' => $attribute,

app/code/Magento/SalesRule/Model/ResourceModel/Rule/Collection.php

@@ -282,6 +282,22 @@ public function _initSelect()
     public function addAttributeInConditionFilter($attributeCode)
     {
         $match = sprintf('%%%s%%', substr($this->serializer->serialize(['attribute' => $attributeCode]), 1, -1));
+        /**
+         * Information about conditions and actions stored in table as JSON encoded array
+         * in fields conditions_serialized and actions_serialized.
+         * If you want to find rules that contains some particular attribute, the easiest way to do so is serialize
+         * attribute code in the same way as it stored in the serialized columns and execute SQL search
+         * with like condition.
+         * Table
+         * +-------------------------------------------------------------------+
+         * |     conditions_serialized       |         actions_serialized      |
+         * +-------------------------------------------------------------------+
+         * | {..."attribute":"attr_name"...} | {..."attribute":"attr_name"...} |
+         * +---------------------------------|---------------------------------+
+         * From attribute code "attr_code", will be generated such SQL:
+         * `condition_serialized` LIKE '%"attribute":"attr_name"%'
+         *      OR `actions_serialized` LIKE '%"attribute":"attr_name"%'
+         */
         $field = $this->_getMappedField('conditions_serialized');
         $cCond = $this->_getConditionSql($field, ['like' => $match]);
         $field = $this->_getMappedField('actions_serialized');