MAGETWO-94306: Fixing issue with getSize function not recalculating after adding filters

Author: Mastiuhin Olexandr

app/code/Magento/Eav/Model/Entity/Collection/AbstractCollection.php

@@ -379,6 +379,7 @@ public function addAttributeToFilter($attribute, $condition = null, $joinType =
 
         if (!empty($conditionSql)) {
             $this->getSelect()->where($conditionSql, null, \Magento\Framework\DB\Select::TYPE_CONDITION);
+            $this->invalidateSize();
         } else {
             throw new \Magento\Framework\Exception\LocalizedException(
                 __('Invalid attribute identifier for filter (%1)', get_class($attribute))
@@ -1699,4 +1700,16 @@ public function removeAllFieldsFromSelect()
     {
         return $this->removeAttributeToSelect();
     }
+
+    /**
+     * Invalidates "Total Records Count".
+     * Invalidates saved "Total Records Count" attribute with last counting,
+     * so a next calling of method getSize() will query new total records count.
+     *
+     * @return void
+     */
+    private function invalidateSize(): void
+    {
+        $this->_totalRecords = null;
+    }
 }

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

@@ -187,4 +187,15 @@ public function testJoinTable()
 
         self::assertContains($expected, str_replace(PHP_EOL, '', $sql));
     }
+
+    /**
+     * @magentoDataFixture Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php
+     * @magentoDbIsolation enabled
+     */
+    public function testAddAttributeToFilterAffectsGetSize(): void
+    {
+        $this->assertEquals(10, $this->collection->getSize());
+        $this->collection->addAttributeToFilter('sku', 'Product1');
+        $this->assertEquals(1, $this->collection->getSize());
+    }
 }

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products.php

@@ -0,0 +1,36 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Model\ProductFactory;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+
+/** @var Magento\Framework\ObjectManagerInterface $objcetManager */
+$objectManager = Bootstrap::getObjectManager();
+
+/** @var ProductFactory $productFactory */
+$productFactory = $objectManager->create(ProductFactory::class);
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = $objectManager->create(ProductRepositoryInterface::class);
+
+// Create 10 products (with change this variable, don't forget to change the same in rollback)
+$productsAmount = 10;
+
+for ($i = 1; $i <= $productsAmount; $i++) {
+    $productArray = [
+        'data' => [
+            'name' => "Product{$i}",
+            'sku' => "Product{$i}",
+            'price' => 100,
+            'attribute_set_id' => 4,
+            'website_ids' => [1]
+        ]
+    ];
+    
+    $productRepository->save($productFactory->create($productArray));
+}

dev/tests/integration/testsuite/Magento/Catalog/Model/ResourceModel/_files/few_simple_products_rollback.php

@@ -0,0 +1,28 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+use Magento\TestFramework\Helper\Bootstrap;
+use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Framework\Exception\NoSuchEntityException;
+
+/** @var ProductRepositoryInterface $productRepository */
+$productRepository = Bootstrap::getObjectManager()
+    ->get(ProductRepositoryInterface::class);
+
+/**
+ * Delete 10 products
+ */
+$productsAmount = 10;
+
+try {
+    for ($i = 1; $i <= $productsAmount; $i++) {
+        /** @var \Magento\Catalog\Model\Product $product */
+        $product = $productRepository->get("Product{$i}", false, null, true);
+        $productRepository->delete($product);
+    }
+} catch (NoSuchEntityException $e) {
+}

lib/internal/Magento/Framework/Data/Collection/AbstractDb.php

@@ -219,7 +219,7 @@ public function getSize()
             $sql = $this->getSelectCountSql();
             $this->_totalRecords = $this->getConnection()->fetchOne($sql, $this->_bindParams);
         }
-        return intval($this->_totalRecords);
+        return (int)$this->_totalRecords;
     }
 
     /**