Merge branch 'ACP2E-4100' of https://github.com/adobe-commerce-tier-4/magento2ce into Tier4-08-13-2025

Author: thiaramus

app/code/Magento/Catalog/Pricing/Price/SpecialPriceBulkResolver.php

@@ -13,6 +13,7 @@
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Session\SessionManagerInterface;
 use Magento\Framework\View\Element\Block\ArgumentInterface;
+use Magento\Store\Model\StoreManagerInterface;
 
 class SpecialPriceBulkResolver implements SpecialPriceBulkResolverInterface, ArgumentInterface
 {
@@ -31,19 +32,27 @@ class SpecialPriceBulkResolver implements SpecialPriceBulkResolverInterface, Arg
      */
     private SessionManagerInterface $customerSession;
 
+    /**
+     * @var StoreManagerInterface
+     */
+    private StoreManagerInterface $storeManager;
+
     /**
      * @param ResourceConnection $resource
      * @param MetadataPool $metadataPool
      * @param SessionManagerInterface $customerSession
+     * @param StoreManagerInterface $storeManager
      */
     public function __construct(
         ResourceConnection $resource,
         MetadataPool $metadataPool,
-        SessionManagerInterface $customerSession
+        SessionManagerInterface $customerSession,
+        StoreManagerInterface $storeManager
     ) {
         $this->resource = $resource;
         $this->metadataPool = $metadataPool;
         $this->customerSession = $customerSession;
+        $this->storeManager = $storeManager;
     }
 
     /**
@@ -59,7 +68,7 @@ public function generateSpecialPriceMap(int $storeId, ?AbstractCollection $produ
         if (!$productCollection) {
             return [];
         }
-
+        $websiteId = $this->storeManager->getStore($storeId)->getWebsiteId();
         $metadata = $this->metadataPool->getMetadata(ProductInterface::class);
         $connection = $this->resource->getConnection();
         $select = $connection->select()
@@ -76,7 +85,7 @@ public function generateSpecialPriceMap(int $storeId, ?AbstractCollection $produ
             )
             ->joinLeft(
                 ['price' => $this->resource->getTableName('catalog_product_index_price')],
-                'price.entity_id = COALESCE(link.product_id, e.entity_id) AND price.website_id = ' . $storeId .
+                'price.entity_id = COALESCE(link.product_id, e.entity_id) AND price.website_id = ' . $websiteId .
                 ' AND price.customer_group_id = ' . $this->customerSession->getCustomerGroupId()
             )
             ->where('e.entity_id IN (' . implode(',', $productCollection->getAllIds()) . ')')

app/code/Magento/Catalog/Test/Unit/Pricing/Price/SpecialPriceBulkResolverTest.php

@@ -16,9 +16,14 @@
 use Magento\Framework\EntityManager\EntityMetadataInterface;
 use Magento\Framework\EntityManager\MetadataPool;
 use Magento\Framework\Session\SessionManagerInterface;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
 use PHPUnit\Framework\MockObject\MockObject;
 use PHPUnit\Framework\TestCase;
 
+/**
+ * @SuppressWarnings(PHPMD.CouplingBetweenObjects)
+ */
 class SpecialPriceBulkResolverTest extends TestCase
 {
     /**
@@ -37,10 +42,15 @@ class SpecialPriceBulkResolverTest extends TestCase
     private SpecialPriceBulkResolver $specialPriceBulkResolver;
 
     /**
-     * @var SessionManagerInterface
+     * @var SessionManagerInterface|MockObject
      */
     private SessionManagerInterface $customerSession;
 
+    /**
+     * @var StoreManagerInterface|MockObject
+     */
+    private StoreManagerInterface $storeManager;
+
     /**
      * @return void
      */
@@ -52,11 +62,12 @@ protected function setUp(): void
             ->disableOriginalConstructor()
             ->addMethods(['getCustomerGroupId'])
             ->getMockForAbstractClass();
-
+        $this->storeManager = $this->createMock(StoreManagerInterface::class);
         $this->specialPriceBulkResolver = new SpecialPriceBulkResolver(
             $this->resource,
             $this->metadataPool,
-            $this->customerSession
+            $this->customerSession,
+            $this->storeManager
         );
     }
 
@@ -75,9 +86,19 @@ public function testGenerateSpecialPriceMapNoCollection(): void
      */
     public function testGenerateSpecialPriceMapCollection(): void
     {
+        $storeId = 2;
+        $websiteId = 1;
+        $customerGroupId = 3;
         $product = $this->createMock(Product::class);
-
-        $this->customerSession->expects($this->once())->method('getCustomerGroupId')->willReturn(1);
+        $store = $this->createMock(StoreInterface::class);
+        $store->expects($this->once())->method('getWebsiteId')->willReturn($websiteId);
+        $this->storeManager->expects($this->once())
+            ->method('getStore')
+            ->with($storeId)
+            ->willReturn($store);
+        $this->customerSession->expects($this->once())
+            ->method('getCustomerGroupId')
+            ->willReturn($customerGroupId);
         $collection = $this->getMockBuilder(AbstractCollection::class)
             ->disableOriginalConstructor()
             ->onlyMethods(['getAllIds', 'getIterator'])
@@ -92,14 +113,13 @@ public function testGenerateSpecialPriceMapCollection(): void
             ->method('getMetadata')
             ->with(ProductInterface::class)
             ->willReturn($metadata);
-
         $connection = $this->getMockBuilder(AdapterInterface::class)
             ->addMethods(['from', 'joinInner', 'where', 'columns', 'joinLeft'])
             ->getMockForAbstractClass();
         $connection->expects($this->once())->method('select')->willReturnSelf();
         $connection->expects($this->once())
             ->method('from')
-            ->with(['e' => 'catalog_product_super_link'])
+            ->with(['e' => 'catalog_product_entity'])
             ->willReturnSelf();
         $connection->expects($this->exactly(3))
             ->method('joinLeft')
@@ -130,12 +150,13 @@ public function testGenerateSpecialPriceMapCollection(): void
         $this->resource->expects($this->exactly(4))
             ->method('getTableName')
             ->willReturnOnConsecutiveCalls(
-                'catalog_product_super_link',
                 'catalog_product_entity',
+                'catalog_product_super_link',
                 'catalog_product_website',
                 'catalog_product_index_price'
             );
-
-        $this->specialPriceBulkResolver->generateSpecialPriceMap(1, $collection);
+        $result = $this->specialPriceBulkResolver->generateSpecialPriceMap($storeId, $collection);
+        $expectedResult = [1 => true];
+        $this->assertEquals($expectedResult, $result);
     }
 }