ACP2E-1418: [Cloud] REST Orders API returns different results when a simple configurable product is out of stock

Author: pradeep1819

app/code/Magento/Quote/Model/Quote/Item/Compare.php

@@ -5,10 +5,10 @@
  */
 namespace Magento\Quote\Model\Quote\Item;
 
-use Magento\Quote\Model\Quote\Item;
-use Magento\Framework\Serialize\Serializer\Json;
 use Magento\Framework\App\ObjectManager;
 use Magento\Framework\Serialize\JsonValidator;
+use Magento\Framework\Serialize\Serializer\Json;
+use Magento\Quote\Model\Quote\Item;
 
 /**
  * Compare quote items
@@ -68,6 +68,10 @@ protected function getOptionValues($value)
      */
     public function compare(Item $target, Item $compared)
     {
+        if ($target->getSku() !== null && $target->getSku() === $compared->getSku()) {
+            return true;
+        }
+
         if ($target->getProductId() != $compared->getProductId()) {
             return false;
         }

app/code/Magento/Quote/Test/Unit/Model/Quote/Item/CompareTest.php

@@ -61,12 +61,12 @@ protected function setUp(): void
         );
         $this->itemMock = $this->getMockBuilder(Item::class)
             ->addMethods(['getProductId'])
-            ->onlyMethods(['__wakeup', 'getOptions', 'getOptionsByCode'])
+            ->onlyMethods(['__wakeup', 'getOptions', 'getOptionsByCode', 'getSku'])
             ->setConstructorArgs($constrArgs)
             ->getMock();
         $this->comparedMock = $this->getMockBuilder(Item::class)
             ->addMethods(['getProductId'])
-            ->onlyMethods(['__wakeup', 'getOptions', 'getOptionsByCode'])
+            ->onlyMethods(['__wakeup', 'getOptions', 'getOptionsByCode', 'getSku'])
             ->setConstructorArgs($constrArgs)
             ->getMock();
         $this->optionMock = $this->getMockBuilder(Option::class)
@@ -236,4 +236,19 @@ public function testCompareItemWithoutOptionWithCompared()
             ->willReturn([]);
         $this->assertFalse($this->helper->compare($this->itemMock, $this->comparedMock));
     }
+
+    /**
+     * test compare when configurable products has assigned its selected variant sku
+     */
+    public function testCompareConfigurableProductAndItsVariant()
+    {
+        $this->itemMock->expects($this->exactly(2))
+            ->method('getSku')
+            ->willReturn('cr1-r');
+        $this->comparedMock->expects($this->once())
+            ->method('getSku')
+            ->willReturn('cr1-r');
+
+        $this->assertTrue($this->helper->compare($this->itemMock, $this->comparedMock));
+    }
 }