Merge remote-tracking branch 'austin/MAGETWO-77966' into bugs

Author: irenelagno

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

@@ -14,6 +14,8 @@
 use Magento\Quote\Model\Quote\Address;
 use Magento\Quote\Model\Quote\Address\Total as AddressTotal;
 use Magento\Sales\Model\Status;
+use Magento\Framework\App\ObjectManager;
+use Magento\Sales\Model\OrderIncrementIdChecker;
 
 /**
  * Quote model
@@ -353,6 +355,11 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      */
     protected $shippingAddressesItems;
 
+    /**
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
+     */
+    private $orderIncrementIdChecker;
+
     /**
      * @param \Magento\Framework\Model\Context $context
      * @param \Magento\Framework\Registry $registry
@@ -394,6 +401,7 @@ class Quote extends AbstractExtensibleModel implements \Magento\Quote\Api\Data\C
      * @param \Magento\Framework\Model\ResourceModel\AbstractResource|null $resource
      * @param \Magento\Framework\Data\Collection\AbstractDb|null $resourceCollection
      * @param array $data
+     * @param OrderIncrementIdChecker|null $orderIncrementIdChecker
      * @SuppressWarnings(PHPMD.ExcessiveParameterList)
      */
     public function __construct(
@@ -436,7 +444,8 @@ public function __construct(
         \Magento\Quote\Model\ShippingAssignmentFactory $shippingAssignmentFactory,
         \Magento\Framework\Model\ResourceModel\AbstractResource $resource = null,
         \Magento\Framework\Data\Collection\AbstractDb $resourceCollection = null,
-        array $data = []
+        array $data = [],
+        OrderIncrementIdChecker $orderIncrementIdChecker = null
     ) {
         $this->quoteValidator = $quoteValidator;
         $this->_catalogProduct = $catalogProduct;
@@ -471,6 +480,8 @@ public function __construct(
         $this->totalsReader = $totalsReader;
         $this->shippingFactory = $shippingFactory;
         $this->shippingAssignmentFactory = $shippingAssignmentFactory;
+        $this->orderIncrementIdChecker = $orderIncrementIdChecker ?: ObjectManager::getInstance()
+            ->get(OrderIncrementIdChecker::class);
         parent::__construct(
             $context,
             $registry,
@@ -2184,7 +2195,7 @@ public function reserveOrderId()
         } 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())) {
+            if ($this->orderIncrementIdChecker->isIncrementIdUsed($this->getReservedOrderId())) {
                 $this->setReservedOrderId($this->_getResource()->getReservedOrderId($this));
             }
         }

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

@@ -172,29 +172,6 @@ public function getReservedOrderId($quote)
         ->getNextValue();
     }
 
-    /**
-     * Check if order increment ID is already used.
-     * Method can be used to avoid collisions of order IDs.
-     *
-     * @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();
-        $select->from($this->getTable('sales_order'), 'entity_id')->where('increment_id = :increment_id');
-        $entity_id = $adapter->fetchOne($select, $bind);
-        if ($entity_id > 0) {
-            return true;
-        }
-
-        return false;
-    }
-
     /**
      * Mark quotes - that depend on catalog price rules - to be recollected on demand
      *

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

@@ -147,6 +147,11 @@ class QuoteTest extends \PHPUnit\Framework\TestCase
      */
     private $itemProcessor;
 
