MAGETWO-51716: [Performance Bug] Build all layered nav filters on every search query regardless of result set

- fix integration tests

Author: Valeriy Nayda

app/code/Magento/CatalogSearch/Model/Adapter/Aggregation/AggregationResolver.php

@@ -10,6 +10,7 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Search\Adapter\Aggregation\AggregationResolverInterface;
 use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\Search\Request\Config;
 use Magento\Framework\Search\RequestInterface;
 
 class AggregationResolver implements AggregationResolverInterface
@@ -28,36 +29,50 @@ class AggregationResolver implements AggregationResolverInterface
      * @var SearchCriteriaBuilder
      */
     private $searchCriteriaBuilder;
+
+    /**
+     * @var Config
+     */
+    private $config;
 
     /**
      * AggregationResolver constructor
      *
      * @param AttributeSetFinderInterface $attributeSetFinder
      * @param ProductAttributeRepositoryInterface $productAttributeRepository
      * @param SearchCriteriaBuilder $searchCriteriaBuilder
+     * @param Config $config
      */
     public function __construct(
         AttributeSetFinderInterface $attributeSetFinder,
         ProductAttributeRepositoryInterface $productAttributeRepository,
-        SearchCriteriaBuilder $searchCriteriaBuilder
+        SearchCriteriaBuilder $searchCriteriaBuilder,
+        Config $config
     ) {
         $this->attributeSetFinder = $attributeSetFinder;
         $this->productAttributeRepository = $productAttributeRepository;
         $this->searchCriteriaBuilder = $searchCriteriaBuilder;
+        $this->config = $config;
     }
 
     /**
      * {@inheritdoc}
      */
     public function resolve(RequestInterface $request, array $documentIds)
     {
+        $data = $this->config->get($request->getName());
+
+        $bucketKeys = isset($data['aggregations']) ? array_keys($data['aggregations']) : [];
         $attributeCodes = $this->getApplicableAttributeCodes($documentIds);
 
-        $resolvedAggregation = array_filter($request->getAggregation(), function ($bucket) use ($attributeCodes) {
-            /** @var BucketInterface $bucket */
-            return in_array($bucket->getField(), $attributeCodes);
-        });
-        return $resolvedAggregation;
+        $resolvedAggregation = array_filter(
+            $request->getAggregation(),
+            function ($bucket) use ($attributeCodes, $bucketKeys) {
+                /** @var BucketInterface $bucket */
+                return in_array($bucket->getField(), $attributeCodes) || in_array($bucket->getName(), $bucketKeys);
+            }
+        );
+        return array_values($resolvedAggregation);
     }
 
     /**

app/code/Magento/CatalogSearch/Test/Unit/Model/Adapter/Aggregation/AggregationResolverTest.php

@@ -13,6 +13,7 @@
 use Magento\Framework\Api\SearchCriteriaBuilder;
 use Magento\Framework\Api\SearchCriteriaInterface;
 use Magento\Framework\Search\Request\BucketInterface;
+use Magento\Framework\Search\Request\Config;
 use Magento\Framework\Search\RequestInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 
@@ -38,6 +39,11 @@ class AggregationResolverTest extends \PHPUnit_Framework_TestCase
      */
     private $request;
 
+    /**
+     * @var Config|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $config;
+
     /**
      * @var AggregationResolver
      */
@@ -51,13 +57,15 @@ protected function setUp()
             ->disableOriginalConstructor()
             ->getMock();
         $this->request = $this->getMock(RequestInterface::class);
+        $this->config = $this->getMockBuilder(Config::class)->disableOriginalConstructor()->getMock();
 
         $this->aggregationResolver = (new ObjectManager($this))->getObject(
             AggregationResolver::class,
             [
                 'attributeSetFinder' => $this->attributeSetFinder,
                 'productAttributeRepository' => $this->productAttributeRepository,
                 'searchCriteriaBuilder' => $this->searchCriteriaBuilder,
+                'config' => $this->config,
             ]
         );
     }
@@ -66,6 +74,7 @@ public function testResolve()
     {
         $documentIds = [1, 2, 3];
         $attributeSetIds = [4, 5];
+        $requestName = 'request_name';
 
         $this->attributeSetFinder
             ->expects($this->once())
@@ -113,11 +122,28 @@ public function testResolve()
         $bucketSecond->expects($this->once())
             ->method('getField')
             ->willReturn('some_another_code');
+        $bucketThird = $this->getMock(BucketInterface::class);
+        $bucketThird->expects($this->once())
+            ->method('getName')
+            ->willReturn('custom_not_attribute_field');
 
         $this->request->expects($this->once())
             ->method('getAggregation')
-            ->willReturn([$bucketFirst, $bucketSecond]);
-
-        $this->assertEquals([$bucketFirst], $this->aggregationResolver->resolve($this->request, $documentIds));
+            ->willReturn([$bucketFirst, $bucketSecond, $bucketThird]);
+        $this->request->expects($this->once())
+            ->method('getName')
+            ->willReturn($requestName);
+
+        $this->config->expects($this->once())
+            ->method('get')
+            ->with($requestName)
+            ->willReturn([
+                'aggregations' => ['custom_not_attribute_field' => []],
+            ]);
+
+        $this->assertEquals(
+            [$bucketFirst, $bucketThird],
+            $this->aggregationResolver->resolve($this->request, $documentIds)
+        );
     }
 }