MC-10971: [Magento Cloud] - Unable to Scope Catalog Price rules by custom product attribute

- Added possibility to use 'is undefined' filter in rule conditions;

Author: Alexey Yakimovich

app/code/Magento/Catalog/Model/Api/SearchCriteria/CollectionProcessor/ConditionProcessor/ConditionBuilder/EavAttributeCondition.php

@@ -58,22 +58,38 @@ public function build(Filter $filter): string
         $conditionValue = $this->mapConditionValue($conditionType, $filter->getValue());
 
         // NOTE: store scope was ignored intentionally to perform search across all stores
-        $attributeSelect = $this->resourceConnection->getConnection()
-            ->select()
-            ->from(
-                [$tableAlias => $attribute->getBackendTable()],
-                $tableAlias . '.' . $attribute->getEntityIdField()
-            )->where(
-                $this->resourceConnection->getConnection()->prepareSqlCondition(
-                    $tableAlias . '.' . $attribute->getIdFieldName(),
-                    ['eq' => $attribute->getAttributeId()]
-                )
-            )->where(
-                $this->resourceConnection->getConnection()->prepareSqlCondition(
-                    $tableAlias . '.value',
-                    [$conditionType => $conditionValue]
-                )
-            );
+        if ($conditionType == 'is_null') {
+            $entityResourceModel = $attribute->getEntity();
+            $attributeSelect = $this->resourceConnection->getConnection()
+                ->select()
+                ->from(
+                    [Collection::MAIN_TABLE_ALIAS => $entityResourceModel->getEntityTable()],
+                    Collection::MAIN_TABLE_ALIAS . '.' . $entityResourceModel->getEntityIdField()
+                )->joinLeft(
+                    [$tableAlias => $attribute->getBackendTable()],
+                    $tableAlias . '.' . $attribute->getEntityIdField() . '=' . Collection::MAIN_TABLE_ALIAS .
+                    '.' . $entityResourceModel->getEntityIdField() . ' AND ' . $tableAlias . '.' .
+                    $attribute->getIdFieldName() . '=' . $attribute->getAttributeId(),
+                    ''
+                )->where($tableAlias . '.value is null');
+        } else {
+            $attributeSelect = $this->resourceConnection->getConnection()
+                ->select()
+                ->from(
+                    [$tableAlias => $attribute->getBackendTable()],
+                    $tableAlias . '.' . $attribute->getEntityIdField()
+                )->where(
+                    $this->resourceConnection->getConnection()->prepareSqlCondition(
+                        $tableAlias . '.' . $attribute->getIdFieldName(),
+                        ['eq' => $attribute->getAttributeId()]
+                    )
+                )->where(
+                    $this->resourceConnection->getConnection()->prepareSqlCondition(
+                        $tableAlias . '.value',
+                        [$conditionType => $conditionValue]
+                    )
+                );
+        }
 
         return $this->resourceConnection
             ->getConnection()
@@ -86,6 +102,8 @@ public function build(Filter $filter): string
     }
 
     /**
+     * Get attribute entity by its code
+     *
      * @param string $field
      * @return Attribute
      * @throws \Magento\Framework\Exception\LocalizedException

app/code/Magento/CatalogRule/Model/Rule/Condition/ConditionsToSearchCriteriaMapper.php

@@ -71,6 +71,8 @@ public function mapConditionsToSearchCriteria(CombinedCondition $conditions): Se
     }
 
     /**
+     * Convert condition to filter group
+     *
      * @param ConditionInterface $condition
      * @return null|\Magento\Framework\Api\CombinedFilterGroup|\Magento\Framework\Api\Filter
      * @throws InputException
@@ -89,6 +91,8 @@ private function mapConditionToFilterGroup(ConditionInterface $condition)
     }
 
     /**
+     * Convert combined condition to filter group
+     *
      * @param Combine $combinedCondition
      * @return null|\Magento\Framework\Api\CombinedFilterGroup
      * @throws InputException
@@ -121,6 +125,8 @@ private function mapCombinedConditionToFilterGroup(CombinedCondition $combinedCo
     }
 
     /**
+     * Convert simple condition to filter group
+     *
      * @param ConditionInterface $productCondition
      * @return FilterGroup|Filter
      * @throws InputException
@@ -139,6 +145,8 @@ private function mapSimpleConditionToFilterGroup(ConditionInterface $productCond
     }
 
     /**
+     * Convert simple condition with array value to filter group
+     *
      * @param ConditionInterface $productCondition
      * @return FilterGroup
      * @throws InputException
@@ -161,6 +169,8 @@ private function processSimpleConditionWithArrayValue(ConditionInterface $produc
     }
 
     /**
+     * Get glue for multiple values by operator
+     *
      * @param string $operator
      * @return string
      */