+    /**
+     * @var \PHPUnit_Framework_MockObject_MockObject
+     */
+    private $orderIncrementIdChecker;
+
     /**
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
@@ -233,6 +238,9 @@ protected function setUp()
             ->getMock();
         $this->extensionAttributesJoinProcessorMock = $this->createMock(\Magento\Framework\Api\ExtensionAttribute\JoinProcessorInterface::class);
         $this->customerDataFactoryMock = $this->createPartialMock(\Magento\Customer\Api\Data\CustomerInterfaceFactory::class, ['create']);
+        $this->orderIncrementIdChecker = $this->getMockBuilder(\Magento\Sales\Model\OrderIncrementIdChecker::class)
+            ->disableOriginalConstructor()
+            ->getMock();
         $this->quote = (new ObjectManager($this))
             ->getObject(
                 \Magento\Quote\Model\Quote::class,
@@ -257,6 +265,7 @@ protected function setUp()
                     'extensionAttributesJoinProcessor' => $this->extensionAttributesJoinProcessorMock,
                     'customerDataFactory' => $this->customerDataFactoryMock,
                     'itemProcessor' => $this->itemProcessor,
+                    'orderIncrementIdChecker' => $this->orderIncrementIdChecker,
                     'data' => [
                         'reserved_order_id' => 1000001
                     ]
@@ -1186,9 +1195,9 @@ public function testGetAllItems()
      */
     public function testReserveOrderId($isReservedOrderIdExist, $reservedOrderId)
     {
-        $this->resourceMock
+        $this->orderIncrementIdChecker
             ->expects($this->once())
-            ->method('isOrderIncrementIdUsed')
+            ->method('isIncrementIdUsed')
             ->with(1000001)->willReturn($isReservedOrderIdExist);
         $this->resourceMock->expects($this->any())->method('getReservedOrderId')->willReturn($reservedOrderId);
         $this->quote->reserveOrderId();

app/code/Magento/Sales/Model/OrderIncrementIdChecker.php

@@ -0,0 +1,51 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Model;
+
+/**
+ * This class uses for checking if reserved order id was already used for some order
+ */
+class OrderIncrementIdChecker
+{
+    /**
+     * @var \Magento\Sales\Model\ResourceModel\Order
+     */
+    private $resourceModel;
+
+    /**
+     * OrderIncrementIdChecker constructor.
+     * @param ResourceModel\Order $resourceModel
+     */
+    public function __construct(ResourceModel\Order $resourceModel)
+    {
+        $this->resourceModel = $resourceModel;
+    }
+
+    /**
+     * Check if order increment ID is already used.
+     *
+     * Method can be used to avoid collisions of order IDs.
+     *
+     * @param int $orderIncrementId
+     * @return bool
+     */
+    public function isIncrementIdUsed($orderIncrementId)
+    {
+        /** @var  \Magento\Framework\DB\Adapter\AdapterInterface $adapter */
+        $adapter = $this->resourceModel->getConnection();
+        $bind = [':increment_id' => $orderIncrementId];
+        /** @var \Magento\Framework\DB\Select $select */
+        $select = $adapter->select();
+        $select->from($this->resourceModel->getMainTable(), 'entity_id')->where('increment_id = :increment_id');
+        $entity_id = $adapter->fetchOne($select, $bind);
+        if ($entity_id > 0) {
+            return true;
+        }
+
+        return false;
+    }
+}

app/code/Magento/Quote/Test/Unit/Model/ResourceModel/QuoteTest.php renamed to app/code/Magento/Sales/Test/Unit/Model/OrderIncrementIdCheckerTest.php

@@ -4,12 +4,12 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Quote\Test\Unit\Model\ResourceModel;
+namespace Magento\Sales\Test\Unit\Model;
 
-class QuoteTest extends \PHPUnit\Framework\TestCase
+class OrderIncrementIdCheckerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
      */
     private $model;
 
@@ -42,7 +42,7 @@ protected function setUp()
             ->getMock();
         $this->adapterMock->expects($this->any())->method('select')->will($this->returnValue($this->selectMock));
 
-        $this->resourceMock = $this->getMockBuilder(\Magento\Framework\App\ResourceConnection::class)
+        $this->resourceMock = $this->getMockBuilder(\Magento\Sales\Model\ResourceModel\Order::class)
             ->disableOriginalConstructor()
             ->getMock();
         $this->resourceMock->expects(
@@ -54,9 +54,9 @@ protected function setUp()
         );
 
         $this->model = $objectManagerHelper->getObject(
-            \Magento\Quote\Model\ResourceModel\Quote::class,
+            \Magento\Sales\Model\OrderIncrementIdChecker::class,
             [
-                'resource' => $this->resourceMock
+                'resourceModel' => $this->resourceMock
             ]
         );
     }
@@ -67,11 +67,11 @@ protected function setUp()
      * @param array $value
      * @dataProvider isOrderIncrementIdUsedDataProvider
      */
-    public function testIsOrderIncrementIdUsed($value)
+    public function testIsIncrementIdUsed($value)
     {
         $expectedBind = [':increment_id' => $value];
         $this->adapterMock->expects($this->once())->method('fetchOne')->with($this->selectMock, $expectedBind);
-        $this->model->isOrderIncrementIdUsed($value);
+        $this->model->isIncrementIdUsed($value);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Quote/Model/ResourceModel/QuoteTest.php renamed to dev/tests/integration/testsuite/Magento/Sales/Model/OrderIncrementIdCheckerTest.php

@@ -4,22 +4,22 @@
  * See COPYING.txt for license details.
  */
 
-namespace Magento\Quote\Model\ResourceModel;
+namespace Magento\Sales\Model;
 
 /**
  * Class QuoteTest to verify isOrderIncrementIdUsed method behaviour
  */
-class QuoteTest extends \PHPUnit\Framework\TestCase
+class OrderIncrementIdCheckerTest extends \PHPUnit\Framework\TestCase
 {
     /**
-     * @var \Magento\Quote\Model\ResourceModel\Quote
+     * @var \Magento\Sales\Model\OrderIncrementIdChecker
      */
-    private $_resourceModel;
+    private $checker;
 
     protected function setUp()
     {
-        $this->_resourceModel = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
-            \Magento\Quote\Model\ResourceModel\Quote::class
+        $this->checker = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
+            \Magento\Sales\Model\OrderIncrementIdChecker::class
         );
     }
 
@@ -30,7 +30,7 @@ protected function setUp()
      */
     public function testIsOrderIncrementIdUsedNumericIncrementId()
     {
-        $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('100000001'));
+        $this->assertTrue($this->checker->isIncrementIdUsed('100000001'));
     }
 
     /**
@@ -40,6 +40,6 @@ public function testIsOrderIncrementIdUsedNumericIncrementId()
      */
     public function testIsOrderIncrementIdUsedAlphanumericIncrementId()
     {
-        $this->assertTrue($this->_resourceModel->isOrderIncrementIdUsed('M00000001'));
+        $this->assertTrue($this->checker->isIncrementIdUsed('M00000001'));
     }
 }

dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php

@@ -2521,5 +2521,6 @@
     ['getDataFormTab', 'Magento\Backend\Test\Block\Widget\Tab', 'Magento\Ui\Test\Block\Adminhtml\AbstractContainer::getFieldsData'],
     ['getBunchImages', 'Magento\CatalogImportExport\Model\Import\Product'],
     ['_isAttributeValueEmpty', 'Magento\Catalog\Model\ResourceModel\AbstractResource'],
-    ['var_dump', '']
+    ['var_dump', ''],
+    ['isOrderIncrementIdUsed', 'Magento\Quote\Model\ResourceModel\Quote', 'Magento\Sales\Model\OrderIncrementIdChecker::isIncrementIdUsed']
 ];