Merge remote-tracking branch 'l3/ACP2E-2464' into Tier4-PR-Delivery-11-18-23

Author: veloraven

app/code/Magento/CatalogRuleConfigurable/Plugin/CatalogRule/Model/Rule/Validation.php

@@ -49,15 +49,19 @@ public function afterValidate(Rule $rule, $validateResult, DataObject $product)
     {
         if (!$validateResult && ($configurableProducts = $this->configurable->getParentIdsByChild($product->getId()))) {
             foreach ($configurableProducts as $configurableProductId) {
-                $configurableProduct = $this->productRepository->getById(
-                    $configurableProductId,
-                    false,
-                    $product->getStoreId()
-                );
-                $validateResult = $rule->getConditions()->validate($configurableProduct);
-                // If any of configurable product is valid for current rule, then their sub-product must be valid too
-                if ($validateResult) {
-                    break;
+                try {
+                    $configurableProduct = $this->productRepository->getById(
+                        $configurableProductId,
+                        false,
+                        $product->getStoreId()
+                    );
+                    $validateResult = $rule->getConditions()->validate($configurableProduct);
+                    //If any of configurable product is valid for current rule, then their sub-product must be valid too
+                    if ($validateResult) {
+                        break;
+                    }
+                } catch (\Exception $e) {
+                    continue;
                 }
             }
         }

app/code/Magento/CatalogRuleConfigurable/Test/Unit/Plugin/CatalogRule/Model/Rule/ValidationTest.php

@@ -66,6 +66,32 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * @return void
+     */
+    public function testAfterValidateConfigurableProductException(): void
+    {
+        $validationResult = false;
+        $parentsIds = [2];
+        $productId = 1;
+
+        $this->productMock->expects($this->once())
+            ->method('getId')
+            ->willReturn($productId);
+        $this->configurableMock->expects($this->once())
+            ->method('getParentIdsByChild')
+            ->with($productId)
+            ->willReturn($parentsIds);
+        $this->productRepositoryMock->expects($this->once())
+            ->method('getById')
+            ->willThrowException(new \Exception('Faulty configurable product'));
+
+        $this->assertSame(
+            $validationResult,
+            $this->validation->afterValidate($this->ruleMock, $validationResult, $this->productMock)
+        );
+    }
+
     /**
      * @param $parentsIds
      * @param $validationResult