ACP2E-3176: [Cloud] quick order large amount of SKU performance

Author: bubasuma

app/code/Magento/Msrp/Model/Quote/Address/CanApplyMsrp.php

@@ -21,6 +21,8 @@ public function __construct(\Magento\Msrp\Helper\Data $msrpHelper)
     }
 
     /**
+     * Checks whether MSRP can be applied to the address
+     *
      * @param \Magento\Quote\Model\Quote\Address $address
      * @return bool
      */
@@ -29,8 +31,8 @@ public function isCanApplyMsrp($address)
         $canApplyMsrp = false;
         foreach ($address->getAllItems() as $item) {
             if (!$item->getParentItemId()
-                    && $this->msrpHelper->isShowBeforeOrderConfirm($item->getProductId())
-                    && $this->msrpHelper->isMinimalPriceLessMsrp($item->getProductId())
+                    && $this->msrpHelper->isShowBeforeOrderConfirm($item->getProduct())
+                    && $this->msrpHelper->isMinimalPriceLessMsrp($item->getProduct())
             ) {
                 $canApplyMsrp = true;
                 break;

app/code/Magento/Msrp/Test/Unit/Model/Quote/Address/CanApplyMsrpTest.php

@@ -0,0 +1,77 @@
+<?php
+/**
+ * Copyright 2024 Adobe
+ * All Rights Reserved.
+ */
+declare(strict_types=1);
+
+namespace Magento\Msrp\Test\Unit\Model\Quote\Address;
+
+use Magento\Catalog\Model\Product;
+use Magento\Msrp\Helper\Data;
+use Magento\Msrp\Model\Quote\Address\CanApplyMsrp;
+use Magento\Quote\Model\Quote\Address;
+use Magento\Quote\Model\Quote\Item;
+use PHPUnit\Framework\MockObject\MockObject;
+use PHPUnit\Framework\TestCase;
+
+class CanApplyMsrpTest extends TestCase
+{
+    /**
+     * @var CanApplyMsrp|null
+     */
+    private $canApplyMsrp;
+
+    /**
+     * @var Data|MockObject|null
+     */
+    private $msrpHelper;
+
+    /**
+     * @var Address|MockObject|null
+     */
+    private $address;
+
+    protected function setUp(): void
+    {
+        $this->msrpHelper = $this->createMock(Data::class);
+        $this->address = $this->createMock(Address::class);
+        $this->canApplyMsrp = new CanApplyMsrp($this->msrpHelper);
+    }
+
+    public function testIsCanApplyMsrpWhenIsShowBeforeOrderConfirmAndIsMinimalPriceLessMsrpReturnTrue(): void
+    {
+        $item = $this->createPartialMock(Item::class, ['getProduct']);
+        $product = $this->createMock(Product::class);
+        $item->expects($this->exactly(2))->method('getProduct')->willReturn($product);
+        $this->msrpHelper->expects($this->once())->method('isShowBeforeOrderConfirm')->with($product)->willReturn(true);
+        $this->msrpHelper->expects($this->once())->method('isMinimalPriceLessMsrp')->with($product)->willReturn(true);
+        $this->address->expects($this->once())->method('getAllItems')->willReturn([$item]);
+        $this->assertTrue($this->canApplyMsrp->isCanApplyMsrp($this->address));
+    }
+
+    public function testIsCanApplyMsrpWhenIsMinimalPriceLessMsrpReturnsFalse(): void
+    {
+        $item = $this->createPartialMock(Item::class, ['getProduct']);
+        $product = $this->createMock(Product::class);
+        $item->expects($this->exactly(2))->method('getProduct')->willReturn($product);
+        $this->msrpHelper->expects($this->once())->method('isShowBeforeOrderConfirm')->with($product)->willReturn(true);
+        $this->msrpHelper->expects($this->once())->method('isMinimalPriceLessMsrp')->with($product)->willReturn(false);
+        $this->address->expects($this->once())->method('getAllItems')->willReturn([$item]);
+        $this->assertFalse($this->canApplyMsrp->isCanApplyMsrp($this->address));
+    }
+
+    public function testIsCanApplyMsrpWhenIsShowBeforeOrderConfirmReturnsFalse(): void
+    {
+        $item = $this->createPartialMock(Item::class, ['getProduct']);
+        $product = $this->createMock(Product::class);
+        $item->expects($this->exactly(1))->method('getProduct')->willReturn($product);
+        $this->msrpHelper->expects($this->once())
+            ->method('isShowBeforeOrderConfirm')
+            ->with($product)
+            ->willReturn(false);
+        $this->msrpHelper->expects($this->never())->method('isMinimalPriceLessMsrp')->with($product);
+        $this->address->expects($this->once())->method('getAllItems')->willReturn([$item]);
+        $this->assertFalse($this->canApplyMsrp->isCanApplyMsrp($this->address));
+    }
+}

app/code/Magento/SalesRule/Model/Rule/Condition/Product.php

@@ -7,8 +7,6 @@
 
 /**
  * Product rule condition data model
- *
- * @author Magento Core Team <core@magentocommerce.com>
  */
 class Product extends \Magento\Rule\Model\Condition\Product\AbstractProduct
 {
@@ -194,7 +192,26 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
             }
         }
 
-        return parent::validate($product);
+        /**
+         * \Magento\Rule\Model\Condition\AbstractCondition::validate() will attempt to reload the product
+         * if the attribute value is missing in the product. We need to ensure that logic is not executed
+         * because not only it is unnecessary as all attributes used in rules conditions are loaded into
+         * the product model, but it also causes performance issues.
+         * @see \Magento\Rule\Model\Condition\AbstractCondition::validate()
+         * @see \Magento\SalesRule\Model\Plugin\QuoteConfigProductAttributes::afterLoadAttributes()
+         */
+        $hasAttribute = $product->hasData($attrCode);
+        // value is most likely null if $hasAttribute === false, but it could be provided from custom attributes
+        $value = $product->getData($attrCode);
+        if (!$hasAttribute) {
+            $product->setData($attrCode, $value);
+        }
+        $isValid = parent::validate($product);
+        if (!$hasAttribute && $value === null) {
+            $product->unsetData($attrCode);
+        }
+
+        return $isValid;
     }
 
     /**

app/code/Magento/SalesRule/Test/Unit/Model/Rule/Condition/ProductTest.php

@@ -18,6 +18,7 @@
 use Magento\Eav\Model\Entity\AttributeLoaderInterface;
 use Magento\Eav\Model\ResourceModel\Entity\Attribute\Set\Collection;
 use Magento\Framework\App\ScopeResolverInterface;
+use Magento\Framework\DataObject;
 use Magento\Framework\DB\Adapter\AdapterInterface;
 use Magento\Framework\DB\Select;
 use Magento\Framework\Locale\Format;
@@ -336,4 +337,38 @@ public static function localisationProvider(): array
             'smallPrice' => [false, '1,500.03', '>=', 1000],
         ];
     }
+
+    public function testValidateWhenAttributeValueIsMissingInTheProduct(): void
+    {
+        $attributeCode = 'test_attr';
+        $attribute = new DataObject();
+        $attribute->setBackendType('varchar');
+        $attribute->setFrontendInput('text');
+
+        $newResource = $this->createPartialMock(Product::class, ['getAttribute']);
+        $newResource->expects($this->any())
+            ->method('getAttribute')
+            ->with($attributeCode)
+            ->willReturn($attribute);
+
+        $product = $this->getMockBuilder(\Magento\Catalog\Model\Product::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['getId', 'load', 'getResource'])
+            ->getMock();
+        $product->method('getId')
+            ->willReturn(1);
+        $product->expects($this->never())
+            ->method('load')
+            ->willReturnSelf();
+        $product->expects($this->atLeastOnce())
+            ->method('getResource')
+            ->willReturn($newResource);
+
+        $item = $this->createMock(AbstractItem::class);
+        $item->expects($this->any())
+            ->method('getProduct')
+            ->willReturn($product);
+        $this->model->setAttribute($attributeCode);
+        $this->model->validate($item);
+    }
 }