Merge remote-tracking branch 'origin/MC-39140' into 2.4-develop-pr50

Author: Serhii Balko

app/code/Magento/Catalog/Model/ResourceModel/Product/Collection.php

@@ -916,7 +916,12 @@ public function addWebsiteFilter($websites = null)
         }
 
         $this->_productLimitationFilters['website_ids'] = $websites;
-        $this->_applyProductLimitations();
+
+        if ($this->getStoreId() == Store::DEFAULT_STORE_ID) {
+            $this->_productLimitationJoinWebsite();
+        } else {
+            $this->_applyProductLimitations();
+        }
 
         return $this;
     }

app/code/Magento/Catalog/Test/Unit/Model/ResourceModel/Product/CollectionTest.php

@@ -38,6 +38,7 @@
 use Magento\Framework\Stdlib\DateTime\TimezoneInterface;
 use Magento\Framework\TestFramework\Unit\Helper\ObjectManager;
 use Magento\Framework\Validator\UniversalFactory;
+use Magento\Store\Model\Store;
 use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
@@ -93,6 +94,11 @@ class CollectionTest extends TestCase
      */
     private $storeManager;
 
+    /**
+     * @var ProductLimitation|MockObject
+     */
+    private $productLimitationMock;
+
     /**
      * @var EntityFactory|MockObject
      */
@@ -192,7 +198,7 @@ protected function setUp(): void
         $this->entityMock->expects($this->any())->method('getTable')->willReturnArgument(0);
         $this->connectionMock->expects($this->atLeastOnce())->method('select')->willReturn($this->selectMock);
 
-        $productLimitationMock = $this->createMock(
+        $this->productLimitationMock = $this->createMock(
             ProductLimitation::class
         );
         $productLimitationFactoryMock = $this->getMockBuilder(
@@ -201,7 +207,7 @@ protected function setUp(): void
             ->setMethods(['create'])->getMock();
 
         $productLimitationFactoryMock->method('create')
-            ->willReturn($productLimitationMock);
+            ->willReturn($this->productLimitationMock);
         $this->collection = $this->objectManager->getObject(
             Collection::class,
             [
@@ -432,4 +438,44 @@ public function testGetNewEmptyItem()
         $secondItem = $this->collection->getNewEmptyItem();
         $this->assertEquals($firstItem, $secondItem);
     }
+
+    /**
+     * Test to add website filter in admin area
+     */
+    public function testAddWebsiteFilterOnAdminStore(): void
+    {
+        $websiteIds = [2];
+        $websiteTable = 'catalog_product_website';
+        $joinCondition = 'join condition';
+        $this->productLimitationMock->expects($this->atLeastOnce())
+            ->method('offsetSet')
+            ->with('website_ids', $websiteIds);
+        $this->productLimitationMock->method('offsetExists')
+            ->with('website_ids')
+            ->willReturn(true);
+        $this->productLimitationMock->method('offsetGet')
+            ->with('website_ids')
+            ->willReturn($websiteIds);
+        $this->connectionMock->expects($this->once())
+            ->method('quoteInto')
+            ->with('product_website.website_id IN(?)', $websiteIds, 'int')
+            ->willReturn($joinCondition);
+        $this->selectMock->method('getPart')->with(Select::FROM)->willReturn([]);
+        /** @var AbstractEntity|MockObject $eavEntity */
+        $eavEntity = $this->createMock(AbstractEntity::class);
+        $eavEntity->method('getTable')
+            ->with('catalog_product_website')
+            ->willReturn($websiteTable);
+        $this->selectMock->expects($this->once())
+            ->method('join')
+            ->with(
+                ['product_website' => $websiteTable],
+                'product_website.product_id = e.entity_id AND ' . $joinCondition,
+                []
+            );
+
+        $this->collection->setEntity($eavEntity);
+        $this->collection->setStoreId(Store::DEFAULT_STORE_ID);
+        $this->collection->addWebsiteFilter($websiteIds);
+    }
 }