Merge branch 'MAGETWO-77754' of github.com:magento-tango/magento2ce into 2.2-PR-part-3

Author: Oleksandr Iegorov

app/code/Magento/Rule/Model/Condition/Sql/Builder.php

@@ -6,9 +6,14 @@
 
 namespace Magento\Rule\Model\Condition\Sql;
 
+use Magento\Framework\App\ObjectManager;
 use Magento\Framework\DB\Select;
+use Magento\Framework\Exception\NoSuchEntityException;
 use Magento\Rule\Model\Condition\AbstractCondition;
 use Magento\Rule\Model\Condition\Combine;
+use Magento\Eav\Api\AttributeRepositoryInterface;
+use Magento\Catalog\Model\Product;
+use Magento\Eav\Model\Entity\Collection\AbstractCollection;
 
 /**
  * Class SQL Builder
@@ -41,12 +46,22 @@ class Builder
      */
     protected $_expressionFactory;
 
+    /**
+     * @var AttributeRepositoryInterface
+     */
+    private $attributeRepository;
+
     /**
      * @param ExpressionFactory $expressionFactory
+     * @param AttributeRepositoryInterface|null $attributeRepository
      */
-    public function __construct(ExpressionFactory $expressionFactory)
-    {
+    public function __construct(
+        ExpressionFactory $expressionFactory,
+        AttributeRepositoryInterface $attributeRepository = null
+    ) {
         $this->_expressionFactory = $expressionFactory;
+        $this->attributeRepository = $attributeRepository ?:
+            ObjectManager::getInstance()->get(AttributeRepositoryInterface::class);
     }
 
     /**
@@ -88,12 +103,12 @@ protected function _getChildCombineTablesToJoin(Combine $combine, $tables = [])
     /**
      * Join tables from conditions combination to collection
      *
-     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param AbstractCollection $collection
      * @param Combine $combine
      * @return $this
      */
     protected function _joinTablesToCollection(
-        \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection,
+        AbstractCollection $collection,
         Combine $combine
     ) {
         foreach ($this->_getCombineTablesToJoin($combine) as $alias => $joinTable) {
@@ -112,10 +127,11 @@ protected function _joinTablesToCollection(
      *
      * @param AbstractCondition $condition
      * @param string $value
+     * @param bool $isDefaultStoreUsed
      * @return string
      * @throws \Magento\Framework\Exception\LocalizedException
      */
-    protected function _getMappedSqlCondition(AbstractCondition $condition, $value = '')
+    protected function _getMappedSqlCondition(AbstractCondition $condition, $value = '', $isDefaultStoreUsed = true)
     {
         $argument = $condition->getMappedSqlField();
 
@@ -130,9 +146,16 @@ protected function _getMappedSqlCondition(AbstractCondition $condition, $value =
             throw new \Magento\Framework\Exception\LocalizedException(__('Unknown condition operator'));
         }
 
+        $defaultValue = 0;
+        // Check if attribute has a table with default value and add it to the query
+        if ($this->canAttributeHaveDefaultValue($condition->getAttribute(), $isDefaultStoreUsed)) {
+            $defaultField = 'at_' . $condition->getAttribute() . '_default.value';
+            $defaultValue = $this->_connection->quoteIdentifier($defaultField);
+        }
+
         $sql = str_replace(
             ':field',
-            $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), 0),
+            $this->_connection->getIfNullSql($this->_connection->quoteIdentifier($argument), $defaultValue),
             $this->_conditionOperatorMap[$conditionOperator]
         );
 
@@ -144,10 +167,11 @@ protected function _getMappedSqlCondition(AbstractCondition $condition, $value =
     /**
      * @param Combine $combine
      * @param string $value
+     * @param bool $isDefaultStoreUsed
      * @return string
      * @SuppressWarnings(PHPMD.NPathComplexity)
      */
-    protected function _getMappedSqlCombination(Combine $combine, $value = '')
+    protected function _getMappedSqlCombination(Combine $combine, $value = '', $isDefaultStoreUsed = true)
     {
         $out = (!empty($value) ? $value : '');
         $value = ($combine->getValue() ? '' : ' NOT ');
@@ -158,9 +182,9 @@ protected function _getMappedSqlCombination(Combine $combine, $value = '')
             $con = ($getAggregator == 'any' ? Select::SQL_OR : Select::SQL_AND);
             $con = (isset($conditions[$key+1]) ? $con : '');
             if ($condition instanceof Combine) {
-                $out .= $this->_getMappedSqlCombination($condition, $value);
+                $out .= $this->_getMappedSqlCombination($condition, $value, $isDefaultStoreUsed);
             } else {
-                $out .= $this->_getMappedSqlCondition($condition, $value);
+                $out .= $this->_getMappedSqlCondition($condition, $value, $isDefaultStoreUsed);
             }
             $out .=  $out ? (' ' . $con) : '';
         }
@@ -170,21 +194,55 @@ protected function _getMappedSqlCombination(Combine $combine, $value = '')
     /**
      * Attach conditions filter to collection
      *
-     * @param \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection
+     * @param AbstractCollection $collection
      * @param Combine $combine
-     *
      * @return void
      */
     public function attachConditionToCollection(
-        \Magento\Eav\Model\Entity\Collection\AbstractCollection $collection,
+        AbstractCollection $collection,
         Combine $combine
     ) {
         $this->_connection = $collection->getResource()->getConnection();
         $this->_joinTablesToCollection($collection, $combine);
-        $whereExpression = (string)$this->_getMappedSqlCombination($combine);
+        $isDefaultStoreUsed = $this->checkIsDefaultStoreUsed($collection);
+        $whereExpression = (string)$this->_getMappedSqlCombination($combine, '', $isDefaultStoreUsed);
         if (!empty($whereExpression)) {
             // Select ::where method adds braces even on empty expression
             $collection->getSelect()->where($whereExpression);
         }
     }
+
+    /**
+     * Check is default store used
+     *
+     * @param AbstractCollection $collection
+     * @return bool
+     */
+    private function checkIsDefaultStoreUsed(AbstractCollection $collection): bool
+    {
+        return (int)$collection->getStoreId() === (int)$collection->getDefaultStoreId();
+    }
+
+    /**
+     * Check if attribute can have default value
+     *
+     * @param string $attributeCode
+     * @param bool $isDefaultStoreUsed
+     * @return bool
+     */
+    private function canAttributeHaveDefaultValue(string $attributeCode, bool $isDefaultStoreUsed): bool
+    {
+        if ($isDefaultStoreUsed) {
+            return false;
+        }
+
+        try {
+            $attribute = $this->attributeRepository->get(Product::ENTITY, $attributeCode);
+        } catch (NoSuchEntityException $e) {
+            // It's not exceptional case as we want to check if we have such attribute or not
+            return false;
+        }
+
+        return !$attribute->isScopeGlobal();
+    }
 }

app/code/Magento/Rule/Test/Unit/Model/Condition/Sql/BuilderTest.php

@@ -35,7 +35,12 @@ public function testAttachConditionToCollection()
     {
         $collection = $this->createPartialMock(
             \Magento\Eav\Model\Entity\Collection\AbstractCollection::class,
-            ['getResource', 'getSelect']
+            [
+                'getResource',
+                'getSelect',
+                'getStoreId',
+                'getDefaultStoreId',
+            ]
         );
         $combine = $this->createPartialMock(\Magento\Rule\Model\Condition\Combine::class, ['getConditions']);
         $resource = $this->createPartialMock(\Magento\Framework\DB\Adapter\Pdo\Mysql::class, ['getConnection']);
@@ -53,10 +58,15 @@ public function testAttachConditionToCollection()
         $collection->expects($this->once())
             ->method('getResource')
             ->will($this->returnValue($resource));
-
         $collection->expects($this->any())
             ->method('getSelect')
             ->will($this->returnValue($select));
+        $collection->expects($this->once())
+            ->method('getStoreId')
+            ->willReturn(1);
+        $collection->expects($this->once())
+            ->method('getDefaultStoreId')
+            ->willReturn(1);
 
         $resource->expects($this->once())
             ->method('getConnection')

dev/tests/integration/testsuite/Magento/Rule/Model/Condition/Sql/BuilderTest.php

@@ -7,49 +7,49 @@
 namespace Magento\Rule\Model\Condition\Sql;
 
 use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory as ProductCollectionFactory;
+use Magento\CatalogWidget\Model\RuleFactory;
+use Magento\CatalogWidget\Model\Rule\Condition\Combine as CombineCondition;
+use Magento\CatalogWidget\Model\Rule\Condition\Product as ProductCondition;
 
 class BuilderTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Rule\Model\Condition\Sql\Builder
+     * @var Builder
      */
     private $model;
 
     protected function setUp()
     {
-        $this->model = Bootstrap::getObjectManager()->create(\Magento\Rule\Model\Condition\Sql\Builder::class);
+        $this->model = Bootstrap::getObjectManager()->create(Builder::class);
     }
 
     public function testAttachConditionToCollection()
     {
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory $collectionFactory */
-        $collectionFactory = Bootstrap::getObjectManager()->create(
-            \Magento\Catalog\Model\ResourceModel\Product\CollectionFactory::class
-        );
-        /** @var \Magento\Catalog\Model\ResourceModel\Product\Collection $collection */
+        /** @var ProductCollectionFactory $collectionFactory */
+        $collectionFactory = Bootstrap::getObjectManager()->create(ProductCollectionFactory::class);
         $collection = $collectionFactory->create();
 
-        /** @var \Magento\CatalogWidget\Model\RuleFactory $ruleFactory */
-        $ruleFactory = Bootstrap::getObjectManager()->create(\Magento\CatalogWidget\Model\RuleFactory::class);
-        /** @var \Magento\CatalogWidget\Model\Rule $rule */
+        /** @var RuleFactory $ruleFactory */
+        $ruleFactory = Bootstrap::getObjectManager()->create(RuleFactory::class);
         $rule = $ruleFactory->create();
 
         $ruleConditionArray = [
             'conditions' => [
                 '1' => [
-                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Combine::class,
+                    'type' => CombineCondition::class,
                     'aggregator' => 'all',
                     'value' => '1',
                     'new_child' => ''
                 ],
                 '1--1' => [
-                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+                    'type' => ProductCondition::class,
                     'attribute' => 'category_ids',
                     'operator' => '==',
                     'value' => '3'
                 ],
                 '1--2' => [
-                    'type' => \Magento\CatalogWidget\Model\Rule\Condition\Product::class,
+                    'type' => ProductCondition::class,
                     'attribute' => 'special_to_date',
                     'operator' => '==',
                     'value' => '2017-09-15'
@@ -60,7 +60,7 @@ public function testAttachConditionToCollection()
         $rule->loadPost($ruleConditionArray);
         $this->model->attachConditionToCollection($collection, $rule->getConditions());
 
-        $whereString = 'WHERE (category_id IN (\'3\')))) AND(IFNULL(`e`.`entity_id`, 0) = \'2017-09-15\') ))';
-        $this->assertNotFalse(strpos($collection->getSelectSql(true), $whereString));
+        $whereString = "/\(category_id IN \('3'\).+\(IFNULL\(`e`\.`entity_id`,.+\) = '2017-09-15'\)/";
+        $this->assertNotFalse(preg_match($whereString, $collection->getSelectSql(true)));
     }
 }