MC-35065: Catalog pricerules are not working with custom options as expected in Magento 2.3.0 product details page

Author: OlgaVasyltsun

app/code/Magento/Catalog/Model/Product/Option/Type/Select.php

@@ -260,20 +260,7 @@ public function getOptionPrice($optionValue, $basePrice)
             foreach (explode(',', $optionValue) as $value) {
                 $_result = $option->getValueById($value);
                 if ($_result) {
-                    $catalogPriceValue = $this->calculateCustomOptionCatalogRule->execute(
-                        $option->getProduct(),
-                        (float)$_result->getPrice(),
-                        $_result->getPriceType() === Value::TYPE_PERCENT
-                    );
-                    if ($catalogPriceValue!==null) {
-                        $result += $catalogPriceValue;
-                    } else {
-                        $result += $this->_getChargeableOptionPrice(
-                            $_result->getPrice(),
-                            $_result->getPriceType() == 'percent',
-                            $basePrice
-                        );
-                    }
+                    $result += $this->getCalculatedOptionValue($option, $_result, $basePrice);
                 } else {
                     if ($this->getListener()) {
                         $this->getListener()->setHasError(true)->setMessage($this->_getWrongConfigurationMessage());
@@ -359,4 +346,31 @@ protected function _isSingleSelection()
     {
         return in_array($this->getOption()->getType(), $this->singleSelectionTypes, true);
     }
+
+    /**
+     * Returns calculated price of option
+     *
+     * @param \Magento\Catalog\Model\Product\Option $option
+     * @param \Magento\Catalog\Model\Product\Option\Value $result
+     * @param float $basePrice
+     * @return float|null
+     */
+    protected function getCalculatedOptionValue($option, $result, $basePrice)
+    {
+        $catalogPriceValue = $this->calculateCustomOptionCatalogRule->execute(
+            $option->getProduct(),
+            (float)$result->getPrice(),
+            $result->getPriceType() === Value::TYPE_PERCENT
+        );
+        if ($catalogPriceValue!==null) {
+            $optionCalculatedValue = $catalogPriceValue;
+        } else {
+            $optionCalculatedValue = $this->_getChargeableOptionPrice(
+                $result->getPrice(),
+                $result->getPriceType() == 'percent',
+                $basePrice
+            );
+        }
+        return $optionCalculatedValue;
+    }
 }