Merge remote-tracking branch 'origin/ACP2E-3735' into PR_2025_05_16

Author: katmoon

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

@@ -1004,13 +1004,13 @@ public function export()
             ++$page;
             $entityCollection = $this->_getEntityCollection(true);
             $entityCollection->setOrder('entity_id', 'asc');
-            $entityCollection->setStoreId(Store::DEFAULT_STORE_ID);
             $this->_prepareEntityCollection($entityCollection);
             $this->paginateCollection($page, $this->getItemsPerPage());
-            if ($entityCollection->count() == 0) {
+
+            $exportData = $this->getExportData();
+            if ($exportData == null || count($exportData) == 0) {
                 break;
             }
-            $exportData = $this->getExportData();
             if ($page == 1) {
                 $writer->setHeaderCols($this->_getHeaderColumns());
             }
@@ -1096,10 +1096,11 @@ protected function getExportData()
     protected function loadCollection(): array
     {
         $data = [];
-        $collection = $this->_getEntityCollection();
         foreach (array_keys($this->_storeIdToCode) as $storeId) {
+            $collection = $this->_getEntityCollection(true);
             $collection->setOrder('entity_id', 'asc');
             $collection->setStoreId($storeId);
+            $this->_prepareEntityCollection($collection);
             $collection->load();
             foreach ($collection as $itemId => $item) {
                 $data[$itemId][$storeId] = $item;
@@ -1129,6 +1130,9 @@ protected function collectRawData()
          */
         foreach ($items as $itemId => $itemByStore) {
             foreach ($this->_storeIdToCode as $storeId => $storeCode) {
+                if (!key_exists($storeId, $itemByStore)) {
+                    continue;
+                }
                 $item = $itemByStore[$storeId];
                 $additionalAttributes = [];
                 $productLinkId = $item->getData($this->getProductEntityLinkField());

app/code/Magento/CatalogImportExport/Test/Unit/Model/Export/ProductTest.php

@@ -342,16 +342,12 @@ public function testExportCountZeroBreakInternalCalls()
         $this->product->expects($this->once())->method('getItemsPerPage')->willReturn($itemsPerPage);
         $this->product->expects($this->once())->method('paginateCollection')->with($page, $itemsPerPage);
         $this->abstractCollection->expects($this->once())->method('setOrder')->with('entity_id', 'asc');
-        $this->abstractCollection->expects($this->once())->method('setStoreId')->with(Store::DEFAULT_STORE_ID);
-
-        $this->abstractCollection->expects($this->once())->method('count')->willReturn(0);
 
         $this->abstractCollection->expects($this->never())->method('getCurPage');
         $this->abstractCollection->expects($this->never())->method('getLastPageNumber');
         $this->product->expects($this->never())->method('_getHeaderColumns');
         $this->writer->expects($this->never())->method('setHeaderCols');
         $this->writer->expects($this->never())->method('writeRow');
-        $this->product->expects($this->never())->method('getExportData');
         $this->product->expects($this->never())->method('_customFieldsMapping');
 
         $this->writer->expects($this->once())->method('getContents');
@@ -373,9 +369,6 @@ public function testExportCurPageEqualToLastBreakInternalCalls()
         $this->product->expects($this->once())->method('getItemsPerPage')->willReturn($itemsPerPage);
         $this->product->expects($this->once())->method('paginateCollection')->with($page, $itemsPerPage);
         $this->abstractCollection->expects($this->once())->method('setOrder')->with('entity_id', 'asc');
-        $this->abstractCollection->expects($this->once())->method('setStoreId')->with(Store::DEFAULT_STORE_ID);
-
-        $this->abstractCollection->expects($this->once())->method('count')->willReturn(1);
 
         $this->abstractCollection->expects($this->once())->method('getCurPage')->willReturn($curPage);
         $this->abstractCollection->expects($this->once())->method('getLastPageNumber')->willReturn($lastPage);

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

@@ -10,6 +10,7 @@
 
 use Magento\Catalog\Api\CategoryRepositoryInterface;
 use Magento\Catalog\Api\ProductRepositoryInterface;
+use Magento\Catalog\Model\Product\Visibility;
 use Magento\Catalog\Model\ResourceModel\Product\Attribute\Collection as ProductAttributeCollection;
 use Magento\Catalog\Observer\SwitchPriceAttributeScopeOnConfigChange;
 use Magento\Catalog\Test\Fixture\Attribute as AttributeFixture;
@@ -747,6 +748,43 @@ public function testExportProductWithTwoWebsites(): void
         $switchPriceScope->execute($observer);
     }
 
+    /**
+     * @magentoDataFixture Magento/Catalog/_files/product_simple.php
+     * @magentoDataFixture Magento/Store/_files/second_website_with_two_stores.php
+     * @magentoDbIsolation disabled
+     * @magentoAppArea adminhtml
+     *
+     * @return void
+     */
+    public function testFilterForNonDefaultStore(): void
+    {
+        $secondStoreCode = 'fixture_second_store';
+
+        /** @var \Magento\Store\Model\Store $store */
+        $store = $this->objectManager->create(\Magento\Store\Model\Store::class);
+        $secondStore = $store->load($secondStoreCode);
+
+        /** @var \Magento\Catalog\Model\Product\Action $productAction */
+        $productAction = $this->objectManager->create(\Magento\Catalog\Model\Product\Action::class);
+
+        $this->model->setWriter(
+            $this->objectManager->create(
+                \Magento\ImportExport\Model\Export\Adapter\Csv::class
+            )
+        );
+
+        $product = $this->productRepository->get('simple');
+        $productId = $product->getId();
+        $productAction->updateWebsites([$productId], [$secondStore->getWebsiteId()], 'add');
+        $product->setStoreId($secondStore->getId());
+        $product->setVisibility(Visibility::VISIBILITY_NOT_VISIBLE);
+        $product->setName($product->getName() . ' ' . $secondStoreCode);
+        $this->productRepository->save($product);
+
+        $exportData = $this->doExport(['visibility' => Visibility::VISIBILITY_BOTH]);
+        $this->assertStringNotContainsString($product->getName(), $exportData);
+    }
+
     /**
      * Verify that "stock status" filter correctly applies to export result
      *