Merge branch 'ACP2E-1697' of https://github.com/magento-l3/magento2ce into PR-L3-03132023

Author: chittima

app/code/Magento/CatalogRule/Model/Rule.php

@@ -405,9 +405,16 @@ public function callbackValidateProduct($args)
         $product->setData($args['row']);
 
         $websites = $this->_getWebsitesMap();
+        $websiteIds = $this->getWebsiteIds();
+        if (!is_array($websiteIds)) {
+            $websiteIds = explode(',', $websiteIds);
+        }
         $results = [];
 
         foreach ($websites as $websiteId => $defaultStoreId) {
+            if (!in_array($websiteId, $websiteIds)) {
+                continue;
+            }
             $product->setStoreId($defaultStoreId);
             $results[$websiteId] = $this->getConditions()->validate($product);
         }

app/code/Magento/CatalogRule/Test/Unit/Model/RuleTest.php

@@ -207,15 +207,15 @@ public function testCallbackValidateProduct($validate): void
             'updated_at' => '2014-06-25 14:37:15'
         ];
         $this->storeManager->expects($this->any())->method('getWebsites')->with(false)
-            ->willReturn([$this->websiteModel, $this->websiteModel]);
+            ->willReturn([$this->websiteModel, $this->websiteModel, $this->websiteModel]);
         $this->websiteModel
             ->method('getId')
-            ->willReturnOnConsecutiveCalls('1', '2');
+            ->willReturnOnConsecutiveCalls('1', '2', '3');
         $this->websiteModel->expects($this->any())->method('getDefaultStore')
             ->willReturn($this->storeModel);
         $this->storeModel
             ->method('getId')
-            ->willReturnOnConsecutiveCalls('1', '2');
+            ->willReturnOnConsecutiveCalls('1', '2', '3');
         $this->combineFactory->expects($this->any())->method('create')
             ->willReturn($this->condition);
         $this->condition->expects($this->any())->method('validate')
@@ -224,12 +224,14 @@ public function testCallbackValidateProduct($validate): void
         $this->productModel->expects($this->any())->method('getId')
             ->willReturn(1);
 
+        $this->rule->setWebsiteIds('1,2');
         $this->rule->callbackValidateProduct($args);
 
         $matchingProducts = $this->rule->getMatchingProductIds();
         foreach ($matchingProducts['1'] as $matchingRules) {
             $this->assertEquals($validate, $matchingRules);
         }
+        $this->assertNull($matchingProducts['1']['3'] ?? null);
     }
 
     /**