Merge branch 'MAGETWO-57616' into chaika-pr1

Author: Sergey Shvets

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

@@ -2161,6 +2161,12 @@ public function reserveOrderId()
     {
         if (!$this->getReservedOrderId()) {
             $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
+        } else {
+            //checking if reserved order id was already used for some order
+            //if yes reserving new one if not using old one
+            if ($this->_getResource()->isOrderIncrementIdUsed($this->getReservedOrderId())) {
+                $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
+            }
         }
         return $this;
     }

app/code/Magento/Quote/Model/ResourceModel/Quote.php

@@ -172,6 +172,25 @@ public function getReservedOrderId($quote)
         ->getNextValue();
     }
 
+    /**
+     * Check is order increment id use in sales/order table
+     *
+     * @param int $orderIncrementId
+     * @return bool
+     */
+    public function isOrderIncrementIdUsed($orderIncrementId)
+    {
+        /** @var \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
+        $adapter = $this->getConnection();
+        $bind = [':increment_id' => $orderIncrementId];
+        /** @var \Magento\Framework\DB\Select $select */
+        $select = $adapter->select()
+            ->from($this->getTable('sales_order'), 'entity_id')
+            ->where('increment_id = :increment_id');
+        $entity_id = $adapter->fetchOne($select, $bind);
+        return ($entity_id > 0);
+    }
+
     /**
      * Mark quotes - that depend on catalog price rules - to be recollected on demand
      *

app/code/Magento/Quote/Test/Unit/Model/QuoteTest.php

@@ -307,7 +307,10 @@ protected function setUp()
                     'customerRepository' => $this->customerRepositoryMock,
                     'objectCopyService' => $this->objectCopyServiceMock,
                     'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
-                    'customerDataFactory' => $this->customerDataFactoryMock
+                    'customerDataFactory' => $this->customerDataFactoryMock,
+                    'data' => [
+                        'reserved_order_id' => 1000001
+                    ]
                 ]
             );
     }
@@ -1233,4 +1236,39 @@ public function testGetAllItems()
 
         $this->assertEquals($itemResult, $this->quote->getAllItems());
     }
+
+    /**
+     * Test to verify if existing reserved_order_id in use
+     *
+     * @param bool $isReservedOrderIdExist
+     * @param int $reservedOrderId
+     * @dataProvider reservedOrderIdDataProvider
+     */
+    public function testReserveOrderId($isReservedOrderIdExist, $reservedOrderId)
+    {
+        $this->resourceMock
+            ->expects($this->once())
+            ->method('isOrderIncrementIdUsed')
+            ->with(1000001)
+            ->willReturn($isReservedOrderIdExist);
+        $this->resourceMock
+            ->expects($this->any())
+            ->method('getReservedOrderId')
+            ->willReturn($reservedOrderId);
+        $this->quote->reserveOrderId();
+        $this->assertEquals($reservedOrderId, $this->quote->getReservedOrderId());
+    }
+
+    /**
+     * DataProvider for reservedId test
+     *
+     * @return array
+     */
+    public function reservedOrderIdDataProvider()
+    {
+        return [
+            'id_already_in_use' => [true, 100002],
+            'id_not_in_use' => [false, 1000001]
+        ];
+    }
 }

dev/tests/integration/testsuite/Magento/Quote/Model/QuoteTest.php

@@ -432,7 +432,7 @@ protected function _getCustomerDataArray()
             \Magento\Customer\Model\Data\Customer::WEBSITE_ID => 1
         ];
     }
-    
+
     /**
      * Test to verify that disabled product cannot be added to cart.
      *
@@ -457,4 +457,23 @@ public function testAddedProductToQuoteIsSalable()
         $quote = $objectManager->create(\Magento\Quote\Model\Quote::class);
         $quote->addProduct($product);
     }
+
+    /**
+     * Test to verify that reserved_order_id will be changed if it already in used
+     *
+     * @magentoDataFixture Magento/Sales/_files/order.php
+     * @magentoDataFixture Magento/Quote/_files/empty_quote.php
+     */
+    public function testReserveOrderId()
+    {
+        $objectManager = Bootstrap::getObjectManager();
+        /** @var \Magento\Quote\Model\Quote $quote */
+        $quote = $objectManager->create(Quote::class);
+        $quote->load('reserved_order_id', 'reserved_order_id');
+        $quote->reserveOrderId();
+        $this->assertEquals('reserved_order_id', $quote->getReservedOrderId());
+        $quote->setReservedOrderId('100000001');
+        $quote->reserveOrderId();
+        $this->assertNotEquals('100000001', $quote->getReservedOrderId());
+    }
 }