MCLOUD-6923: Layered navigation filter is present only when product i… (#15)

Author: dyushkin

.travis.yml

@@ -74,6 +74,7 @@ before_install:
   - if [ -n "${COMPOSER_VERSION}" ]; then travis_retry composer self-update ${COMPOSER_VERSION}; fi;
 
 install:
+  - phpenv config-add travis.php.ini
   - composer config http-basic.repo.magento.com ${REPO_USERNAME_CE} ${REPO_PASSWORD_CE}
   - composer config github-oauth.github.com ${GITHUB_TOKEN}
   - if [ -n "${MCD_VERSION}" ] && [ $TRAVIS_PHP_VERSION != "7.0" ]; then composer config repositories.mcd git [email protected]:magento/magento-cloud-docker.git && composer require "magento/magento-cloud-docker:${MCD_VERSION}" --no-update; fi;

patches.json

@@ -340,6 +340,11 @@
       "4.1.0": "BUNDLE-2683__braintree_settlement_report_fix__4.1.0.patch"
     }
   },
+  "magento/magento2-b2b-base": {
+    "Layered navigation filter is present only when product is present on the listing page with enabled Shared catalog": {
+      ">=1.1.5 <1.3.1": "MCLOUD-6923__layered_navigation_filter_is_present_only_when_product_is_present_on_the_listing_page_with_enabled_shared_catalog__2.3.5.patch"
+    }
+  },
   "magento/magento2-ee-base": {
     "Fix pagebuilder module": {
       "2.3.1": "PB-319__fix_pagebuilder_module__2.3.1.patch",

patches/MCLOUD-6923__layered_navigation_filter_is_present_only_when_product_is_present_on_the_listing_page_with_enabled_shared_catalog__2.3.5.patch

@@ -0,0 +1,58 @@
+diff -Nuar a/vendor/magento/module-shared-catalog/Model/SearchAdapter/Aggregation/Builder/DataProvider.php b/vendor/magento/module-shared-catalog/Model/SearchAdapter/Aggregation/Builder/DataProvider.php
+--- a/vendor/magento/module-shared-catalog/Model/SearchAdapter/Aggregation/Builder/DataProvider.php
++++ b/vendor/magento/module-shared-catalog/Model/SearchAdapter/Aggregation/Builder/DataProvider.php
+@@ -103,18 +103,16 @@ public function __construct(
+      *
+      * @param BucketInterface $bucket
+      * @param array $dimensions
+-     * @param array $documentIds
+      * @return array
+      * @throws \Magento\Framework\Exception\LocalizedException
+      * @throws \Zend_Db_Statement_Exception
+      */
+     public function getAggregation(
+         BucketInterface $bucket,
+-        array $dimensions,
+-        array $documentIds
++        array $dimensions
+     ) {
+         $result = [];
+-        $select = $this->getSelect($bucket, $dimensions, $documentIds);
++        $select = $this->getSelect($bucket, $dimensions);
+         $query  = $this->connection->query($select);
+ 
+         while ($row = $query->fetch()) {
+@@ -134,11 +132,10 @@ public function getAggregation(
+      *
+      * @param BucketInterface $bucket
+      * @param array $dimensions
+-     * @param array $documentIds
+      * @return Select
+      * @throws \Magento\Framework\Exception\LocalizedException
+      */
+-    private function getSelect(BucketInterface $bucket, array $dimensions, array $documentIds)
++    private function getSelect(BucketInterface $bucket, array $dimensions)
+     {
+         $attribute = $this->eavConfig->getAttribute(Product::ENTITY, $bucket->getField());
+         $currentScope = $this->scopeResolver->getScope($dimensions['scope']->getValue());
+@@ -161,7 +158,6 @@ private function getSelect(BucketInterface $bucket, array $dimensions, array $do
+             'source_entity.sku  = shared_catalog_item.sku',
+             []
+         )
+-        ->where('eav.entity_id IN (?)', $documentIds)
+         ->where('eav.attribute_id = ?', $attribute->getId())
+         ->where('eav.store_id = ? ', $currentScope->getId())
+         ->where('source_entity.type_id <> ?', 'configurable')
+diff -Nuar a/vendor/magento/module-shared-catalog/Plugin/Elasticsearch/SearchAdapter/Aggregation/Builder/UpdateTermBucketBuilderPlugin.php b/vendor/magento/module-shared-catalog/Plugin/Elasticsearch/SearchAdapter/Aggregation/Builder/UpdateTermBucketBuilderPlugin.php
+--- a/vendor/magento/module-shared-catalog/Plugin/Elasticsearch/SearchAdapter/Aggregation/Builder/UpdateTermBucketBuilderPlugin.php
++++ b/vendor/magento/module-shared-catalog/Plugin/Elasticsearch/SearchAdapter/Aggregation/Builder/UpdateTermBucketBuilderPlugin.php
+@@ -65,8 +65,7 @@ public function afterBuild(
+         $shouldAggregate = ($bucket->getField() !== 'category_ids');
+ 
+         if ($sharedCatalogIsEnabled && $shouldAggregate) {
+-            $documentIds = array_column($queryResult['hits']['hits'], '_id');
+-            $values = $this->dataProvider->getAggregation($bucket, $dimensions, $documentIds);
++            $values = $this->dataProvider->getAggregation($bucket, $dimensions);
+         }
+ 
+         return $values;

travis.php.ini

@@ -0,0 +1 @@
+memory_limit = 4G