@@ -211,6 +221,8 @@ private function reverseSqlOperatorInFilter(Filter $filter)
     }
 
     /**
+     * Convert filters array into combined filter group
+     *
      * @param array $filters
      * @param string $combinationMode
      * @return FilterGroup
@@ -227,6 +239,8 @@ private function createCombinedFilterGroup(array $filters, string $combinationMo
     }
 
     /**
+     * Creating of filter object by filtering params
+     *
      * @param string $field
      * @param string $value
      * @param string $conditionType
@@ -264,6 +278,7 @@ private function mapRuleOperatorToSQLCondition(string $ruleOperator): string
             '!{}' => 'nlike', // does not contains
             '()' => 'in',    // is one of
             '!()' => 'nin',   // is not one of
+            '<=>' => 'is_null'
         ];
 
         if (!array_key_exists($ruleOperator, $operatorsMap)) {

app/code/Magento/CatalogRule/Model/Rule/Condition/Product.php

@@ -4,12 +4,11 @@
  * See COPYING.txt for license details.
  */
 
-/**
- * Catalog Rule Product Condition data model
- */
 namespace Magento\CatalogRule\Model\Rule\Condition;
 
 /**
+ * Catalog Rule Product Condition data model
+ *
  * @method string getAttribute() Returns attribute code
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
@@ -29,6 +28,9 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
 
         $oldAttrValue = $model->getData($attrCode);
         if ($oldAttrValue === null) {
+            if ($this->getOperator() === '<=>') {
+                return true;
+            }
             return false;
         }
 

app/code/Magento/Rule/Model/Condition/AbstractCondition.php

@@ -106,8 +106,8 @@ public function getDefaultOperatorInputByType()
                 'string' => ['==', '!=', '>=', '>', '<=', '<', '{}', '!{}', '()', '!()'],
                 'numeric' => ['==', '!=', '>=', '>', '<=', '<', '()', '!()'],
                 'date' => ['==', '>=', '<='],
-                'select' => ['==', '!='],
-                'boolean' => ['==', '!='],
+                'select' => ['==', '!=', '<=>'],
+                'boolean' => ['==', '!=', '<=>'],
                 'multiselect' => ['{}', '!{}', '()', '!()'],
                 'grid' => ['()', '!()'],
             ];
@@ -137,6 +137,7 @@ public function getDefaultOperatorOptions()
                 '!{}' => __('does not contain'),
                 '()' => __('is one of'),
                 '!()' => __('is not one of'),
+                '<=>' => __('is undefined'),
             ];
         }
         return $this->_defaultOperatorOptions;

app/code/Magento/Rule/view/adminhtml/web/rules.js

@@ -101,6 +101,9 @@ define([
 
                     if (!elem.multiple) {
                         Event.observe(elem, 'change', this.hideParamInputField.bind(this, container));
+
+                        this.changeVisibilityForValueRuleParam(elem);
+
                     }
                     Event.observe(elem, 'blur', this.hideParamInputField.bind(this, container));
                 }
@@ -262,6 +265,8 @@ define([
                     label.innerHTML = str != '' ? str : '...';
                 }
 
+                this.changeVisibilityForValueRuleParam(elem);
+
                 elem = Element.down(container, 'input.input-text');
 
                 if (elem) {
@@ -293,6 +298,23 @@ define([
             this.shownElement = null;
         },
 
+        changeVisibilityForValueRuleParam: function(elem) {
+            let parsedElementId = elem.id.split('__');
+            if (parsedElementId[2] != 'operator') {
+                return false;
+            }
+
+            let valueElement = jQuery('#' + parsedElementId[0] + '__' + parsedElementId[1] + '__value');
+
+            if(elem.value == '<=>') {
+                valueElement.closest('.rule-param').hide();
+            } else {
+                valueElement.closest('.rule-param').show();
+            }
+
+            return true;
+        },
+
         addRuleNewChild: function (elem) {
             var parent_id = elem.id.replace(/^.*__(.*)__.*$/, '$1');
             var children_ul_id = elem.id.replace(/__/g, ':').replace(/[^:]*$/, 'children').replace(/:/g, '__');