MAGETWO-96129: [2.3.x] Smart Category with tier price conditions

Author: yelahin-serhiy

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -1550,6 +1550,7 @@ public function addPriceData($customerGroupId = null, $websiteId = null)
      * @param string $joinType
      * @return $this
      * @SuppressWarnings(PHPMD.CyclomaticComplexity)
+     * @SuppressWarnings(PHPMD.NPathComplexity)
      */
     public function addAttributeToFilter($attribute, $condition = null, $joinType = 'inner')
     {
@@ -1601,6 +1602,34 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
                 }
             }
 
+            return $this;
+        } elseif (is_string($attribute) && $attribute == 'tier_price') {
+            $attrCode = $attribute;
+            $connection = $this->getConnection();
+            $attrTable = $this->_getAttributeTableAlias($attrCode);
+            $entity = $this->getEntity();
+            $fKey = 'e.' . $this->getEntityPkName($entity);
+            $pKey = $attrTable . '.' . $this->getEntityPkName($entity);
+            $attribute = $entity->getAttribute($attrCode);
+            $attrFieldName = $attrTable . '.value';
+            $fKey = $connection->quoteColumnAs($fKey, null);
+            $pKey = $connection->quoteColumnAs($pKey, null);
+
+            $condArr = ["{$pKey} = {$fKey}"];
+            $joinMethod = 'join';
+            $this->getSelect()->{$joinMethod}(
+                [$attrTable => $this->getTable('catalog_product_entity_tier_price')],
+                '(' . implode(') AND (', $condArr) . ')',
+                [$attrCode => $attrFieldName]
+            );
+            $this->removeAttributeToSelect($attrCode);
+            $this->_filterAttributes[$attrCode] = $attribute->getId();
+            $this->_joinFields[$attrCode] = ['table' => '', 'field' => $attrFieldName];
+            $field = $this->_getAttributeTableAlias($attrCode) . '.value';
+            $conditionSql = $this->_getConditionSql($field, $condition);
+            $this->getSelect()->where($conditionSql, null, Select::TYPE_CONDITION);
+            $this->_totalRecords = null;
+
             return $this;
         } else {
             return parent::addAttributeToFilter($attribute, $condition, $joinType);

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/Product/CollectionTest.php

@@ -5,6 +5,9 @@
  */
 namespace Magento\Catalog\Model\ResourceModel\Product;
 
+/**
+ * Collection test
+ */
 class CollectionTest extends \PHPUnit\Framework\TestCase
 {
     /**
@@ -181,6 +184,7 @@ public function testJoinTable()
         $productTable = $this->collection->getTable('catalog_product_entity');
         $urlRewriteTable = $this->collection->getTable('url_rewrite');
 
+        // phpcs:ignore
         $expected = 'SELECT `e`.*, `alias`.`request_path` FROM `' . $productTable . '` AS `e`'
             . ' LEFT JOIN `' . $urlRewriteTable . '` AS `alias` ON (alias.entity_id =e.entity_id)'
             . ' AND (alias.entity_type = \'product\')';
@@ -198,4 +202,17 @@ public function testAddAttributeToFilterAffectsGetSize(): void
         $this->collection->addAttributeToFilter('sku', 'Product1');
         $this->assertEquals(1, $this->collection->getSize());
     }
+
+    /**
+     * Add tier price attribute filter to collection
+     *
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/product_simple.php
+     */
+    public function testAddAttributeTierPriceToFilter(): void
+    {
+        $this->assertEquals(11, $this->collection->getSize());
+        $this->collection->addAttributeToFilter('tier_price', ['gt' => 0]);
+        $this->assertEquals(1, $this->collection->getSize());
+    }
 }