Merge branch 'MC-41092' of https://github.com/magento-l3/magento2ce into PR-20210423

Author: chittima

app/code/Magento/CatalogImportExport/Model/Export/Product/WebsiteFilter.php

@@ -0,0 +1,33 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+declare(strict_types=1);
+
+namespace Magento\CatalogImportExport\Model\Export\Product;
+
+use Magento\Catalog\Model\ResourceModel\Product\Collection;
+use Magento\CatalogImportExport\Model\Export\ProductFilterInterface;
+
+/**
+ * Website filter for products export
+ */
+class WebsiteFilter implements ProductFilterInterface
+{
+    private const NAME = 'website_id';
+
+    /**
+     * @inheritDoc
+     */
+    public function filter(Collection $collection, array $filters): Collection
+    {
+        if (!isset($filters[self::NAME])) {
+            return $collection;
+        }
+
+        $collection->addWebsiteFilter($filters[self::NAME]);
+
+        return $collection;
+    }
+}

app/code/Magento/CatalogImportExport/etc/di.xml

@@ -48,6 +48,7 @@
             <argument name="filters" xsi:type="array">
                 <item name="category_ids" xsi:type="object">Magento\CatalogImportExport\Model\Export\Product\CategoryFilter</item>
                 <item name="quantity_and_stock_status" xsi:type="object">Magento\CatalogImportExport\Model\Export\Product\StockStatusFilter</item>
+                <item name="website_ids" xsi:type="object">Magento\CatalogImportExport\Model\Export\Product\WebsiteFilter</item>
             </argument>
         </arguments>
     </type>

app/code/Magento/ImportExport/Controller/Adminhtml/Export/Export.php

@@ -76,7 +76,7 @@ public function execute()
     {
         if ($this->getRequest()->getPost(ExportModel::FILTER_ELEMENT_GROUP)) {
             try {
-                $params = $this->getRequest()->getParams();
+                $params = $this->getRequestParameters();
 
                 if (!array_key_exists('skip_attr', $params)) {
                     $params['skip_attr'] = [];
@@ -109,4 +109,14 @@ public function execute()
         $resultRedirect->setPath('adminhtml/*/index');
         return $resultRedirect;
     }
+
+    /**
+     * Retrieve all params as array
+     *
+     * @return array
+     */
+    public function getRequestParameters(): array
+    {
+        return $this->getRequest()->getParams();
+    }
 }

app/code/Magento/ImportExport/Model/Export/Entity/AbstractEav.php

@@ -158,6 +158,11 @@ public function filterEntityCollection(AbstractCollection $collection)
                             $attributeCode,
                             ['eq' => $exportFilter[$attributeCode]]
                         );
+                    } else if (is_array($exportFilter[$attributeCode])) {
+                        $collection->addAttributeToFilter(
+                            $attributeCode,
+                            ['in' => $exportFilter[$attributeCode]]
+                        );
                     }
                 } elseif (Export::FILTER_TYPE_MULTISELECT == $attributeFilterType) {
                     if (is_array($exportFilter[$attributeCode])) {

dev/tests/integration/testsuite/Magento/CatalogImportExport/Model/Export/ProductTest.php

@@ -691,6 +691,26 @@ public function filterByQuantityAndStockStatusDataProvider(): array
         ];
     }
 
+    /**
+     * Test that Product Export takes into account filtering by Website
+     *
+     * Fixtures provide two products, one assigned to default website only,
+     * and the other is assigned to to default and custom websites. Only product assigned custom website is exported
+     *
+     * @magentoDataFixture Magento/Catalog/_files/product_simple_with_options.php
+     * @magentoDataFixture Magento/Catalog/_files/product_with_two_websites.php
+     */
+    public function testExportProductWithRestrictedWebsite(): void
+    {
+        $websiteRepository = $this->objectManager->get(\Magento\Store\Api\WebsiteRepositoryInterface::class);
+        $website = $websiteRepository->get('second_website');
+
+        $exportData = $this->doExport(['website_id' => $website->getId()]);
+
+        $this->assertStringContainsString('"Simple Product"', $exportData);
+        $this->assertStringNotContainsString('"Virtual Product With Custom Options"', $exportData);
+    }
+
     /**
      * Perform export
      *